diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 32c4e224..0b7d98ef 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -71,7 +71,7 @@ stages: # Base variables used for anything using a Debian environment -.os-debian: +.os-debian-lts: variables: BUILD_OS: debian LLVM_VERSION: 11 @@ -100,23 +100,23 @@ check-commit: reports: junit: results.xml -.debian-x86_64: +.debian-lts-x86_64: extends: - - .os-debian + - .os-debian-lts variables: BUILD_ARCH: "x86-64" KERNEL_IMAGE: "bzImage" KERNEL_DEFCONFIG: "x86_64_defconfig" -.debian-armv7: +.debian-lts-armv7: extends: - - .os-debian + - .os-debian-lts variables: BUILD_ARCH: "armv7" -.debian-aarch64: +.debian-lts-aarch64: extends: - - .os-debian + - .os-debian-lts variables: BUILD_ARCH: "aarch64" KERNEL_IMAGE: "Image" @@ -126,30 +126,30 @@ check-commit: # Build our base container image, which contains the core distribution, the # toolchain, and all our build dependencies. This will be reused in the build # stage. -x86_64-debian-container_prep: +x86_64-debian-lts-container_prep: extends: - .ci-rules - - .debian-x86_64 + - .debian-lts-x86_64 - .fdo.container-build@debian timeout: 30m stage: "Base container" -armv7-debian-container_prep: +armv7-debian-lts-container_prep: extends: - .ci-rules - - .debian-armv7 + - .debian-lts-armv7 - .fdo.container-build@debian tags: - aarch64 variables: - FDO_BASE_IMAGE: "arm32v7/debian:$FDO_DISTRIBUTION_VERSION" + FDO_BASE_IMAGE: "arm32v7/debian-lts:$FDO_DISTRIBUTION_VERSION" timeout: 30m stage: "Base container" -aarch64-debian-container_prep: +aarch64-debian-lts-container_prep: extends: - .ci-rules - - .debian-aarch64 + - .debian-lts-aarch64 - .fdo.container-build@debian tags: - aarch64 @@ -223,55 +223,55 @@ aarch64-debian-container_prep: - $PREFIX # OS/architecture-specific variants -.build-env-debian-x86_64: +.build-env-debian-lts-x86_64: extends: - - .debian-x86_64 + - .debian-lts-x86_64 - .fdo.suffixed-image@debian - .build-env needs: - - job: x86_64-debian-container_prep + - job: x86_64-debian-lts-container_prep artifacts: false -.build-env-debian-armv7: +.build-env-debian-lts-armv7: tags: - aarch64 extends: - - .debian-armv7 + - .debian-lts-armv7 - .fdo.suffixed-image@debian - .build-env needs: - - job: armv7-debian-container_prep + - job: armv7-debian-lts-container_prep artifacts: false -.build-env-debian-aarch64: +.build-env-debian-lts-aarch64: tags: - aarch64 extends: - - .debian-aarch64 + - .debian-lts-aarch64 - .fdo.suffixed-image@debian - .build-env needs: - - job: aarch64-debian-container_prep + - job: aarch64-debian-lts-container_prep artifacts: false -.test-env-debian-x86_64: +.test-env-debian-lts-x86_64: tags: - kvm extends: - - .build-env-debian-x86_64 + - .build-env-debian-lts-x86_64 - .build-and-test needs: - - job: x86_64-debian-container_prep + - job: x86_64-debian-lts-container_prep artifacts: false -.test-env-debian-aarch64: +.test-env-debian-lts-aarch64: tags: - kvm-aarch64 extends: - - .build-env-debian-aarch64 + - .build-env-debian-lts-aarch64 - .build-and-test needs: - - job: aarch64-debian-container_prep + - job: aarch64-debian-lts-container_prep artifacts: false # Full build, used for testing under KVM. @@ -291,9 +291,9 @@ aarch64-debian-container_prep: - ninja -C "$BUILDDIR" coverage-html > "$BUILDDIR/meson-logs/ninja-coverage-html.txt" - ninja -C "$BUILDDIR" coverage-xml -x86_64-debian-full-build: +x86_64-debian-lts-full-build: extends: - - .test-env-debian-x86_64 + - .test-env-debian-lts-x86_64 - .build-options-full artifacts: reports: @@ -301,20 +301,20 @@ x86_64-debian-full-build: coverage_format: cobertura path: $BUILDDIR/meson-logs/coverage.xml -aarch64-debian-full-build: +aarch64-debian-lts-full-build: extends: - - .test-env-debian-aarch64 + - .test-env-debian-lts-aarch64 - .build-options-full -x86_64-clang-debian-full-build: +x86_64-clang-debian-lts-full-build: extends: - - .test-env-debian-x86_64 + - .test-env-debian-lts-x86_64 - .build-with-clang - .build-options-full -aarch64-clang-debian-full-build: +aarch64-clang-debian-lts-full-build: extends: - - .test-env-debian-aarch64 + - .test-env-debian-lts-aarch64 - .build-with-clang - .build-options-full @@ -327,7 +327,7 @@ docs-build: -Dwerror=true -Ddoc=true extends: - - .build-env-debian-x86_64 + - .build-env-debian-lts-x86_64 - .build-no-test # Building without gl-renderer, to make sure this keeps working. @@ -342,27 +342,27 @@ docs-build: -Dwerror=true -Dlauncher-libseat=true -x86_64-debian-no-gl-build: +x86_64-debian-lts-no-gl-build: extends: - - .test-env-debian-x86_64 + - .test-env-debian-lts-x86_64 - .build-options-no-gl -armv7-debian-no-gl-build: +armv7-debian-lts-no-gl-build: extends: - - .build-env-debian-armv7 + - .build-env-debian-lts-armv7 - .build-no-test - .build-options-no-gl -armv7-clang-debian-no-gl-build: +armv7-clang-debian-lts-no-gl-build: extends: - - .build-env-debian-armv7 + - .build-env-debian-lts-armv7 - .build-with-clang - .build-no-test - .build-options-no-gl -aarch64-debian-no-gl-build: +aarch64-debian-lts-no-gl-build: extends: - - .test-env-debian-aarch64 + - .test-env-debian-lts-aarch64 - .build-options-no-gl # Expose docs and coverage reports, so we can show users any changes to these @@ -375,18 +375,18 @@ aarch64-debian-no-gl-build: docs-and-coverage: extends: - .ci-rules - - .debian-x86_64 + - .debian-lts-x86_64 - .fdo.suffixed-image@debian stage: pages needs: - job: docs-build artifacts: true - - job: x86_64-debian-full-build + - job: x86_64-debian-lts-full-build artifacts: true timeout: 5m script: - mv prefix-weston-docs-build/share/doc/weston Documentation - - mv build-weston-x86_64-debian-full-build/meson-logs/coveragereport Test_Coverage + - mv build-weston-x86_64-debian-lts-full-build/meson-logs/coveragereport Test_Coverage - rm Test_Coverage/gcov.css - cp doc/style/lcov-style.css Test_Coverage/gcov.css - cp doc/style/*.png Test_Coverage/ @@ -404,7 +404,7 @@ docs-and-coverage: # the upstream repo. pages: extends: - - .debian-x86_64 + - .debian-lts-x86_64 - .fdo.suffixed-image@debian stage: pages timeout: 5m