Skip to content

Commit d269e14

Browse files
committed
Revert "ci: change BK pool used and add push nightlies to new ECR registry (#563)"
This reverts commit 8f60f9d.
1 parent 8f60f9d commit d269e14

File tree

4 files changed

+10
-12
lines changed

4 files changed

+10
-12
lines changed

.buildkite/pipeline.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,9 @@ steps:
4646
label: ":gandalf: Nightly Releases"
4747
timeout_in_minutes: 10
4848
agents:
49-
queue: k8s-m6id12xlarge
49+
queue: v6-amd64-builders-m6id
5050
commands:
5151
- |
52-
aws ecr-public get-login-password --region us-east-1 | docker login --username AWS --password-stdin public.ecr.aws/l9j0i2e0
5352
./ci/scripts/run-in-nix-docker.sh task ci:configure ci:publish-nightly-artifacts
5453
# Build nightly releases whenever NIGHTLY_RELEASE is set and it's triggered
5554
# from a schedule or the BK UI. Notably, we permit building nightlies from
@@ -97,7 +96,7 @@ steps:
9796
build.branch == build.tag
9897
command: ./ci/scripts/run-in-nix-docker.sh task ci:configure ci:publish-operator-image
9998
agents:
100-
queue: k8s-m6id12xlarge
99+
queue: v6-amd64-builders-m6id
101100
plugins:
102101
- seek-oss/aws-sm#v2.3.2:
103102
json-to-env:

.buildkite/testsuite.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ notify:
1111
context: k8s-operator-v2-helm
1212
steps:
1313
- agents:
14-
queue: k8s-m6id12xlarge
14+
queue: v6-amd64-builders-m6id
1515
command: ./ci/scripts/run-in-nix-docker.sh task ci:configure ci:lint
1616
key: lint
1717
label: Lint
@@ -27,7 +27,7 @@ steps:
2727
key: unit
2828
steps:
2929
- agents:
30-
queue: k8s-m6id12xlarge
30+
queue: v6-amd64-builders-m6id
3131
command: ./ci/scripts/run-in-nix-docker.sh task ci:configure ci:test:unit
3232
key: unit-run
3333
label: Run Unit Tests
@@ -69,7 +69,7 @@ steps:
6969
key: integration
7070
steps:
7171
- agents:
72-
queue: k8s-m6id12xlarge
72+
queue: v6-amd64-builders-m6id
7373
command: ./ci/scripts/run-in-nix-docker.sh task ci:configure ci:test:integration
7474
key: integration-run
7575
label: Run Integration Tests
@@ -111,7 +111,7 @@ steps:
111111
key: acceptance
112112
steps:
113113
- agents:
114-
queue: k8s-m6id12xlarge
114+
queue: v6-amd64-builders-m6id
115115
command: ./ci/scripts/run-in-nix-docker.sh task ci:configure ci:test:acceptance
116116
key: acceptance-run
117117
label: Run Acceptance Tests
@@ -153,7 +153,7 @@ steps:
153153
key: kuttl-v1
154154
steps:
155155
- agents:
156-
queue: k8s-m6id12xlarge
156+
queue: v6-amd64-builders-m6id
157157
command: ./ci/scripts/run-in-nix-docker.sh task ci:configure ci:test:kuttl-v1
158158
key: kuttl-v1-run
159159
label: Run Kuttl-V1 Tests
@@ -195,7 +195,7 @@ steps:
195195
key: kuttl-v1-nodepools
196196
steps:
197197
- agents:
198-
queue: k8s-m6id12xlarge
198+
queue: v6-amd64-builders-m6id
199199
command: ./ci/scripts/run-in-nix-docker.sh task ci:configure ci:test:kuttl-v1-nodepools
200200
key: kuttl-v1-nodepools-run
201201
label: Run Kuttl-V1-Nodepools Tests
@@ -237,7 +237,7 @@ steps:
237237
key: kuttl-v2
238238
steps:
239239
- agents:
240-
queue: k8s-m6id12xlarge
240+
queue: v6-amd64-builders-m6id
241241
command: ./ci/scripts/run-in-nix-docker.sh task ci:configure ci:test:kuttl-v2
242242
key: kuttl-v2-run
243243
label: Run Kuttl-V2 Tests

gen/pipeline/pipeline.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ var (
2525
// Known/Permitted Agent Pools
2626

2727
AgentsPipeLineUploader = map[string]any{"queue": "pipeline-uploader"}
28-
AgentsLarge = map[string]any{"queue": "k8s-m6id12xlarge"}
28+
AgentsLarge = map[string]any{"queue": "v6-amd64-builders-m6id"}
2929
)
3030

3131
var suites = []TestSuite{

taskfiles/ci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,6 @@ tasks:
140140
vars:
141141
TAGS:
142142
- docker.io/redpandadata/redpanda-operator-nightly:{{.OPERATOR_VERSION}}
143-
- public.ecr.aws/l9j0i2e0/redpanda-operator-nightly:{{.OPERATOR_VERSION}}
144143
PLATFORMS:
145144
- linux/amd64
146145
- linux/arm64

0 commit comments

Comments
 (0)