From 55e78ef6789eaaab48734c72e92fca4cd2ed0670 Mon Sep 17 00:00:00 2001 From: Valentine Burley Date: Thu, 10 Apr 2025 09:32:15 +0200 Subject: [PATCH] ci/lava: Remove job definitions using kernel+rootfs jobs These are all unused now and can be removed. Signed-off-by: Valentine Burley Part-of: --- .gitlab-ci/container/gitlab-ci.yml | 11 ----- .gitlab-ci/lava/lava-gitlab-ci.yml | 75 ------------------------------ .gitlab-ci/test-source-dep.yml | 7 --- 3 files changed, 93 deletions(-) diff --git a/.gitlab-ci/container/gitlab-ci.yml b/.gitlab-ci/container/gitlab-ci.yml index f84cfff6721..b8d18416ccb 100644 --- a/.gitlab-ci/container/gitlab-ci.yml +++ b/.gitlab-ci/container/gitlab-ci.yml @@ -687,17 +687,6 @@ kernel+rootfs_arm32: DEBIAN_ARCH: "armhf" LLVM_VERSION: &debian-arm32-llvm 15 # no armhf builds for LLVM -# Cannot use anchors defined here from included files, so use extends: instead -.use-kernel+rootfs-arm: - variables: - DISTRIBUTION_TAG: *distribution-tag-arm - MESA_ROOTFS_TAG: *kernel-rootfs - -.use-kernel+rootfs-x86_64: - variables: - DISTRIBUTION_TAG: *distribution-tag-x86_64 - MESA_ROOTFS_TAG: *kernel-rootfs - # x86_64 image with ARM64 & ARM32 kernel & rootfs for baremetal testing .debian/baremetal_arm_test: extends: diff --git a/.gitlab-ci/lava/lava-gitlab-ci.yml b/.gitlab-ci/lava/lava-gitlab-ci.yml index 94ce2180c26..590c1f6b4b5 100644 --- a/.gitlab-ci/lava/lava-gitlab-ci.yml +++ b/.gitlab-ci/lava/lava-gitlab-ci.yml @@ -168,81 +168,6 @@ variables: - job: debian/arm64_test-vk artifacts: false -.lava-test:arm32: - variables: - ARCH: arm32 - DEBIAN_ARCH: armhf - KERNEL_IMAGE_NAME: zImage - KERNEL_IMAGE_TYPE: "zimage" - BOOT_METHOD: u-boot - extends: - - .use-debian/arm64_build # for same $MESA_ARTIFACTS_TAG as in kernel+rootfs_arm32 - - .use-debian/x86_64_pyutils - - .lava-test - - .use-kernel+rootfs-arm - needs: - - !reference [.lava-test, needs] - - job: kernel+rootfs_arm32 - artifacts: false - - job: debian-arm32 - artifacts: false - -.lava-test-deqp:arm32: - extends: - - .lava-test:arm32 - variables: - HWCI_TEST_SCRIPT: "/install/deqp-runner.sh" - -.lava-test:arm64: - variables: - ARCH: arm64 - DEBIAN_ARCH: arm64 - KERNEL_IMAGE_NAME: Image - KERNEL_IMAGE_TYPE: "image" - BOOT_METHOD: u-boot - extends: - - .use-debian/arm64_build # for same $MESA_ARTIFACTS_TAG as in kernel+rootfs_arm64 - - .use-debian/x86_64_pyutils - - .lava-test - - .use-kernel+rootfs-arm - needs: - - !reference [.lava-test, needs] - - job: kernel+rootfs_arm64 - artifacts: false - - job: debian-arm64 - artifacts: false - -.lava-test-deqp:arm64: - variables: - HWCI_TEST_SCRIPT: "/install/deqp-runner.sh" - extends: - - .lava-test:arm64 - -.lava-test:x86_64: - variables: - ARCH: x86_64 - DEBIAN_ARCH: amd64 - KERNEL_IMAGE_NAME: bzImage - KERNEL_IMAGE_TYPE: "zimage" - BOOT_METHOD: u-boot - extends: - - .use-debian/x86_64_build-base # for same $MESA_ARTIFACTS_BASE_TAG as in kernel+rootfs_x86_64 - - .use-debian/x86_64_pyutils - - .lava-test - - .use-kernel+rootfs-x86_64 - needs: - - !reference [.lava-test, needs] - - job: kernel+rootfs_x86_64 - artifacts: false - - job: debian-testing - artifacts: false - -.lava-test-deqp:x86_64: - variables: - HWCI_TEST_SCRIPT: "/install/deqp-runner.sh" - extends: - - .lava-test:x86_64 - .lava-piglit-traces: extends: - .test-piglit diff --git a/.gitlab-ci/test-source-dep.yml b/.gitlab-ci/test-source-dep.yml index 39a5b512fe0..dbce649849f 100644 --- a/.gitlab-ci/test-source-dep.yml +++ b/.gitlab-ci/test-source-dep.yml @@ -136,13 +136,6 @@ - debian/baremetal_arm64_test - debian-arm64-release -.piglit-performance:x86_64: - extends: - - .piglit-performance-base - needs: - - kernel+rootfs_x86_64 - - debian-release - # Mesa source file dependencies that may impact any GL driver test job. .gallium-core-rules: rules: