Skip to content

Commit 54bc9fc

Browse files
committed
fix
1 parent 465cbac commit 54bc9fc

File tree

8 files changed

+37
-55
lines changed

8 files changed

+37
-55
lines changed

.tasks/ci.yml

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,10 @@ tasks:
1313
desc: "AWS: Basic cluster (provision → test → cleanup)"
1414
cmds:
1515
- echo "Running AWS basic pipeline..."
16-
- task: :tools:ssh-keys
1716
- task: :cloud:aws:up
1817
- task: :redpanda:install:basic
1918
- task: :monitor:deploy
2019
- task: :console:deploy
21-
- task: :tools:rpk
2220
- task: :test:smoke
2321
- task: :cloud:aws:down
2422
- echo "AWS basic pipeline complete"
@@ -27,12 +25,10 @@ tasks:
2725
desc: "AWS: TLS-enabled cluster"
2826
cmds:
2927
- echo "Running AWS TLS pipeline..."
30-
- task: :tools:ssh-keys
3128
- task: :cloud:aws:up
3229
- task: :redpanda:install:tls
3330
- task: :monitor:deploy:tls
3431
- task: :console:deploy:tls
35-
- task: :tools:rpk
3632
- task: :test:tls
3733
- task: :cloud:aws:down
3834
- echo "AWS TLS pipeline complete"
@@ -43,12 +39,10 @@ tasks:
4339
TIERED_STORAGE_ENABLED: "true"
4440
cmds:
4541
- echo "Running AWS tiered storage pipeline..."
46-
- task: :tools:ssh-keys
4742
- task: :cloud:aws:up
4843
- task: :redpanda:install:tiered
4944
- task: :monitor:deploy:tls
5045
- task: :console:deploy:tls
51-
- task: :tools:rpk
5246
- task: :test:tls
5347
- task: :test:storage:aws
5448
- task: :cloud:aws:down
@@ -60,15 +54,13 @@ tasks:
6054
ENABLE_CONNECT: "true"
6155
cmds:
6256
- echo "Running AWS Connect pipeline..."
63-
- task: :tools:ssh-keys
6457
- task: :cloud:aws:up
6558
- task: :mirror:prepare:terraform
6659
- task: :mirror:provision
6760
- task: :redpanda:install:basic
6861
- task: :connect:setup
6962
- task: :monitor:deploy
7063
- task: :console:deploy
71-
- task: :tools:rpk
7264
- task: :test:smoke
7365
- task: :connect:mirror-connector
7466
- task: :test:load
@@ -83,15 +75,13 @@ tasks:
8375
TIERED_STORAGE_ENABLED: "true"
8476
cmds:
8577
- echo "Running AWS enterprise pipeline..."
86-
- task: :tools:ssh-keys
8778
- task: :cloud:aws:up
8879
- task: :redpanda:install:tiered
8980
- task: :connect:setup:tls
9081
- task: :monitor:deploy:tls
9182
- task: :console:deploy:tls
9283
- task: :mirror:prepare:terraform
9384
- task: :mirror:provision
94-
- task: :tools:rpk
9585
- task: :test:tls
9686
- task: :test:storage:aws
9787
- task: :connect:test-endpoints
@@ -107,12 +97,10 @@ tasks:
10797
desc: "GCP: Basic cluster (provision → test → cleanup)"
10898
cmds:
10999
- echo "Running GCP basic pipeline..."
110-
- task: :tools:ssh-keys
111100
- task: :cloud:gcp:up
112101
- task: :redpanda:install:basic
113102
- task: :monitor:deploy
114103
- task: :console:deploy
115-
- task: :tools:rpk
116104
- task: :test:smoke
117105
- task: :cloud:gcp:down
118106
- echo "GCP basic pipeline complete"
@@ -121,12 +109,10 @@ tasks:
121109
desc: "GCP: TLS-enabled cluster"
122110
cmds:
123111
- echo "Running GCP TLS pipeline..."
124-
- task: :tools:ssh-keys
125112
- task: :cloud:gcp:up
126113
- task: :redpanda:install:tls
127114
- task: :monitor:deploy:tls
128115
- task: :console:deploy:tls
129-
- task: :tools:rpk
130116
- task: :test:tls
131117
- task: :cloud:gcp:down
132118
- echo "GCP TLS pipeline complete"
@@ -137,12 +123,10 @@ tasks:
137123
TIERED_STORAGE_ENABLED: "true"
138124
cmds:
139125
- echo "Running GCP tiered storage pipeline..."
140-
- task: :tools:ssh-keys
141126
- task: :cloud:gcp:up
142127
- task: :redpanda:install:tiered
143128
- task: :monitor:deploy:tls
144129
- task: :console:deploy:tls
145-
- task: :tools:rpk
146130
- task: :test:tls
147131
- task: :test:storage:gcp
148132
- task: :cloud:gcp:down
@@ -154,7 +138,6 @@ tasks:
154138
desc: "AWS: Quick setup (no testing or cleanup)"
155139
cmds:
156140
- echo "Running AWS quick setup..."
157-
- task: :tools:ssh-keys
158141
- task: :cloud:aws:up
159142
- task: :redpanda:install:basic
160143
- task: :monitor:deploy
@@ -165,7 +148,6 @@ tasks:
165148
desc: "GCP: Quick setup (no testing or cleanup)"
166149
cmds:
167150
- echo "Running GCP quick setup..."
168-
- task: :tools:ssh-keys
169151
- task: :cloud:gcp:up
170152
- task: :redpanda:install:basic
171153
- task: :monitor:deploy

.tasks/cloud.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ tasks:
4242

4343
aws:up:
4444
desc: "Provision AWS infrastructure"
45-
deps: [tools:ssh-keys]
45+
deps: [":tools:ssh-keys"]
4646
dir: aws
4747
cmds:
4848
- echo "Provisioning AWS infrastructure..."
@@ -70,8 +70,8 @@ tasks:
7070

7171
aws:down:
7272
desc: "Destroy AWS infrastructure"
73-
deps: [tools:ssh-keys]
74-
dir: aws/{{.TF_DIR}}
73+
deps: [":tools:ssh-keys"]
74+
dir: aws
7575
cmds:
7676
- echo "Destroying AWS infrastructure..."
7777
- terraform init
@@ -95,7 +95,7 @@ tasks:
9595

9696
aws:proxy-up:
9797
desc: "Provision AWS infrastructure with proxy (for private network testing)"
98-
deps: [tools:ssh-keys]
98+
deps: [":tools:ssh-keys"]
9999
dir: aws/private-test
100100
cmds:
101101
- echo "Provisioning AWS infrastructure with proxy..."
@@ -120,7 +120,7 @@ tasks:
120120

121121
aws:proxy-down:
122122
desc: "Destroy AWS proxy infrastructure"
123-
deps: [tools:ssh-keys]
123+
deps: [":tools:ssh-keys"]
124124
dir: aws/private-test
125125
cmds:
126126
- echo "Destroying AWS proxy infrastructure..."
@@ -145,7 +145,7 @@ tasks:
145145

146146
gcp:up:
147147
desc: "Provision GCP infrastructure"
148-
deps: [tools:ssh-keys]
148+
deps: [":tools:ssh-keys"]
149149
dir: gcp
150150
cmds:
151151
- echo "Provisioning GCP infrastructure..."
@@ -167,8 +167,8 @@ tasks:
167167

168168
gcp:down:
169169
desc: "Destroy GCP infrastructure"
170-
deps: [tools:ssh-keys]
171-
dir: gcp/{{.TF_DIR}}
170+
deps: [":tools:ssh-keys"]
171+
dir: gcp
172172
cmds:
173173
- echo "Destroying GCP infrastructure..."
174174
- terraform init

.tasks/connect.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ tasks:
6060
_copy-rpm:
6161
internal: true
6262
desc: "Copy Redpanda Connect RPM to connect hosts"
63-
deps: [tools:ssh-keys]
63+
deps: [":tools:ssh-keys"]
6464
cmds:
6565
- echo "Copying RPM to connect hosts..."
6666
- |
@@ -72,7 +72,7 @@ tasks:
7272

7373
_deploy-ansible:
7474
internal: true
75-
deps: [tools:ansible]
75+
deps: [":tools:ansible"]
7676
env:
7777
ENABLE_CONNECT: "true"
7878
cmds:
@@ -83,7 +83,7 @@ tasks:
8383

8484
_deploy-ansible-tls:
8585
internal: true
86-
deps: [tools:ansible]
86+
deps: [":tools:ansible"]
8787
env:
8888
ENABLE_CONNECT: "true"
8989
cmds:
@@ -94,7 +94,7 @@ tasks:
9494

9595
test-endpoints:
9696
desc: "Test Connect REST API endpoints with TLS"
97-
deps: [tools:tls-certs]
97+
deps: [":tools:tls-certs"]
9898
cmds:
9999
- |
100100
CONNECT_TARGET=$(awk '/^\[connect\]/{f=1; next} /^$/{f=0} f{print $1}' "{{.HOSTS_FILE}}" | head -n1)
@@ -103,7 +103,7 @@ tasks:
103103
104104
test-prometheus-exporter:
105105
desc: "Test Prometheus metrics endpoint"
106-
deps: [tools:tls-certs]
106+
deps: [":tools:tls-certs"]
107107
cmds:
108108
- |
109109
PROMETHEUS_EXPORTER_TARGET=$(awk '/^\[connect\]/{f=1; next} /^$/{f=0} f{print $1}' "{{.HOSTS_FILE}}" | head -n1)

.tasks/console.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ tasks:
1717

1818
deploy:
1919
desc: "Deploy Redpanda Console"
20-
deps: [tools:ansible]
20+
deps: [":tools:ansible"]
2121
cmds:
2222
- mkdir -p {{.ARTIFACT_DIR}}/logs
2323
- echo "Deploying Redpanda Console..."
@@ -26,7 +26,7 @@ tasks:
2626

2727
deploy:tls:
2828
desc: "Deploy Redpanda Console with TLS"
29-
deps: [tools:ansible]
29+
deps: [":tools:ansible"]
3030
cmds:
3131
- mkdir -p {{.ARTIFACT_DIR}}/logs
3232
- echo "Deploying Redpanda Console with TLS..."

.tasks/mirror.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ tasks:
7171

7272
infra:up:
7373
desc: "Create secondary cluster infrastructure on AWS"
74-
deps: [tools:ssh-keys]
74+
deps: [":tools:ssh-keys"]
7575
dir: aws-extra/{{.TF_DIR}}
7676
cmds:
7777
- echo "Provisioning secondary cluster infrastructure..."
@@ -95,7 +95,7 @@ tasks:
9595

9696
infra:down:
9797
desc: "Destroy secondary cluster infrastructure"
98-
deps: [tools:ssh-keys]
98+
deps: [":tools:ssh-keys"]
9999
dir: aws-extra/{{.TF_DIR}}
100100
cmds:
101101
- echo "Destroying secondary cluster infrastructure..."
@@ -120,7 +120,7 @@ tasks:
120120

121121
install:
122122
desc: "Install Redpanda on secondary cluster"
123-
deps: [tools:ansible]
123+
deps: [":tools:ansible"]
124124
cmds:
125125
- mkdir -p {{.ARTIFACT_DIR}}/logs
126126
- echo "Installing Redpanda on secondary cluster..."
@@ -129,7 +129,7 @@ tasks:
129129

130130
install:tls:
131131
desc: "Install Redpanda with TLS on secondary cluster"
132-
deps: [tools:ansible]
132+
deps: [":tools:ansible"]
133133
cmds:
134134
- mkdir -p {{.ARTIFACT_DIR}}/logs
135135
- echo "🚀Installing Redpanda with TLS on secondary cluster..."
@@ -150,39 +150,39 @@ tasks:
150150

151151
_monitoring:
152152
internal: true
153-
deps: [tools:ansible]
153+
deps: [":tools:ansible"]
154154
cmds:
155155
- mkdir -p {{.ARTIFACT_DIR}}/logs
156156
- echo "Deploying monitoring on secondary cluster..."
157157
- ansible-playbook ansible/deploy-monitor.yml --private-key {{.PRIVATE_KEY}} --inventory {{.EXTRA_INVENTORY}} --extra-vars is_using_unstable={{.IS_USING_UNSTABLE}}
158158

159159
_monitoring-tls:
160160
internal: true
161-
deps: [tools:ansible]
161+
deps: [":tools:ansible"]
162162
cmds:
163163
- mkdir -p {{.ARTIFACT_DIR}}/logs
164164
- echo "Deploying monitoring with TLS on secondary cluster..."
165165
- ansible-playbook ansible/deploy-monitor-tls.yml --private-key {{.PRIVATE_KEY}} --inventory {{.EXTRA_INVENTORY}} --extra-vars is_using_unstable={{.IS_USING_UNSTABLE}}
166166

167167
_console:
168168
internal: true
169-
deps: [tools:ansible]
169+
deps: [":tools:ansible"]
170170
cmds:
171171
- mkdir -p {{.ARTIFACT_DIR}}/logs
172172
- echo "Deploying console on secondary cluster..."
173173
- ansible-playbook ansible/deploy-console.yml --private-key {{.PRIVATE_KEY}} --inventory {{.EXTRA_INVENTORY}} --extra-vars is_using_unstable={{.IS_USING_UNSTABLE}}
174174

175175
_console-tls:
176176
internal: true
177-
deps: [tools:ansible]
177+
deps: [":tools:ansible"]
178178
cmds:
179179
- mkdir -p {{.ARTIFACT_DIR}}/logs
180180
- echo "Deploying console with TLS on secondary cluster..."
181181
- ansible-playbook ansible/deploy-console-tls.yml --private-key {{.PRIVATE_KEY}} --inventory {{.EXTRA_INVENTORY}} --extra-vars is_using_unstable={{.IS_USING_UNSTABLE}}
182182

183183
copy:connect-rpm:
184184
desc: "Copy Redpanda Connect RPM to secondary cluster"
185-
deps: [tools:ssh-keys]
185+
deps: [":tools:ssh-keys"]
186186
cmds:
187187
- echo "Copying Connect RPM to secondary cluster..."
188188
- |

.tasks/monitor.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ tasks:
1919

2020
deploy:
2121
desc: "Deploy monitoring stack (Prometheus, Grafana)"
22-
deps: [tools:ansible]
22+
deps: [":tools:ansible"]
2323
env:
2424
OBJC_DISABLE_INITIALIZE_FORK_SAFETY: "YES"
2525
cmds:
@@ -30,7 +30,7 @@ tasks:
3030

3131
deploy:tls:
3232
desc: "Deploy monitoring stack with TLS"
33-
deps: [tools:ansible]
33+
deps: [":tools:ansible"]
3434
cmds:
3535
- mkdir -p {{.ARTIFACT_DIR}}/logs
3636
- echo "Deploying monitoring stack with TLS..."

.tasks/redpanda.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ tasks:
3333

3434
install:basic:
3535
desc: "Install Redpanda cluster (standard configuration)"
36-
deps: [tools:ansible]
36+
deps: [":tools:ansible"]
3737
cmds:
3838
- mkdir -p {{.ARTIFACT_DIR}}/logs
3939
- echo "Installing Redpanda cluster..."
@@ -42,7 +42,7 @@ tasks:
4242

4343
install:tls:
4444
desc: "Install Redpanda cluster with TLS enabled"
45-
deps: [tools:ansible]
45+
deps: [":tools:ansible"]
4646
cmds:
4747
- mkdir -p {{.ARTIFACT_DIR}}/logs
4848
- echo "Installing Redpanda cluster with TLS..."
@@ -51,7 +51,7 @@ tasks:
5151

5252
install:tiered:
5353
desc: "Install Redpanda cluster with tiered storage"
54-
deps: [tools:ansible]
54+
deps: [":tools:ansible"]
5555
cmds:
5656
- mkdir -p {{.ARTIFACT_DIR}}/logs
5757
- echo "Installing Redpanda cluster with tiered storage..."
@@ -66,7 +66,7 @@ tasks:
6666

6767
install:proxy:
6868
desc: "Install Redpanda cluster behind proxy (for private network testing)"
69-
deps: [tools:ansible]
69+
deps: [":tools:ansible"]
7070
cmds:
7171
- mkdir -p {{.ARTIFACT_DIR}}/logs
7272
- echo "Installing Redpanda cluster with proxy..."
@@ -82,7 +82,7 @@ tasks:
8282

8383
install:dev-tiered:
8484
desc: "Install development build with tiered storage (verbose logging)"
85-
deps: [tools:ansible]
85+
deps: [":tools:ansible"]
8686
cmds:
8787
- mkdir -p {{.ARTIFACT_DIR}}/logs
8888
- echo "Installing Redpanda dev build with tiered storage..."
@@ -97,7 +97,7 @@ tasks:
9797

9898
configure:logging:
9999
desc: "Configure logging settings on Redpanda cluster"
100-
deps: [tools:ansible]
100+
deps: [":tools:ansible"]
101101
vars:
102102
REDPANDA_LOGGING_LOG_FILE:
103103
sh: echo "${REDPANDA_LOGGING_LOG_FILE:-/var/log/redpanda2/redpanda.log}"

0 commit comments

Comments
 (0)