From 37e84d746c69bd7a42d6db1e21399e0b1fc2e2d3 Mon Sep 17 00:00:00 2001 From: Brian Seeders Date: Tue, 10 Sep 2024 17:07:25 -0400 Subject: [PATCH 1/3] Add missing references to Wolfi docker image tasks --- .buildkite/scripts/dra-workflow.sh | 41 +++++++++++++++--------------- distribution/docker/build.gradle | 5 +++- 2 files changed, 25 insertions(+), 21 deletions(-) diff --git a/.buildkite/scripts/dra-workflow.sh b/.buildkite/scripts/dra-workflow.sh index ecfb8088072a0..d3cb623c7a6e4 100755 --- a/.buildkite/scripts/dra-workflow.sh +++ b/.buildkite/scripts/dra-workflow.sh @@ -3,7 +3,8 @@ set -euo pipefail WORKFLOW="${DRA_WORKFLOW:-snapshot}" -BRANCH="${BUILDKITE_BRANCH:-}" +# BRANCH="${BUILDKITE_BRANCH:-}" +BRANCH="main" # Don't publish main branch to staging if [[ "$BRANCH" == "main" && "$WORKFLOW" == "staging" ]]; then @@ -69,22 +70,22 @@ find "$WORKSPACE" -type f -path "*/build/distributions/*" -exec chmod a+r {} \; # Allow other users write access to create checksum files find "$WORKSPACE" -type d -path "*/build/distributions" -exec chmod a+w {} \; -echo --- Running release-manager - -# Artifacts should be generated -docker run --rm \ - --name release-manager \ - -e VAULT_ADDR="$DRA_VAULT_ADDR" \ - -e VAULT_ROLE_ID="$DRA_VAULT_ROLE_ID_SECRET" \ - -e VAULT_SECRET_ID="$DRA_VAULT_SECRET_ID_SECRET" \ - --mount type=bind,readonly=false,src="$PWD",target=/artifacts \ - docker.elastic.co/infra/release-manager:latest \ - cli collect \ - --project elasticsearch \ - --branch "$RM_BRANCH" \ - --commit "$BUILDKITE_COMMIT" \ - --workflow "$WORKFLOW" \ - --version "$ES_VERSION" \ - --artifact-set main \ - --dependency "beats:https://artifacts-${WORKFLOW}.elastic.co/beats/${BEATS_BUILD_ID}/manifest-${ES_VERSION}${VERSION_SUFFIX}.json" \ - --dependency "ml-cpp:https://artifacts-${WORKFLOW}.elastic.co/ml-cpp/${ML_CPP_BUILD_ID}/manifest-${ES_VERSION}${VERSION_SUFFIX}.json" +# echo --- Running release-manager + +# # Artifacts should be generated +# docker run --rm \ +# --name release-manager \ +# -e VAULT_ADDR="$DRA_VAULT_ADDR" \ +# -e VAULT_ROLE_ID="$DRA_VAULT_ROLE_ID_SECRET" \ +# -e VAULT_SECRET_ID="$DRA_VAULT_SECRET_ID_SECRET" \ +# --mount type=bind,readonly=false,src="$PWD",target=/artifacts \ +# docker.elastic.co/infra/release-manager:latest \ +# cli collect \ +# --project elasticsearch \ +# --branch "$RM_BRANCH" \ +# --commit "$BUILDKITE_COMMIT" \ +# --workflow "$WORKFLOW" \ +# --version "$ES_VERSION" \ +# --artifact-set main \ +# --dependency "beats:https://artifacts-${WORKFLOW}.elastic.co/beats/${BEATS_BUILD_ID}/manifest-${ES_VERSION}${VERSION_SUFFIX}.json" \ +# --dependency "ml-cpp:https://artifacts-${WORKFLOW}.elastic.co/ml-cpp/${ML_CPP_BUILD_ID}/manifest-${ES_VERSION}${VERSION_SUFFIX}.json" diff --git a/distribution/docker/build.gradle b/distribution/docker/build.gradle index 11c6010c22af0..4ca170178fa53 100644 --- a/distribution/docker/build.gradle +++ b/distribution/docker/build.gradle @@ -515,6 +515,8 @@ subprojects { Project subProject -> base = DockerBase.CLOUD_ESS } else if (subProject.name.contains('cloud-')) { base = DockerBase.CLOUD + } else if (subProject.name.contains('wolfi-')) { + base = DockerBase.WOLFI } final String arch = architecture == Architecture.AARCH64 ? '-aarch64' : '' @@ -522,7 +524,8 @@ subprojects { Project subProject -> (base == DockerBase.IRON_BANK ? 'ironbank.tar' : (base == DockerBase.CLOUD ? 'cloud.tar' : (base == DockerBase.CLOUD_ESS ? 'cloud-ess.tar' : - 'docker.tar'))) + (base == DockerBase.WOLFI ? 'wolfi.tar' : + 'docker.tar')))) final String artifactName = "elasticsearch${arch}${base.suffix}_test" final String exportTaskName = taskName("export", architecture, base, 'DockerImage') From 43904b5e14c26b0e94d78649f63c2912fa48c381 Mon Sep 17 00:00:00 2001 From: Brian Seeders Date: Tue, 10 Sep 2024 17:27:31 -0400 Subject: [PATCH 2/3] Revert testing changes --- .buildkite/scripts/dra-workflow.sh | 41 +++++++++++++++--------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/.buildkite/scripts/dra-workflow.sh b/.buildkite/scripts/dra-workflow.sh index d3cb623c7a6e4..ecfb8088072a0 100755 --- a/.buildkite/scripts/dra-workflow.sh +++ b/.buildkite/scripts/dra-workflow.sh @@ -3,8 +3,7 @@ set -euo pipefail WORKFLOW="${DRA_WORKFLOW:-snapshot}" -# BRANCH="${BUILDKITE_BRANCH:-}" -BRANCH="main" +BRANCH="${BUILDKITE_BRANCH:-}" # Don't publish main branch to staging if [[ "$BRANCH" == "main" && "$WORKFLOW" == "staging" ]]; then @@ -70,22 +69,22 @@ find "$WORKSPACE" -type f -path "*/build/distributions/*" -exec chmod a+r {} \; # Allow other users write access to create checksum files find "$WORKSPACE" -type d -path "*/build/distributions" -exec chmod a+w {} \; -# echo --- Running release-manager - -# # Artifacts should be generated -# docker run --rm \ -# --name release-manager \ -# -e VAULT_ADDR="$DRA_VAULT_ADDR" \ -# -e VAULT_ROLE_ID="$DRA_VAULT_ROLE_ID_SECRET" \ -# -e VAULT_SECRET_ID="$DRA_VAULT_SECRET_ID_SECRET" \ -# --mount type=bind,readonly=false,src="$PWD",target=/artifacts \ -# docker.elastic.co/infra/release-manager:latest \ -# cli collect \ -# --project elasticsearch \ -# --branch "$RM_BRANCH" \ -# --commit "$BUILDKITE_COMMIT" \ -# --workflow "$WORKFLOW" \ -# --version "$ES_VERSION" \ -# --artifact-set main \ -# --dependency "beats:https://artifacts-${WORKFLOW}.elastic.co/beats/${BEATS_BUILD_ID}/manifest-${ES_VERSION}${VERSION_SUFFIX}.json" \ -# --dependency "ml-cpp:https://artifacts-${WORKFLOW}.elastic.co/ml-cpp/${ML_CPP_BUILD_ID}/manifest-${ES_VERSION}${VERSION_SUFFIX}.json" +echo --- Running release-manager + +# Artifacts should be generated +docker run --rm \ + --name release-manager \ + -e VAULT_ADDR="$DRA_VAULT_ADDR" \ + -e VAULT_ROLE_ID="$DRA_VAULT_ROLE_ID_SECRET" \ + -e VAULT_SECRET_ID="$DRA_VAULT_SECRET_ID_SECRET" \ + --mount type=bind,readonly=false,src="$PWD",target=/artifacts \ + docker.elastic.co/infra/release-manager:latest \ + cli collect \ + --project elasticsearch \ + --branch "$RM_BRANCH" \ + --commit "$BUILDKITE_COMMIT" \ + --workflow "$WORKFLOW" \ + --version "$ES_VERSION" \ + --artifact-set main \ + --dependency "beats:https://artifacts-${WORKFLOW}.elastic.co/beats/${BEATS_BUILD_ID}/manifest-${ES_VERSION}${VERSION_SUFFIX}.json" \ + --dependency "ml-cpp:https://artifacts-${WORKFLOW}.elastic.co/ml-cpp/${ML_CPP_BUILD_ID}/manifest-${ES_VERSION}${VERSION_SUFFIX}.json" From f52a0b65cdbc9dcf0cf6a2e8aa728914eb22e2de Mon Sep 17 00:00:00 2001 From: Brian Seeders Date: Tue, 10 Sep 2024 17:28:20 -0400 Subject: [PATCH 3/3] Fix indentation --- distribution/docker/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distribution/docker/build.gradle b/distribution/docker/build.gradle index 4ca170178fa53..30974ed2396a8 100644 --- a/distribution/docker/build.gradle +++ b/distribution/docker/build.gradle @@ -525,7 +525,7 @@ subprojects { Project subProject -> (base == DockerBase.CLOUD ? 'cloud.tar' : (base == DockerBase.CLOUD_ESS ? 'cloud-ess.tar' : (base == DockerBase.WOLFI ? 'wolfi.tar' : - 'docker.tar')))) + 'docker.tar')))) final String artifactName = "elasticsearch${arch}${base.suffix}_test" final String exportTaskName = taskName("export", architecture, base, 'DockerImage')