From c7cecc1604f3b9a3a7a73e53bae6aedcd0db85ca Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Mon, 29 Apr 2024 16:56:23 +0200 Subject: [PATCH] ci: rename debian/arm*_test to debian/baremetal_arm*_test to be clear about which infra uses that Signed-off-by: Eric Engestrom Part-of: --- .gitlab-ci/container/debian/arm32_test.sh | 5 ---- .gitlab-ci/container/debian/arm64_test.sh | 5 ---- .../container/debian/baremetal_arm32_test.sh | 5 ++++ .../container/debian/baremetal_arm64_test.sh | 5 ++++ .../{arm_test.sh => baremetal_arm_test.sh} | 0 .gitlab-ci/container/gitlab-ci.yml | 28 +++++++++---------- .gitlab-ci/image-tags.yml | 2 +- .gitlab-ci/test-source-dep.yml | 2 +- .gitlab-ci/test/gitlab-ci.yml | 16 +++++------ src/freedreno/ci/gitlab-ci-inc.yml | 2 +- 10 files changed, 35 insertions(+), 35 deletions(-) delete mode 100644 .gitlab-ci/container/debian/arm32_test.sh delete mode 100644 .gitlab-ci/container/debian/arm64_test.sh create mode 100644 .gitlab-ci/container/debian/baremetal_arm32_test.sh create mode 100644 .gitlab-ci/container/debian/baremetal_arm64_test.sh rename .gitlab-ci/container/debian/{arm_test.sh => baremetal_arm_test.sh} (100%) diff --git a/.gitlab-ci/container/debian/arm32_test.sh b/.gitlab-ci/container/debian/arm32_test.sh deleted file mode 100644 index 0a35d245192..00000000000 --- a/.gitlab-ci/container/debian/arm32_test.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -set -e - -arch=armhf . .gitlab-ci/container/debian/arm_test.sh diff --git a/.gitlab-ci/container/debian/arm64_test.sh b/.gitlab-ci/container/debian/arm64_test.sh deleted file mode 100644 index fa34934c3d6..00000000000 --- a/.gitlab-ci/container/debian/arm64_test.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -set -e - -arch=arm64 . .gitlab-ci/container/debian/arm_test.sh diff --git a/.gitlab-ci/container/debian/baremetal_arm32_test.sh b/.gitlab-ci/container/debian/baremetal_arm32_test.sh new file mode 100644 index 00000000000..c0c7638bd42 --- /dev/null +++ b/.gitlab-ci/container/debian/baremetal_arm32_test.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +set -e + +arch=armhf . .gitlab-ci/container/debian/baremetal_arm_test.sh diff --git a/.gitlab-ci/container/debian/baremetal_arm64_test.sh b/.gitlab-ci/container/debian/baremetal_arm64_test.sh new file mode 100644 index 00000000000..7ae813999ee --- /dev/null +++ b/.gitlab-ci/container/debian/baremetal_arm64_test.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +set -e + +arch=arm64 . .gitlab-ci/container/debian/baremetal_arm_test.sh diff --git a/.gitlab-ci/container/debian/arm_test.sh b/.gitlab-ci/container/debian/baremetal_arm_test.sh similarity index 100% rename from .gitlab-ci/container/debian/arm_test.sh rename to .gitlab-ci/container/debian/baremetal_arm_test.sh diff --git a/.gitlab-ci/container/gitlab-ci.yml b/.gitlab-ci/container/gitlab-ci.yml index 0da2d9484fe..c5373401098 100644 --- a/.gitlab-ci/container/gitlab-ci.yml +++ b/.gitlab-ci/container/gitlab-ci.yml @@ -368,7 +368,7 @@ kernel+rootfs_arm32: MESA_ROOTFS_TAG: *kernel-rootfs # x86_64 image with ARM64 & ARM32 kernel & rootfs for baremetal testing -.debian/arm_test: +.debian/baremetal_arm_test: extends: - .fdo.container-build@debian - .container @@ -382,45 +382,45 @@ kernel+rootfs_arm32: MESA_ARTIFACTS_TAG: *debian-arm64_build MESA_ROOTFS_TAG: *kernel-rootfs -debian/arm32_test: +debian/baremetal_arm32_test: extends: - - .debian/arm_test + - .debian/baremetal_arm_test needs: - kernel+rootfs_arm32 variables: MESA_IMAGE_TAG: &debian-arm32_test "${DEBIAN_BASE_TAG}--${PKG_REPO_REV}" -debian/arm64_test: +debian/baremetal_arm64_test: extends: - - .debian/arm_test + - .debian/baremetal_arm_test needs: - kernel+rootfs_arm64 variables: MESA_IMAGE_TAG: &debian-arm64_test "${DEBIAN_BASE_TAG}--${PKG_REPO_REV}" -.use-debian/arm_test: +.use-debian/baremetal_arm_test: variables: MESA_ROOTFS_TAG: *kernel-rootfs -.use-debian/arm32_test: +.use-debian/baremetal_arm32_test: image: "$CI_REGISTRY_IMAGE/${MESA_IMAGE_PATH}:${MESA_IMAGE_TAG}--${MESA_ROOTFS_TAG}--${KERNEL_TAG}--${MESA_TEMPLATES_COMMIT}" extends: - - .use-debian/arm_test + - .use-debian/baremetal_arm_test variables: - MESA_IMAGE_PATH: "debian/arm32_test" + MESA_IMAGE_PATH: "debian/baremetal_arm32_test" MESA_IMAGE_TAG: *debian-arm32_test needs: - - debian/arm_test + - debian/baremetal_arm_test -.use-debian/arm64_test: +.use-debian/baremetal_arm64_test: image: "$CI_REGISTRY_IMAGE/${MESA_IMAGE_PATH}:${MESA_IMAGE_TAG}--${MESA_ROOTFS_TAG}--${KERNEL_TAG}--${MESA_TEMPLATES_COMMIT}" extends: - - .use-debian/arm_test + - .use-debian/baremetal_arm_test variables: - MESA_IMAGE_PATH: "debian/arm64_test" + MESA_IMAGE_PATH: "debian/baremetal_arm64_test" MESA_IMAGE_TAG: *debian-arm64_test needs: - - debian/arm_test + - debian/baremetal_arm_test # Native Windows docker builds # diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 018c01cdff1..1c8e30756b3 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -13,7 +13,7 @@ variables: DEBIAN_X86_64_BUILD_BASE_IMAGE: "debian/x86_64_build-base" - DEBIAN_BASE_TAG: "20240509-meson" + DEBIAN_BASE_TAG: "20240516-rename-arm" DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build" DEBIAN_BUILD_TAG: "20240509-bindgen" diff --git a/.gitlab-ci/test-source-dep.yml b/.gitlab-ci/test-source-dep.yml index fbcccebb9ab..2fed298ce94 100644 --- a/.gitlab-ci/test-source-dep.yml +++ b/.gitlab-ci/test-source-dep.yml @@ -125,7 +125,7 @@ extends: - .piglit-performance-base needs: - - debian/arm64_test + - debian/baremetal_arm64_test - debian-arm64-release .piglit-performance:x86_64: diff --git a/.gitlab-ci/test/gitlab-ci.yml b/.gitlab-ci/test/gitlab-ci.yml index 832bd3e7139..50904ceb8de 100644 --- a/.gitlab-ci/test/gitlab-ci.yml +++ b/.gitlab-ci/test/gitlab-ci.yml @@ -211,12 +211,12 @@ python-test: .baremetal-test-arm32: extends: - .baremetal-test - - .use-debian/arm32_test + - .use-debian/baremetal_arm32_test variables: DEBIAN_ARCH: armhf S3_ARTIFACT_NAME: mesa-arm32-default-debugoptimized needs: - - debian/arm32_test + - debian/baremetal_arm32_test - job: debian-arm32 artifacts: false - !reference [.required-for-hardware-jobs, needs] @@ -225,12 +225,12 @@ python-test: .baremetal-test-arm64: extends: - .baremetal-test - - .use-debian/arm64_test + - .use-debian/baremetal_arm64_test variables: DEBIAN_ARCH: arm64 S3_ARTIFACT_NAME: mesa-arm64-default-debugoptimized needs: - - debian/arm64_test + - debian/baremetal_arm64_test - job: debian-arm64 artifacts: false - !reference [.required-for-hardware-jobs, needs] @@ -239,12 +239,12 @@ python-test: .baremetal-arm32-asan-test: extends: - .baremetal-test - - .use-debian/arm32_test + - .use-debian/baremetal_arm32_test variables: DEQP_RUNNER_OPTIONS: "--env LD_PRELOAD=libasan.so.8:/install/lib/libdlclose-skip.so" S3_ARTIFACT_NAME: mesa-arm32-asan-debugoptimized needs: - - debian/arm32_test + - debian/baremetal_arm32_test - job: debian-arm32-asan artifacts: false - !reference [.required-for-hardware-jobs, needs] @@ -252,12 +252,12 @@ python-test: .baremetal-arm64-asan-test: extends: - .baremetal-test - - .use-debian/arm64_test + - .use-debian/baremetal_arm64_test variables: DEQP_RUNNER_OPTIONS: "--env LD_PRELOAD=libasan.so.8:/install/lib/libdlclose-skip.so" S3_ARTIFACT_NAME: mesa-arm64-asan-debugoptimized needs: - - debian/arm64_test + - debian/baremetal_arm64_test - job: debian-arm64-asan artifacts: false - !reference [.required-for-hardware-jobs, needs] diff --git a/src/freedreno/ci/gitlab-ci-inc.yml b/src/freedreno/ci/gitlab-ci-inc.yml index 7bc41fdd22d..99de33c8a81 100644 --- a/src/freedreno/ci/gitlab-ci-inc.yml +++ b/src/freedreno/ci/gitlab-ci-inc.yml @@ -179,7 +179,7 @@ # Ensure that we are using the release build artifact S3_ARTIFACT_NAME: mesa-arm64-default-release needs: - - debian/arm64_test + - debian/baremetal_arm64_test - debian-arm64-release dependencies: null