diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7fffaeb7246420002a036296769deb6a622f657e..5d832d605ef5430cb1e4c42c64a3552e9a8ee7d3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -150,6 +150,7 @@ prep-fedora-rawhide: stage: 'prep' variables: FDO_DISTRIBUTION_VERSION: rawhide + allow_failure: true test-fedora-rawhide: extends: @@ -162,15 +163,17 @@ test-fedora-rawhide: stage: 'test' needs: - prep-fedora-rawhide + allow_failure: true -# Ubuntu Devel (Oracular) +# Ubuntu Devel (Plucky) prep-ubuntu-devel: extends: - .fdo.container-build@ubuntu - .default-ubuntu-variables stage: 'prep' variables: - FDO_DISTRIBUTION_VERSION: '24.10' + FDO_DISTRIBUTION_VERSION: 'devel' + allow_failure: true test-ubuntu-devel: extends: @@ -178,12 +181,35 @@ test-ubuntu-devel: - .default-ubuntu-variables - .default-artifacts - .default-scripts + stage: test variables: - FDO_DISTRIBUTION_VERSION: '24.10' + FDO_DISTRIBUTION_VERSION: 'devel' needs: - prep-ubuntu-devel + allow_failure: true + +# Ubuntu Latest (Oracular) +prep-ubuntu-latest: + extends: + - .fdo.container-build@ubuntu + - .default-ubuntu-variables + stage: 'prep' + variables: + FDO_DISTRIBUTION_VERSION: '24.10' + +test-ubuntu-latest: + extends: + - .fdo.distribution-image@ubuntu + - .default-ubuntu-variables + - .default-artifacts + - .default-scripts + stage: test + variables: + FDO_DISTRIBUTION_VERSION: '24.10' + needs: + - prep-ubuntu-latest -# Ubuntu Latest (Noble) +# Ubuntu LTS (Noble) prep-ubuntu-latest: extends: - .fdo.container-build@ubuntu @@ -280,26 +306,3 @@ i18n-checks: FDO_DISTRIBUTION_VERSION: '41' needs: - prep-fedora-latest - -## TODO: make sure universe is enabled -## Uncomment once LTS ≠Latest -## Ubuntu LTS (Noble) -##prep-ubuntu-lts: -## extends: -## - .fdo.container-build@ubuntu -## - .default-ubuntu-variables -## stage: 'prep' -## variables: -## FDO_DISTRIBUTION_VERSION: '24.04' -## -##test-ubuntu-lts: -## extends: -## - .fdo.container-build@fedora -## - .default-ubuntu-variables -## - .default-artifacts -## - .default-scripts -## stage: test -## variables: -## FDO_DISTRIBUTION_VERSION: '24.04' -## needs: -## - prep-ubuntu-lts