From 0e15a7a37a9f53c325ff739bb6b1a339f63451b4 Mon Sep 17 00:00:00 2001 From: Kostas Botsas Date: Wed, 15 Jan 2025 16:42:53 +0200 Subject: [PATCH] move block under DRA group --- .buildkite/pipeline.yml | 151 +++++++++++++++++++--------------------- 1 file changed, 70 insertions(+), 81 deletions(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 3f24596b1..0b9c0bfdb 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -574,16 +574,79 @@ steps: - "perf8-report-*/**/*" # ---- - # Test + # DRA publishing # ---- - - group: "New pipeline steps test" - key: "new_pipeline_steps_test" + - group: ":truck: Packaging and DRA" + key: "mbp_dra_group" + if: "(build.branch == \"main\" || build.branch == \"8.x\" || build.branch == \"8.16\" || build.branch == \"8.17\" || build.pull_request.labels includes \"ci:packaging\")" # Add new maintenance branches here depends_on: - "lint" - "unit_tests" - "smoke_test" - "relevant_ftests" steps: + # ---- + # Docker builds for amd64 + # ---- + - label: "Building amd64 Docker image" + agents: + provider: aws + instanceType: m6i.xlarge + imagePrefix: ci-amazonlinux-2 + env: + ARCHITECTURE: "amd64" + DOCKERFILE_PATH: "Dockerfile.wolfi" + command: ".buildkite/publish/build-docker.sh" + key: "build_docker_image_amd64" + artifact_paths: ".artifacts/*.tar.gz" + - label: "Testing amd64 Docker image" + agents: + provider: aws + instanceType: m6i.xlarge + imagePrefix: ci-amazonlinux-2 + env: + ARCHITECTURE: "amd64" + DOCKERFILE_PATH: "Dockerfile.wolfi" + depends_on: "build_docker_image_amd64" + key: "test_docker_image_amd64" + commands: + - "mkdir -p .artifacts" + - buildkite-agent artifact download '.artifacts/*.tar.gz*' .artifacts/ --step build_docker_image_amd64 + - ".buildkite/publish/test-docker.sh" + + # ---- + # Docker builds for arm64 + # ---- + - label: "Building arm64 Docker image" + agents: + provider: aws + instanceType: m6g.xlarge + imagePrefix: ci-amazonlinux-2-aarch64 + diskSizeGb: 40 + diskName: '/dev/xvda' + env: + ARCHITECTURE: "arm64" + DOCKERFILE_PATH: "Dockerfile.wolfi" + command: ".buildkite/publish/build-docker.sh" + key: "build_docker_image_arm64" + artifact_paths: ".artifacts/*.tar.gz" + - label: "Testing arm64 Docker image" + agents: + provider: aws + instanceType: m6g.xlarge + imagePrefix: ci-amazonlinux-2-aarch64 + diskSizeGb: 40 + diskName: '/dev/xvda' + env: + ARCHITECTURE: "arm64" + DOCKERFILE_PATH: "Dockerfile.wolfi" + depends_on: "build_docker_image_arm64" + key: "test_docker_image_arm64" + commands: + - "mkdir -p .artifacts" + - buildkite-agent artifact download '.artifacts/*.tar.gz*' .artifacts/ --step build_docker_image_arm64 + - ".buildkite/publish/test-docker.sh" + # ---- # Extensible Dockerfile build, tests and vunlerability scan on amd64 # ---- @@ -616,7 +679,7 @@ steps: - "mkdir -p .artifacts" - buildkite-agent artifact download '.artifacts/*.tar.gz*' .artifacts/ --step build_extensible_dockerfile_image_amd64 - ".buildkite/publish/test-docker.sh" - - label: "Trivy Scan amd64 extensible Dockerfile Artifacts" + - label: "Trivy Scan amd64 extensible Dockerfile image" timeout_in_minutes: 10 depends_on: - test_extensible_dockerfile_image_amd64 @@ -663,7 +726,7 @@ steps: - "mkdir -p .artifacts" - buildkite-agent artifact download '.artifacts/*.tar.gz*' .artifacts/ --step build_extensible_dockerfile_ftest_image_amd64 - ".buildkite/publish/test-docker.sh" - - label: "Trivy Scan amd64 extensible Dockerfile.ftest Artifacts" + - label: "Trivy Scan amd64 extensible Dockerfile.ftest image" timeout_in_minutes: 10 depends_on: - test_extensible_dockerfile_ftest_image_amd64 @@ -714,7 +777,7 @@ steps: - "mkdir -p .artifacts" - buildkite-agent artifact download '.artifacts/*.tar.gz*' .artifacts/ --step build_extensible_dockerfile_image_arm64 - ".buildkite/publish/test-docker.sh" - - label: "Trivy Scan arm64 extensible Dockerfile Artifacts" + - label: "Trivy Scan arm64 extensible Dockerfile image" timeout_in_minutes: 10 depends_on: - test_extensible_dockerfile_image_arm64 @@ -765,7 +828,7 @@ steps: - "mkdir -p .artifacts" - buildkite-agent artifact download '.artifacts/*.tar.gz*' .artifacts/ --step build_extensible_dockerfile_ftest_image_arm64 - ".buildkite/publish/test-docker.sh" - - label: "Trivy Scan arm64 extensible Dockerfile.ftest Artifacts" + - label: "Trivy Scan arm64 extensible Dockerfile.ftest image" timeout_in_minutes: 10 depends_on: - test_extensible_dockerfile_ftest_image_arm64 @@ -780,80 +843,6 @@ steps: env | grep TRIVY find .artifacts -type f -name '*.tar.gz*' -exec trivy image --quiet --input {} \; - # ---- - # DRA publishing - # ---- - - group: ":truck: Packaging and DRA" - key: "mbp_dra_group" - if: "(build.branch == \"main\" || build.branch == \"8.x\" || build.branch == \"8.16\" || build.branch == \"8.17\" || build.pull_request.labels includes \"ci:packaging\")" # Add new maintenance branches here - depends_on: - - "lint" - - "unit_tests" - - "smoke_test" - - "relevant_ftests" - steps: - # ---- - # Docker builds for amd64 - # ---- - - label: "Building amd64 Docker image" - agents: - provider: aws - instanceType: m6i.xlarge - imagePrefix: ci-amazonlinux-2 - env: - ARCHITECTURE: "amd64" - DOCKERFILE_PATH: "Dockerfile.wolfi" - command: ".buildkite/publish/build-docker.sh" - key: "build_docker_image_amd64" - artifact_paths: ".artifacts/*.tar.gz" - - label: "Testing amd64 Docker image" - agents: - provider: aws - instanceType: m6i.xlarge - imagePrefix: ci-amazonlinux-2 - env: - ARCHITECTURE: "amd64" - DOCKERFILE_PATH: "Dockerfile.wolfi" - depends_on: "build_docker_image_amd64" - key: "test_docker_image_amd64" - commands: - - "mkdir -p .artifacts" - - buildkite-agent artifact download '.artifacts/*.tar.gz*' .artifacts/ --step build_docker_image_amd64 - - ".buildkite/publish/test-docker.sh" - - # ---- - # Docker builds for arm64 - # ---- - - label: "Building arm64 Docker image" - agents: - provider: aws - instanceType: m6g.xlarge - imagePrefix: ci-amazonlinux-2-aarch64 - diskSizeGb: 40 - diskName: '/dev/xvda' - env: - ARCHITECTURE: "arm64" - DOCKERFILE_PATH: "Dockerfile.wolfi" - command: ".buildkite/publish/build-docker.sh" - key: "build_docker_image_arm64" - artifact_paths: ".artifacts/*.tar.gz" - - label: "Testing arm64 Docker image" - agents: - provider: aws - instanceType: m6g.xlarge - imagePrefix: ci-amazonlinux-2-aarch64 - diskSizeGb: 40 - diskName: '/dev/xvda' - env: - ARCHITECTURE: "arm64" - DOCKERFILE_PATH: "Dockerfile.wolfi" - depends_on: "build_docker_image_arm64" - key: "test_docker_image_arm64" - commands: - - "mkdir -p .artifacts" - - buildkite-agent artifact download '.artifacts/*.tar.gz*' .artifacts/ --step build_docker_image_arm64 - - ".buildkite/publish/test-docker.sh" - - label: ":truck: Publish DRA Items" <<: *test-agents key: "publish-dra-artifacts"