Skip to content

Commit 987041d

Browse files
committed
Use the current official docker image for oblt-cli
1 parent ffd24c3 commit 987041d

File tree

5 files changed

+17
-7
lines changed

5 files changed

+17
-7
lines changed

.buildkite/bk.integration-fips.pipeline.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ steps:
5454
TF_VAR_integration_server_docker_image: "docker.elastic.co/beats-ci/elastic-agent-cloud-fips:git-${BUILDKITE_COMMIT:0:12}"
5555
command: .buildkite/scripts/steps/ess_start.sh
5656
agents:
57-
image: "docker.elastic.co/ci-agent-images/platform-ingest/oblt-cli:latest"
57+
# image: "docker.elastic.co/ci-agent-images/platform-ingest/oblt-cli:latest"
58+
image: "docker.elastic.co/observability-ci/oblt-cli:7.21.0"
5859

5960
- group: "fips:Stateful:Ubuntu"
6061
key: integration-tests-ubuntu-fips
@@ -133,7 +134,8 @@ steps:
133134
allow_dependency_failure: true
134135
command: .buildkite/scripts/steps/ess_down.sh
135136
agents:
136-
image: "docker.elastic.co/ci-agent-images/platform-ingest/oblt-cli:latest"
137+
# image: "docker.elastic.co/ci-agent-images/platform-ingest/oblt-cli:latest"
138+
image: "docker.elastic.co/observability-ci/oblt-cli:7.21.0"
137139

138140
- label: Aggregate test reports
139141
depends_on:

.buildkite/bk.integration.pipeline.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ steps:
5555
context: "buildkite/elastic-agent-extended-testing - ESS stack provision using oblt-cli"
5656
command: .buildkite/scripts/steps/ess_start.sh
5757
agents:
58-
image: "docker.elastic.co/ci-agent-images/platform-ingest/oblt-cli:latest"
58+
# image: "docker.elastic.co/ci-agent-images/platform-ingest/oblt-cli:latest"
59+
image: "docker.elastic.co/observability-ci/oblt-cli:7.21.0"
5960

6061
- group: "Extended runtime leak tests"
6162
key: extended-integration-tests
@@ -611,7 +612,8 @@ steps:
611612
allow_dependency_failure: true
612613
command: .buildkite/scripts/steps/ess_down.sh
613614
agents:
614-
image: "docker.elastic.co/ci-agent-images/platform-ingest/oblt-cli:latest"
615+
# image: "docker.elastic.co/ci-agent-images/platform-ingest/oblt-cli:latest"
616+
image: "docker.elastic.co/observability-ci/oblt-cli:7.21.0"
615617

616618
- label: Aggregate test reports
617619
# Warning: The key has a hook in pre-command

.buildkite/hooks/pre-command

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,13 @@ CI_GCP_OBS_PATH="kv/ci-shared/observability-ingest/cloud/gcp"
1818
CI_ESS_PATH="kv/ci-shared/platform-ingest/platform-ingest-ec-prod"
1919
CI_DRA_ROLE_PATH="kv/ci-shared/release/dra-role"
2020

21+
# NOTE: oblt-cli requires the GITHUB_TOKEN to be set in the environment
22+
# unfortunatelym, we cannot use the BK pipeline itself as it will
23+
# print the content, so we need to set it in the pre-command hook.
24+
# I decided to set it here for all the steps regardless to avoid
25+
# complicated logic in the pre-command hook.
26+
export GITHUB_TOKEN=$VAULT_GITHUB_TOKEN
27+
2128
function release_manager_login {
2229
DRA_CREDS_SECRET=$(retry 5 vault kv get -field=data -format=json ${CI_DRA_ROLE_PATH})
2330
VAULT_ADDR_SECRET=$(echo ${DRA_CREDS_SECRET} | jq -r '.vault_addr')

.buildkite/scripts/steps/ess.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ function ess_up() {
1212
fi
1313

1414
# Create a cluster with the specified stack version and store the cluster information in a file
15-
GITHUB_TOKEN="$VAULT_GITHUB_TOKEN" \
16-
oblt-cli cluster create ess \
15+
oblt-cli cluster create ess \
1716
--stack-version "$STACK_VERSION" \
1817
--cluster-name-prefix ea-hosted-it \
1918
--output-file="${PWD}/cluster-info.json" \

.oblt-cli-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.19.0
1+
7.21.0

0 commit comments

Comments
 (0)