From b85b84fde6accd3d270e12843c52728ba2014f35 Mon Sep 17 00:00:00 2001 From: Valentine Burley Date: Wed, 14 May 2025 15:34:56 +0200 Subject: [PATCH] ci/lava: Drop LAVA_DISTRIBUTION_TAG The alpine/x86_64_lava-trigger image was set up in a way that avoids conflicts with MESA_IMAGE_PATH and FDO_DISTRIBUTION_TAG. Signed-off-by: Valentine Burley Part-of: --- .gitlab-ci/container/fdo_cntr_export.sh | 3 +-- .gitlab-ci/container/gitlab-ci.yml | 6 ------ .gitlab-ci/lava/lava-gitlab-ci.yml | 23 +++++++++-------------- 3 files changed, 10 insertions(+), 22 deletions(-) diff --git a/.gitlab-ci/container/fdo_cntr_export.sh b/.gitlab-ci/container/fdo_cntr_export.sh index 7cb3ff4fec9..cc5041e344c 100644 --- a/.gitlab-ci/container/fdo_cntr_export.sh +++ b/.gitlab-ci/container/fdo_cntr_export.sh @@ -65,8 +65,7 @@ buildah umount "$container" buildah rm "$container" # Upload the rootfs tarball to S3. -# The URL format matches the registry format, and LAVA_DISTRIBUTION_TAG is -# used later to match this URL. +# The URL format matches the registry format, making it easier to match this URL later. curl --fail --retry-connrefused --retry 4 --retry-delay 30 \ --header "Authorization: Bearer $(cat "${S3_JWT_FILE}")" \ -X PUT --form file=@"$ROOTFSTAR" \ diff --git a/.gitlab-ci/container/gitlab-ci.yml b/.gitlab-ci/container/gitlab-ci.yml index 9941652b2e7..44a1a57987f 100644 --- a/.gitlab-ci/container/gitlab-ci.yml +++ b/.gitlab-ci/container/gitlab-ci.yml @@ -451,7 +451,6 @@ debian/x86_64_test-gl: - .export-container variables: MESA_IMAGE_TAG: &debian-x86_64_test-gl ${DEBIAN_TEST_GL_TAG} - LAVA_DISTRIBUTION_TAG: "debian/x86_64_test-gl:${DEBIAN_TEST_GL_TAG}--${DEBIAN_BASE_TAG}--${PKG_REPO_REV}--${MESA_TEMPLATES_COMMIT}" .use-debian/x86_64_test-gl: tags: @@ -473,7 +472,6 @@ debian/x86_64_test-vk: - .export-container variables: MESA_IMAGE_TAG: &debian-x86_64_test-vk ${DEBIAN_TEST_VK_TAG} - LAVA_DISTRIBUTION_TAG: "debian/x86_64_test-vk:${DEBIAN_TEST_VK_TAG}--${DEBIAN_BASE_TAG}--${PKG_REPO_REV}--${MESA_TEMPLATES_COMMIT}" .use-debian/x86_64_test-vk: tags: @@ -517,7 +515,6 @@ debian/x86_64_test-video: - .export-container variables: MESA_IMAGE_TAG: &debian-x86_64_test-video ${DEBIAN_TEST_VIDEO_TAG} - LAVA_DISTRIBUTION_TAG: "debian/x86_64_test-video:${DEBIAN_TEST_VIDEO_TAG}--${DEBIAN_BASE_TAG}--${PKG_REPO_REV}--${MESA_TEMPLATES_COMMIT}" .use-debian/x86_64_test-video: tags: @@ -561,7 +558,6 @@ debian/arm32_test-gl: - .export-container variables: MESA_IMAGE_TAG: &debian-arm32_test-gl ${DEBIAN_TEST_GL_TAG} - LAVA_DISTRIBUTION_TAG: "debian/arm32_test-gl:${DEBIAN_TEST_GL_TAG}--${DEBIAN_BASE_TAG}--${PKG_REPO_REV}--${MESA_TEMPLATES_COMMIT}" .use-debian/arm32_test-gl: tags: @@ -609,7 +605,6 @@ debian/arm64_test-gl: - .export-container variables: MESA_IMAGE_TAG: &debian-arm64_test-gl ${DEBIAN_TEST_GL_TAG} - LAVA_DISTRIBUTION_TAG: "debian/arm64_test-gl:${DEBIAN_TEST_GL_TAG}--${DEBIAN_BASE_TAG}--${PKG_REPO_REV}--${MESA_TEMPLATES_COMMIT}" .use-debian/arm64_test-gl: tags: @@ -633,7 +628,6 @@ debian/arm64_test-vk: - .export-container variables: MESA_IMAGE_TAG: &debian-arm64_test-vk ${DEBIAN_TEST_VK_TAG} - LAVA_DISTRIBUTION_TAG: "debian/arm64_test-vk:${DEBIAN_TEST_VK_TAG}--${DEBIAN_BASE_TAG}--${PKG_REPO_REV}--${MESA_TEMPLATES_COMMIT}" .use-debian/arm64_test-vk: tags: diff --git a/.gitlab-ci/lava/lava-gitlab-ci.yml b/.gitlab-ci/lava/lava-gitlab-ci.yml index 66b745aac62..d13d3df8961 100644 --- a/.gitlab-ci/lava/lava-gitlab-ci.yml +++ b/.gitlab-ci/lava/lava-gitlab-ci.yml @@ -37,8 +37,9 @@ variables: LAVA_HTTP_CACHE_URI: "http://caching-proxy/cache/?uri=" # base system generated by the container build job, shared between many pipelines BASE_SYSTEM_HOST_PREFIX: "${S3_HOST}/${S3_KERNEL_BUCKET}" - BASE_SYSTEM_MAINLINE_HOST_PATH: "${BASE_SYSTEM_HOST_PREFIX}/${FDO_UPSTREAM_REPO}/${LAVA_DISTRIBUTION_TAG}" - BASE_SYSTEM_FORK_HOST_PATH: "${BASE_SYSTEM_HOST_PREFIX}/${CI_PROJECT_PATH}/${LAVA_DISTRIBUTION_TAG}" + # path to the LAVA rootfs + BASE_SYSTEM_MAINLINE_HOST_PATH: "${BASE_SYSTEM_HOST_PREFIX}/${FDO_UPSTREAM_REPO}/${MESA_IMAGE_PATH}:${FDO_DISTRIBUTION_TAG}" + BASE_SYSTEM_FORK_HOST_PATH: "${BASE_SYSTEM_HOST_PREFIX}/${CI_PROJECT_PATH}/${MESA_IMAGE_PATH}:${FDO_DISTRIBUTION_TAG}" # per-job build artifacts JOB_RESULTS_PATH: "${JOB_ARTIFACTS_BASE}/results.tar.zst" LAVA_S3_ARTIFACT_NAME: "mesa-${ARCH}-default-debugoptimized" @@ -82,9 +83,8 @@ variables: artifacts: false .lava-x86_64-test-gl: - variables: - LAVA_DISTRIBUTION_TAG: !reference [debian/x86_64_test-gl, variables, LAVA_DISTRIBUTION_TAG] extends: + - .use-debian/x86_64_test-gl - .lava-x86_64-test needs: - !reference [.lava-x86_64-test, needs] @@ -92,9 +92,8 @@ variables: artifacts: false .lava-x86_64-test-video: - variables: - LAVA_DISTRIBUTION_TAG: !reference [debian/x86_64_test-video, variables, LAVA_DISTRIBUTION_TAG] extends: + - .use-debian/x86_64_test-video - .lava-x86_64-test needs: - !reference [.lava-x86_64-test, needs] @@ -102,9 +101,8 @@ variables: artifacts: false .lava-x86_64-test-vk: - variables: - LAVA_DISTRIBUTION_TAG: !reference [debian/x86_64_test-vk, variables, LAVA_DISTRIBUTION_TAG] extends: + - .use-debian/x86_64_test-vk - .lava-x86_64-test needs: - !reference [.lava-x86_64-test, needs] @@ -126,9 +124,8 @@ variables: artifacts: false .lava-arm32-test-gl: - variables: - LAVA_DISTRIBUTION_TAG: !reference [debian/arm32_test-gl, variables, LAVA_DISTRIBUTION_TAG] extends: + - .use-debian/arm32_test-gl - .lava-arm32-test needs: - !reference [.lava-arm32-test, needs] @@ -150,9 +147,8 @@ variables: artifacts: false .lava-arm64-test-gl: - variables: - LAVA_DISTRIBUTION_TAG: !reference [debian/arm64_test-gl, variables, LAVA_DISTRIBUTION_TAG] extends: + - .use-debian/arm64_test-gl - .lava-arm64-test needs: - !reference [.lava-arm64-test, needs] @@ -160,9 +156,8 @@ variables: artifacts: false .lava-arm64-test-vk: - variables: - LAVA_DISTRIBUTION_TAG: !reference [debian/arm64_test-vk, variables, LAVA_DISTRIBUTION_TAG] extends: + - .use-debian/arm64_test-vk - .lava-arm64-test needs: - !reference [.lava-arm64-test, needs]