Skip to content

Commit 034e7d4

Browse files
naemononaemono
authored
Update to use new buildkite image with preflight 1.11.1 (#8422) (#8428)
(cherry picked from commit 096f554) Signed-off-by: Michael Montgomery <[email protected]>
1 parent 0b4d148 commit 034e7d4

File tree

9 files changed

+38
-38
lines changed

9 files changed

+38
-38
lines changed

‎.buildkite/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
# This Makefile is used to run the buildkite agent in virtual machines when Docker access is required.
66

7-
CI_IMAGE ?= docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
7+
CI_IMAGE ?= docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:620addfa
88
ROOT_DIR := $(CURDIR)/..
99
GO_MOUNT_PATH ?= /go/src/github.com/elastic/cloud-on-k8s
1010
export VAULT_ROOT_PATH = secret/ci/elastic-cloud-on-k8s

‎.buildkite/e2e/pipeline-gen/pipeline.tpl.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ steps:
3434
machineType: "{{ .KindAgentsMachineType }}"
3535
{{- end }}
3636
{{- else }}
37-
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
37+
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:620addfa
3838
memory: "4G"
3939
{{- end }}
4040

@@ -85,7 +85,7 @@ steps:
8585
machineType: "{{ $.KindAgentsMachineType }}"
8686
{{- end }}
8787
{{- else }}
88-
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
88+
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:620addfa
8989
memory: "4G"
9090
{{- end }}
9191

@@ -121,7 +121,7 @@ steps:
121121
{{- if not $test.Dind }}
122122
- make run-deployer
123123
agents:
124-
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
124+
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:620addfa
125125
memory: "4G"
126126
{{- else }}
127127
- make -C .buildkite TARGET="run-deployer" ci
@@ -144,5 +144,5 @@ steps:
144144
- ".buildkite/e2e/reporter/*.md"
145145
- ".buildkite/e2e/reporter/*.yml"
146146
agents:
147-
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
147+
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:620addfa
148148
memory: "2G"

‎.buildkite/e2e/reporter/templates/notify-failures.tpl.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ steps:
44
- label: "{{ .ShortFailuresCount }} failure(s)"
55
command: exit {{ .ShortFailuresCount }}
66
agents:
7-
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
7+
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:620addfa
88
memory: "2G"
99

1010
# notify e2e tests failures for the main branch and tags
@@ -13,7 +13,7 @@ steps:
1313
if: build.branch == "main" || build.tag != null
1414
command: echo "notify"
1515
agents:
16-
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
16+
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:620addfa
1717
memory: "2G"
1818

1919
notify:

‎.buildkite/pipeline-e2e-clusters-cleanup.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ steps:
1010
- make build-deployer
1111
- buildkite-agent artifact upload hack/deployer/deployer
1212
agents:
13-
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
13+
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:620addfa
1414
memory: 2G
1515

1616
- label: ":broom: e2e test cluster cleanup gke"
@@ -26,7 +26,7 @@ steps:
2626
- chmod u+x /usr/local/hack/deployer/deployer
2727
- /usr/local/hack/deployer/deployer cleanup --plans-file hack/deployer/config/plans.yml --cluster-prefix $${E2E_TEST_CLUSTER_PREFIX} --config-file deployer-config.yml
2828
agents:
29-
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
29+
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:620addfa
3030
memory: 2G
3131

3232
- label: ":broom: e2e test cluster cleanup aks"
@@ -55,7 +55,7 @@ steps:
5555
- chmod u+x /usr/local/hack/deployer/deployer
5656
- /usr/local/hack/deployer/deployer cleanup --plans-file hack/deployer/config/plans.yml --cluster-prefix $${E2E_TEST_CLUSTER_PREFIX} --config-file deployer-config.yml
5757
agents:
58-
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
58+
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:620addfa
5959
memory: 2G
6060

6161
- label: ":broom: e2e test cluster cleanup eks-arm"
@@ -71,7 +71,7 @@ steps:
7171
- chmod u+x /usr/local/hack/deployer/deployer
7272
- /usr/local/hack/deployer/deployer cleanup --plans-file hack/deployer/config/plans.yml --cluster-prefix $${E2E_TEST_CLUSTER_PREFIX} --config-file deployer-config.yml
7373
agents:
74-
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
74+
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:620addfa
7575
memory: 2G
7676

7777
- label: ":broom: e2e test cluster cleanup ocp"

‎.buildkite/pipeline-e2e-tests.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ steps:
1717
E2E_PROVIDER: gke
1818
DEF
1919
agents:
20-
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
20+
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:620addfa
2121
memory: "2G"
2222

2323
# for nightly builds from main
@@ -30,7 +30,7 @@ steps:
3030
cd .buildkite/e2e/pipeline-gen && go build -o pipeline-gen
3131
cat ../nightly-main-matrix.yaml | ./pipeline-gen | buildkite-agent pipeline upload
3232
agents:
33-
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
33+
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:620addfa
3434
memory: "2G"
3535

3636
# for all tags
@@ -41,5 +41,5 @@ steps:
4141
cd .buildkite/e2e/pipeline-gen && go build -o pipeline-gen
4242
cat ../release-branch-matrix.yaml | ./pipeline-gen | buildkite-agent pipeline upload
4343
agents:
44-
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
44+
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:620addfa
4545
memory: "2G"

‎.buildkite/pipeline-release-helm.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ steps:
1010
- make build
1111
- buildkite-agent artifact upload bin/releaser
1212
agents:
13-
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
13+
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:620addfa
1414
memory: "2G"
1515

1616
- label: "operator dev helm chart"
@@ -29,7 +29,7 @@ steps:
2929
- chmod u+x /usr/local/bin/releaser
3030
- releaser --env=dev --charts-dir=deploy/eck-operator
3131
agents:
32-
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
32+
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:620addfa
3333
memory: "2G"
3434

3535
- wait
@@ -50,7 +50,7 @@ steps:
5050
- chmod u+x /usr/local/bin/releaser
5151
- releaser --env=dev --charts-dir=deploy/eck-stack
5252
agents:
53-
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
53+
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:620addfa
5454
memory: "2G"
5555

5656
- wait
@@ -68,7 +68,7 @@ steps:
6868
- chmod u+x /usr/local/bin/releaser
6969
- releaser --env=prod --charts-dir=deploy/eck-operator
7070
agents:
71-
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
71+
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:620addfa
7272
memory: "2G"
7373

7474
- wait
@@ -86,5 +86,5 @@ steps:
8686
- chmod u+x /usr/local/bin/releaser
8787
- releaser --env=prod --charts-dir=deploy/eck-stack
8888
agents:
89-
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
89+
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:620addfa
9090
memory: "2G"

‎.buildkite/pipeline-release-redhat.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ steps:
77
- make build
88
- buildkite-agent artifact upload bin/operatorhub
99
agents:
10-
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
10+
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:620addfa
1111
memory: "2G"
1212

1313
- label: ":docker: push container"
@@ -20,7 +20,7 @@ steps:
2020
cd hack/operatorhub
2121
operatorhub container push
2222
agents:
23-
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
23+
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:620addfa
2424
memory: "2G"
2525

2626
- label: ":docker: preflight container check"
@@ -32,7 +32,7 @@ steps:
3232
commands:
3333
- .buildkite/scripts/release/redhat-preflight.sh
3434
agents:
35-
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
35+
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:620addfa
3636
memory: "2G"
3737

3838
- label: ":docker: publish container"
@@ -47,7 +47,7 @@ steps:
4747
cd hack/operatorhub
4848
operatorhub container publish
4949
agents:
50-
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
50+
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:620addfa
5151
memory: "2G"
5252

5353
- label: ":redhat: generate and create-pr"
@@ -62,5 +62,5 @@ steps:
6262
operatorhub generate-manifests
6363
operatorhub bundle create-pr
6464
agents:
65-
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
65+
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:620addfa
6666
memory: "2G"

‎.buildkite/pipeline-release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ steps:
1010
commands:
1111
- .buildkite/scripts/release/k8s-manifests.sh
1212
agents:
13-
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
13+
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:620addfa
1414
memory: "2G"
1515

1616
- label: "copy images to dockerhub"

‎.buildkite/pipeline.yml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ steps:
99
- label: ":go: lint"
1010
command: "make lint check-local-changes"
1111
agents:
12-
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
12+
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:620addfa
1313
cpu: "6"
1414
memory: "7G"
1515

1616
- label: ":go: generate"
1717
command: "make generate check-local-changes"
1818
agents:
19-
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
19+
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:620addfa
2020
cpu: "4"
2121
memory: "2G"
2222

@@ -25,7 +25,7 @@ steps:
2525
- "make check-license-header check-predicates shellcheck reattach-pv"
2626
- "make -C hack/helm/release build"
2727
agents:
28-
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
28+
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:620addfa
2929
cpu: "4"
3030
memory: "4G"
3131

@@ -35,28 +35,28 @@ steps:
3535
- label: ":go: unit-tests"
3636
command: "make unit-xml"
3737
agents:
38-
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
38+
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:620addfa
3939
cpu: "4"
4040
memory: "4G"
4141

4242
- label: ":go: integration-tests"
4343
command: "make integration-xml"
4444
agents:
45-
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
45+
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:620addfa
4646
cpu: "4"
4747
memory: "4G"
4848

4949
- label: ":go: manifest-gen-tests"
5050
command: "make manifest-gen-test"
5151
agents:
52-
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
52+
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:620addfa
5353
cpu: "4"
5454
memory: "2G"
5555

5656
- label: ":go: helm-tests"
5757
command: "make helm-test"
5858
agents:
59-
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
59+
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:620addfa
6060
cpu: "4"
6161
memory: "2G"
6262

@@ -111,7 +111,7 @@ steps:
111111
E2E_SKIP_CLEANUP: true
112112
DEF
113113
agents:
114-
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
114+
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:620addfa
115115
memory: "2G"
116116

117117
# for PR comment
@@ -124,14 +124,14 @@ steps:
124124
$$(echo ./pipeline-gen $$GITHUB_PR_COMMENT_VAR_ARGS) \
125125
| buildkite-agent pipeline upload
126126
agents:
127-
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
127+
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:620addfa
128128
memory: "2G"
129129

130130
# for the main branch (merge and nightly) and tags
131131
- label: ":buildkite:"
132132
command: buildkite-agent pipeline upload .buildkite/pipeline-e2e-tests.yml
133133
agents:
134-
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
134+
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:620addfa
135135
memory: "2G"
136136

137137
# ----------
@@ -157,7 +157,7 @@ steps:
157157
soft_fail: true
158158
YAML
159159
agents:
160-
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
160+
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:620addfa
161161
memory: "256Mi"
162162

163163
# scan the -ubi operator image on nightly builds
@@ -177,13 +177,13 @@ steps:
177177
soft_fail: true
178178
YAML
179179
agents:
180-
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
180+
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:620addfa
181181
memory: "256Mi"
182182

183183
- label: ":buildkite:"
184184
depends_on:
185185
- "operator-image-build"
186186
command: buildkite-agent pipeline upload .buildkite/pipeline-release.yml
187187
agents:
188-
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
188+
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:620addfa
189189
memory: "2G"

0 commit comments

Comments
 (0)