From 871e5e86d2748b3712feba5c872559c16762f32d Mon Sep 17 00:00:00 2001 From: Nicolas Schweitzer Date: Mon, 20 Jan 2025 09:23:09 +0100 Subject: [PATCH] fix(test): Prevent skipping and use correct image version --- .gitlab-ci.yml | 3 +-- .gitlab/kernel_version_testing.yml | 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a1462d53..15235b43 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,7 +8,6 @@ stages: - setup - build - availability_message - - trigger_build_kernels - test - dev_envs - devcontainer @@ -325,7 +324,7 @@ build_gitlab_agent_deploy: IMAGE: gitlab_agent_deploy trigger_build_kernels: - stage: trigger_build_kernels + stage: test needs: ["build_kernel_version_testing_x64", "build_kernel_version_testing_arm64"] rules: diff --git a/.gitlab/kernel_version_testing.yml b/.gitlab/kernel_version_testing.yml index 09a8a333..12bcba7f 100644 --- a/.gitlab/kernel_version_testing.yml +++ b/.gitlab/kernel_version_testing.yml @@ -4,6 +4,7 @@ stages: variables: + IMAGE_VERSION: "v${PARENT_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}" LINUX_SRC_DIR: /tmp/kernel-src S3_DD_AGENT_OMNIBUS_KERNEL_VERSION_TESTING_URI: s3://dd-agent-omnibus/kernel-version-testing @@ -48,7 +49,7 @@ variables: build_kernels_x64: extends: .build_kernels - image: registry.ddbuild.io/ci/datadog-agent-buildimages/kernel-version-testing_x64${ECR_TEST_ONLY}:v$PARENT_PIPELINE_ID + image: registry.ddbuild.io/ci/datadog-agent-buildimages/kernel-version-testing_x64${ECR_TEST_ONLY}:$IMAGE_VERSION tags: [ "runner:main" ] variables: ARCH: x86 @@ -59,7 +60,7 @@ build_kernels_x64: build_kernels_arm64: extends: .build_kernels - image: registry.ddbuild.io/ci/datadog-agent-buildimages/kernel-version-testing_arm64${ECR_TEST_ONLY}:v$PARENT_PIPELINE_ID + image: registry.ddbuild.io/ci/datadog-agent-buildimages/kernel-version-testing_arm64${ECR_TEST_ONLY}:$IMAGE_VERSION tags: [ "runner:docker-arm", "platform:arm64" ] variables: ARCH: arm64