diff options
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 77 |
1 files changed, 21 insertions, 56 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3cc3ddd19a6..06f00b575e5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -438,24 +438,6 @@ arm_build: needs: - arm_build -# Debian 10 based x86 baremetal image base -arm_test-base: - extends: - - .fdo.container-build@debian - - .container - variables: - MESA_IMAGE_TAG: &arm_test-base "2021-03-31-rootfs" - -.use-arm_test-base: - extends: - - .fdo.container-build@debian - - .use-base-image - variables: - MESA_BASE_IMAGE: "debian/arm_test-base" - MESA_BASE_TAG: *arm_test-base - needs: - - arm_test-base - # Kernel & rootfs for ARM64 baremetal testing kernel+rootfs_arm64-baremetal: extends: @@ -465,9 +447,8 @@ kernel+rootfs_arm64-baremetal: - aarch64 variables: DEBIAN_ARCH: "arm64" - DISTRIBUTION_TAG: "${MESA_ROOTFS_TAG}--${MESA_BASE_TAG}--${MESA_TEMPLATES_COMMIT}" KERNEL_URL: "https://github.com/anholt/linux/archive/mesa-ci-2021-02-17-5.11.tar.gz" - MESA_ROOTFS_TAG: &arm64-baremetal "2021-03-31-libxrender" + MESA_ROOTFS_TAG: &arm-baremetal "2021-03-31-libxrender" MINIO_SUFFIX: "baremetal" # Kernel & rootfs for armhf baremetal testing @@ -476,51 +457,35 @@ kernel+rootfs_armhf-baremetal: - kernel+rootfs_arm64-baremetal variables: DEBIAN_ARCH: "armhf" - MESA_ROOTFS_TAG: &armhf-baremetal "2021-03-31-libxrender" + MESA_ROOTFS_TAG: *arm-baremetal -# x86 image with ARM64 rootfs for baremetal testing. -arm64_test: +# x86 image with ARM64 & armhf kernel & rootfs for baremetal testing +arm_test: extends: - - .use-arm_test-base + - .fdo.container-build@debian + - .container + # Don't want the .container rules + - .ci-run-policy stage: build-misc needs: - kernel+rootfs_arm64-baremetal + - kernel+rootfs_armhf-baremetal variables: - DEBIAN_ARCH: "arm64" - FDO_DISTRIBUTION_EXEC: 'env ARTIFACTS_PREFIX=https://${MINIO_HOST}/mesa-lava ARTIFACTS_SUFFIX=baremetal/${MESA_ROOTFS_TAG}--${MESA_ARM_BUILD_TAG}--${MESA_TEMPLATES_COMMIT}/${DEBIAN_ARCH} CI_PROJECT_PATH=${CI_PROJECT_PATH} FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} FDO_UPSTREAM_REPO=${FDO_UPSTREAM_REPO} bash .gitlab-ci/container/${CI_JOB_NAME}.sh' - FDO_DISTRIBUTION_TAG: "${MESA_IMAGE_TAG}--${MESA_ROOTFS_TAG}--${MESA_BASE_TAG}--${MESA_TEMPLATES_COMMIT}" + FDO_DISTRIBUTION_EXEC: 'env ARTIFACTS_PREFIX=https://${MINIO_HOST}/mesa-lava ARTIFACTS_SUFFIX=baremetal/${MESA_ROOTFS_TAG}--${MESA_ARM_BUILD_TAG}--${MESA_TEMPLATES_COMMIT} CI_PROJECT_PATH=${CI_PROJECT_PATH} FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} FDO_UPSTREAM_REPO=${FDO_UPSTREAM_REPO} bash .gitlab-ci/container/${CI_JOB_NAME}.sh' + FDO_DISTRIBUTION_TAG: "${MESA_IMAGE_TAG}--${MESA_ROOTFS_TAG}--${MESA_ARM_BUILD_TAG}--${MESA_TEMPLATES_COMMIT}" MESA_ARM_BUILD_TAG: *arm_build - MESA_IMAGE_TAG: &arm64_test "2021-03-31-rootfs" - MESA_ROOTFS_TAG: *arm64-baremetal - -.use-arm64_test: - image: "$CI_REGISTRY_IMAGE/${MESA_IMAGE_PATH}:${MESA_IMAGE_TAG}--${MESA_ROOTFS_TAG}--${MESA_BASE_TAG}--${MESA_TEMPLATES_COMMIT}" - variables: - MESA_BASE_TAG: *arm_test-base - MESA_IMAGE_PATH: "debian/arm64_test" - MESA_IMAGE_TAG: *arm64_test - MESA_ROOTFS_TAG: *arm64-baremetal - needs: - - arm64_test + MESA_IMAGE_TAG: &arm_test "2021-03-31-unified" + MESA_ROOTFS_TAG: *arm-baremetal -# x86 image with armhf rootfs for baremetal testing -armhf_test: - extends: - - arm64_test - variables: - DEBIAN_ARCH: "armhf" - MESA_IMAGE_TAG: &armhf_test "2021-03-31-rootfs" - MESA_ROOTFS_TAG: *armhf-baremetal - -.use-armhf_test: - extends: - - .use-arm64_test +.use-arm_test: + image: "$CI_REGISTRY_IMAGE/${MESA_IMAGE_PATH}:${MESA_IMAGE_TAG}--${MESA_ROOTFS_TAG}--${MESA_ARM_BUILD_TAG}--${MESA_TEMPLATES_COMMIT}" variables: - MESA_IMAGE_PATH: "debian/armhf_test" - MESA_IMAGE_TAG: *armhf_test - MESA_ROOTFS_TAG: *armhf-baremetal + MESA_ARM_BUILD_TAG: *arm_build + MESA_IMAGE_PATH: "debian/arm_test" + MESA_IMAGE_TAG: *arm_test + MESA_ROOTFS_TAG: *arm-baremetal needs: - - armhf_test + - arm_test # Native Windows docker builds # @@ -1213,7 +1178,7 @@ meson-mingw32-x86_64: TEST_LD_PRELOAD: libasan.so.5 MINIO_ARTIFACT_NAME: mesa-arm64-asan needs: - - arm64_test + - arm_test - job: meson-arm64-asan artifacts: false |