Skip to content

Commit cb4d612

Browse files
pkoutsovasilispkoutsovasilis
authored
Merge branch 'main' into dependabot/go_modules/testing/github.com/docker/docker-28.3.1incompatible
2 parents d50b55f + 34a1057 commit cb4d612

25 files changed

+260
-100
lines changed

‎.buildkite/hooks/pre-command

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ set -euo pipefail
44

55
source .buildkite/scripts/common.sh
66

7-
DOCKER_REGISTRY_SECRET_PATH="kv/ci-shared/platform-ingest/docker_registry_prod"
87
EC_KEY_SECRET_PATH="kv/ci-shared/platform-ingest/platform-ingest-ec-prod"
98
CI_DRA_ROLE_PATH="kv/ci-shared/release/dra-role"
109
JOB_GCS_BUCKET="fleet-server-ci-internal"
@@ -45,14 +44,7 @@ if [[ "$BUILDKITE_PIPELINE_SLUG" == "fleet-server-package-mbp" ]]; then
4544
check_if_file_exist_in_repo "infra" "${_branch}" #TODO should be changed to "main" for rollback...
4645
fi
4746

48-
if [[ "$BUILDKITE_PIPELINE_SLUG" == "fleet-server" || "$BUILDKITE_PIPELINE_SLUG" == "fleet-server-perf-tests" ]]; then
49-
if [[ "$BUILDKITE_STEP_KEY" == "publish" || "$BUILDKITE_STEP_KEY" == "cloud-e2e-test" || "$BUILDKITE_STEP_KEY" == "cloud-e2e-fips-test" || "$BUILDKITE_STEP_KEY" == "create-image" ]]; then
50-
export DOCKER_USERNAME_SECRET=$(retry 5 vault kv get -field user "${DOCKER_REGISTRY_SECRET_PATH}")
51-
export DOCKER_PASSWORD_SECRET=$(retry 5 vault kv get -field password "${DOCKER_REGISTRY_SECRET_PATH}")
52-
docker login -u "${DOCKER_USERNAME_SECRET}" -p "${DOCKER_PASSWORD_SECRET}" "${DOCKER_REGISTRY}" 2>/dev/null
53-
fi
54-
fi
55-
47+
# TODO: use a builkite plugin to handle this
5648
if [[ "$BUILDKITE_PIPELINE_SLUG" == "fleet-server" ]]; then
5749
if [[ "$BUILDKITE_STEP_KEY" == "cloud-e2e-test" || "$BUILDKITE_STEP_KEY" == "cloud-e2e-fips-test" ]]; then
5850
export EC_API_KEY_SECRET=$(retry 5 vault kv get -field apiKey "${EC_KEY_SECRET_PATH}")
@@ -61,21 +53,9 @@ if [[ "$BUILDKITE_PIPELINE_SLUG" == "fleet-server" ]]; then
6153
fi
6254
fi
6355

64-
# BK analytics
65-
if [[ "$BUILDKITE_PIPELINE_SLUG" == "fleet-server" ]]; then
66-
if [[ "$BUILDKITE_STEP_KEY" == "int-test" || "$BUILDKITE_STEP_KEY" == "e2e-test" || "$BUILDKITE_STEP_KEY" == "fips-e2e-test" ]]; then
67-
echo "--- Prepare BK test analytics token :vault:"
68-
BUILDKITE_ANALYTICS_TOKEN=$(vault kv get -field token kv/ci-shared/platform-ingest/buildkite_fleet_server_analytics_token)
69-
export BUILDKITE_ANALYTICS_TOKEN
70-
fi
71-
fi
72-
73-
56+
# TODO: use a builkite plugin to handle this
7457
if [[ "$BUILDKITE_PIPELINE_SLUG" == "fleet-server-package-mbp" ]]; then
7558
if [[ "$BUILDKITE_STEP_KEY" == "dra-snapshot" || "$BUILDKITE_STEP_KEY" == "dra-staging" ]]; then
76-
export DOCKER_USERNAME_SECRET=$(retry 5 vault kv get -field user "${DOCKER_REGISTRY_SECRET_PATH}")
77-
export DOCKER_PASSWORD_SECRET=$(retry 5 vault kv get -field password "${DOCKER_REGISTRY_SECRET_PATH}")
78-
docker login -u "${DOCKER_USERNAME_SECRET}" -p "${DOCKER_PASSWORD_SECRET}" "${DOCKER_REGISTRY}" 2>/dev/null
7959
DRA_CREDS_SECRET=$(retry 5 vault kv get -field=data -format=json ${CI_DRA_ROLE_PATH})
8060
export VAULT_ADDR_SECRET=$(echo ${DRA_CREDS_SECRET} | jq -r '.vault_addr')
8161
export VAULT_ROLE_ID_SECRET=$(echo ${DRA_CREDS_SECRET} | jq -r '.role_id')

‎.buildkite/hooks/pre-exit

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,6 @@ set -euo pipefail
44

55
source .buildkite/scripts/common.sh
66

7-
if [[ "$BUILDKITE_PIPELINE_SLUG" == "fleet-server" || "$BUILDKITE_PIPELINE_SLUG" == "fleet-server-perf-tests" ]]; then
8-
if [[ "$BUILDKITE_STEP_KEY" == "publish" || "$BUILDKITE_STEP_KEY" == "cloud-e2e-test" || "$BUILDKITE_STEP_KEY" == "create-image" ]]; then
9-
docker logout ${DOCKER_REGISTRY}
10-
fi
11-
fi
12-
137
if [[ "$BUILDKITE_PIPELINE_SLUG" == "fleet-server" && "$BUILDKITE_STEP_KEY" == "release-test" ]]; then
148
cleanup
159
fi
@@ -19,7 +13,6 @@ if [[ "$BUILDKITE_PIPELINE_SLUG" == "fleet-server-package-mbp" ]]; then
1913
unset VAULT_ROLE_ID_SECRET
2014
unset VAULT_ADDR_SECRET
2115
unset VAULT_SECRET_ID_SECRET
22-
docker logout ${DOCKER_REGISTRY}
2316
cleanup
2417
fi
2518
fi

‎.buildkite/pipeline.package.mbp.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
name: "fleet server package mbp"
33
env:
44
REPO: 'fleet-server'
5-
DOCKER_REGISTRY: "docker.elastic.co"
65
IMAGE_UBUNTU_X86_64: "family/core-ubuntu-2004"
76
IMAGE_UBUNTU_ARM_64: "core-ubuntu-2004-aarch64"
87

‎.buildkite/pipeline.perf-tests.yaml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,26 @@
11
# yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
22

33
env:
4-
DOCKER_REGISTRY: "docker.elastic.co"
5-
DOCKER_IMAGE: "${DOCKER_REGISTRY}/observability-ci/fleet-server" # needs to rename for rollback
4+
DOCKER_IMAGE: "docker.elastic.co/observability-ci/fleet-server" # needs to rename for rollback
65
DOCKER_IMAGE_GIT_TAG: "${BUILDKITE_BRANCH}" # needs to rename for rollback
76
DOCKER_IMAGE_LATEST_TAG: "latest" # needs to rename for rollback
87
DOCKER_IMAGE_SHA_TAG: "git-${BUILDKITE_COMMIT:0:12}" # needs to rename for rollback, should be "git-${BUILDKITE_COMMIT:0:12}"
98

9+
# This section is used to define the plugins that will be used in the pipeline.
10+
# See https://buildkite.com/docs/pipelines/integrations/plugins/using#using-yaml-anchors-with-plugins
11+
common:
12+
- docker_elastic_login_plugin: &docker_elastic_login_plugin
13+
elastic/vault-docker-login#v0.6.0:
14+
secret_path: 'kv/ci-shared/platform-ingest/elastic_docker_registry'
15+
1016
steps:
1117
- label: ":docker: Publish docker image"
1218
key: "create-image"
1319
command: ".buildkite/scripts/build_push_docker_image.sh"
1420
agents:
1521
provider: "gcp"
22+
plugins:
23+
- *docker_elastic_login_plugin
1624

1725
- label: "perf test"
1826
key: "obs-perf-test"

‎.buildkite/pipeline.yml

Lines changed: 28 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,24 @@ env:
44
DOCKER_COMPOSE_VERSION: "1.25.5"
55
TERRAFORM_VERSION: "1.6.4"
66

7+
# This section is used to define the plugins that will be used in the pipeline.
8+
# See https://buildkite.com/docs/pipelines/integrations/plugins/using#using-yaml-anchors-with-plugins
9+
common:
10+
- test_collector_plugin: &test_collector_plugin
11+
test-collector#v1.11.0:
12+
files: "build/test-*.xml"
13+
format: "junit"
14+
branches: "main"
15+
debug: true
16+
- bk_analytics_token_plugin: &bk_analytics_token_plugin
17+
elastic/vault-secrets#v0.1.0:
18+
path: "kv/ci-shared/platform-ingest/buildkite_analytics_token"
19+
field: "token"
20+
env_var: "BUILDKITE_ANALYTICS_TOKEN"
21+
- docker_elastic_login_plugin: &docker_elastic_login_plugin
22+
elastic/vault-docker-login#v0.6.0:
23+
secret_path: 'kv/ci-shared/platform-ingest/elastic_docker_registry'
24+
725
steps:
826

927
- label: "Validate catalog-info"
@@ -136,11 +154,8 @@ steps:
136154
artifact_paths:
137155
- build/*.xml
138156
plugins:
139-
- test-collector#v1.10.2:
140-
files: "build/test-*.xml"
141-
format: "junit"
142-
branches: "main"
143-
debug: true
157+
- *bk_analytics_token_plugin
158+
- *test_collector_plugin
144159

145160
- label: "E2E Test"
146161
key: "e2e-test"
@@ -151,11 +166,8 @@ steps:
151166
- build/*.xml
152167
- build/e2e-coverage.out
153168
plugins:
154-
- test-collector#v1.10.2:
155-
files: "build/test-*.xml"
156-
format: "junit"
157-
branches: "main"
158-
debug: true
169+
- *bk_analytics_token_plugin
170+
- *test_collector_plugin
159171

160172
- label: ":junit: Junit annotate"
161173
plugins:
@@ -193,7 +205,6 @@ steps:
193205
- label: ":gcloud: Cloud e2e Test"
194206
key: "cloud-e2e-test"
195207
env:
196-
DOCKER_REGISTRY: "docker.elastic.co"
197208
DOCKER_IMAGE: "docker.elastic.co/beats-ci/elastic-agent-cloud-fleet"
198209
DOCKER_IMAGE_TAG: "pr-${BUILDKITE_PULL_REQUEST}-${BUILDKITE_COMMIT:0:12}"
199210
SNAPSHOT: "true"
@@ -202,6 +213,8 @@ steps:
202213
command: ".buildkite/scripts/cloud_e2e_test.sh"
203214
agents:
204215
provider: "gcp"
216+
plugins:
217+
- *docker_elastic_login_plugin
205218
depends_on:
206219
- step: "unit-test"
207220
allow_failure: false
@@ -218,7 +231,6 @@ steps:
218231
- label: ":gcloud: Cloud e2e FIPS Test"
219232
key: "cloud-e2e-fips-test"
220233
env:
221-
DOCKER_REGISTRY: "docker.elastic.co"
222234
DOCKER_BASE_IMAGE: "docker.elastic.co/cloud-release/elastic-agent-cloud-fips"
223235
DOCKER_IMAGE: "docker.elastic.co/beats-ci/elastic-agent-cloud-fips"
224236
DOCKER_IMAGE_TAG: "pr-${BUILDKITE_PULL_REQUEST}-${BUILDKITE_COMMIT:0:12}"
@@ -229,6 +241,8 @@ steps:
229241
command: ".buildkite/scripts/cloud_e2e_test.sh"
230242
agents:
231243
provider: "gcp"
244+
plugins:
245+
- *docker_elastic_login_plugin
232246
depends_on:
233247
- step: "unit-test"
234248
allow_failure: false
@@ -246,20 +260,20 @@ steps:
246260
key: "publish"
247261
command: ".buildkite/scripts/build_push_docker_image.sh"
248262
env:
249-
DOCKER_REGISTRY: "docker.elastic.co"
250263
DOCKER_IMAGE: "docker.elastic.co/observability-ci/fleet-server" # needs to rename for rollback
251264
DOCKER_IMAGE_SHA_TAG: "git-${BUILDKITE_COMMIT:0:12}" # needs to rename for rollback, should be "git-${BUILDKITE_COMMIT:0:12}"
252265
DOCKER_IMAGE_LATEST_TAG: "latest" # needs to rename for rollback
253266
DOCKER_IMAGE_GIT_TAG: "${BUILDKITE_BRANCH}" # needs to rename for rollback
254267
if: "build.env('BUILDKITE_PULL_REQUEST') == 'false' && build.env('BUILDKITE_BRANCH') == 'main'"
255268
agents:
256269
provider: "gcp"
270+
plugins:
271+
- *docker_elastic_login_plugin
257272
depends_on:
258273
- step: "tests"
259274
allow_failure: false
260275

261276
- label: ":serverless::argo: Run synthetics tests and update fleet to ${BUILDKITE_COMMIT:0:12} in serverless-gitops"
262-
async: true
263277
branches: main
264278
trigger: gpctl-promote-after-serverless-devenv-synthetics
265279
build:
@@ -288,7 +302,6 @@ steps:
288302
- label: ":jenkins: Release - Package Registry Distribution"
289303
key: "release-package-registry"
290304
trigger: "package-registry-release-package-registry-distribution"
291-
async: true
292305
build:
293306
branch: "main"
294307
meta_data:
@@ -298,7 +311,6 @@ steps:
298311
- trigger: "fleet-server-package-mbp"
299312
label: ":esbuild: Downstream - Package"
300313
key: "downstream-package"
301-
async: true
302314
if: "build.env('BUILDKITE_PULL_REQUEST') == 'false' && build.env('BUILDKITE_TAG') == '' && build.env('BUILDKITE_BRANCH') != ''"
303315
build:
304316
branch: "${BUILDKITE_BRANCH}"

‎.buildkite/scripts/build_push_docker_image.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ with_mage
1313
echo "Building the docker image..."
1414
if ! docker pull -q ${DOCKER_IMAGE}:${DOCKER_IMAGE_SHA_TAG} 2> /dev/null; then
1515
DOCKER_IMAGE_TAG="${DOCKER_IMAGE_SHA_TAG}"
16-
DOCKER_IMAGE=${DOCKER_IMAGE} DOCKER_IMAGE_TAG=${DOCKER_IMAGE_TAG} mage docker:image docker:push
16+
DOCKER_IMAGE=${DOCKER_IMAGE} DOCKER_IMAGE_TAG=${DOCKER_IMAGE_TAG} mage docker:publish
1717
fi
1818

1919
if [[ "${DOCKER_IMAGE_GIT_TAG}" == "main" ]]; then
20-
DOCKER_IMAGE=${DOCKER_IMAGE} DOCKER_IMAGE_TAG="${DOCKER_IMAGE_LATEST_TAG}" mage docker:image docker:push
20+
DOCKER_IMAGE=${DOCKER_IMAGE} DOCKER_IMAGE_TAG="${DOCKER_IMAGE_LATEST_TAG}" mage docker:publish
2121
elif [[ ${BUILDKITE_PULL_REQUEST} == "false" ]]; then
22-
DOCKER_IMAGE=${DOCKER_IMAGE} DOCKER_IMAGE_TAG="${DOCKER_IMAGE_GIT_TAG}" mage docker:image docker:push
22+
DOCKER_IMAGE=${DOCKER_IMAGE} DOCKER_IMAGE_TAG="${DOCKER_IMAGE_GIT_TAG}" mage docker:publish
2323
fi

‎.buildkite/scripts/common.sh

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,6 @@ retry() {
9090
return 0
9191
}
9292

93-
docker_logout() {
94-
echo "Logging out from Docker..."
95-
docker logout ${DOCKER_REGISTRY}
96-
}
97-
9893
with_Terraform() {
9994
echo "Setting up the Terraform environment..."
10095
local path_to_file="${WORKSPACE}/terraform.zip"

‎.github/CODEOWNERS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@
33

44
# Allow to auto-merge PRs with Mergify
55
dev-tools/integration/.env
6+
7+
/.github/workflows @elastic/observablt-ci

‎.github/dependabot.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@ updates:
2222
directories:
2323
- '/'
2424
- '/.github/actions/*'
25-
reviewers:
26-
- "elastic/observablt-ci"
27-
- "elastic/observablt-ci-contractors"
2825
schedule:
2926
interval: "weekly"
3027
day: "sunday"

‎.github/workflows/bump-elastic-stack-snapshot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- uses: actions/checkout@v4
3333

3434
- name: Install Updatecli in the runner
35-
uses: updatecli/updatecli-action@1536e372d5f433385f11b5b133b23a9833c510ce # v2.86.0
35+
uses: updatecli/updatecli-action@fe1c9dbd7a0442ffb01dcf150a21514fc8d09ab7 # v2.87.0
3636

3737
- name: Run Updatecli in Apply mode
3838
run: updatecli apply --config .ci/bump-elastic-stack-snapshot.yml

0 commit comments

Comments
 (0)