Merging upstream version 0.1.31.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 63 insertions, 10 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b3d32b2..c0c5ccf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,32 +7,43 @@ include:
 
 stages:
   - ci-test
+  - ci-os-support
   - aggregate-coverage
   - pages
+  - os-build-tests
   - provisioning
   - build
   - publish
   - test
 
 tests-testing:
-  stage: ci-test
-  image: debian:testing
+  stage: os-build-tests
+  image: debian:testing-slim
   script:
     - apt-get update
     - apt-get build-dep -y .
     - dpkg-buildpackage -us -uc -tc
 
 tests-unstable:
-  stage: ci-test
-  image: debian:unstable
+  stage: os-build-tests
+  image: debian:unstable-slim
   script:
     - apt-get update
     - apt-get build-dep -Ppkg.debputy.ci -y .
     - dpkg-buildpackage -Ppkg.debputy.ci -us -uc -tc
 
+tests-ubuntu-noble:
+  stage: os-build-tests
+  image: ubuntu:noble
+  script:
+    - apt-get update
+    - apt-get build-dep -Ppkg.debputy.ci -y .
+    - dpkg-buildpackage -Ppkg.debputy.ci -us -uc -tc
+
+
 code-lint-mypy:
   stage: ci-test
-  image: debian:unstable
+  image: debian:unstable-slim
   script:
     - apt-get update
     - apt-get build-dep -Ppkg.debputy.ci -y .
@@ -53,12 +64,11 @@ code-lint-mypy:
 
 tests-unstable-coverage-without-optional-bd:
   stage: ci-test
-  image: debian:unstable
+  image: debian:unstable-slim
   script:
     - apt-get update
     - apt-get build-dep -Ppkg.debputy.minimal-tests,pkg.debputy.test-coverage -y .
     - py.test-3 -v --cov --cov-branch --doctest-modules --junit-xml=xunit-report.xml --cov-report xml:coverage.xml
-    - dpkg-buildpackage -Ppkg.debputy.minimal-tests -us -uc -tc
   after_script:
   - mkdir -p coverage-results/tests-unstable-coverage-without-optional-bd
   - cp .coverage coverage-results/tests-unstable-coverage-without-optional-bd/coverage
@@ -73,7 +83,7 @@ tests-unstable-coverage-without-optional-bd:
 
 tests-unstable-coverage:
   stage: ci-test
-  image: debian:unstable
+  image: debian:unstable-slim
   script:
     - apt-get update
     - apt-get build-dep -Ppkg.debputy.test-coverage -y .
@@ -109,9 +119,50 @@ tests-unstable-coverage-with-extra-bd:
         coverage_format: cobertura
         path: coverage.xml
 
+
+tests-ubuntu-noble-coverage-with-extra-bd:
+  stage: ci-os-support
+  image: ubuntu:noble
+  script:
+    - apt-get update
+    - apt-get build-dep -Ppkg.debputy.ci,pkg.debputy.test-coverage -y .
+    - py.test-3 -v --cov --cov-branch --doctest-modules --junit-xml=xunit-report.xml --cov-report xml:coverage.xml
+  after_script:
+  - mkdir -p coverage-results/tests-ubuntu-noble-coverage-with-extra-bd
+  - cp .coverage coverage-results/tests-ubuntu-noble-coverage-with-extra-bd/coverage
+  artifacts:
+    paths:
+      - coverage-results/tests-ubuntu-noble-coverage-with-extra-bd
+    reports:
+      junit: xunit-report.xml
+      coverage_report:
+        coverage_format: cobertura
+        path: coverage.xml
+
+
+tests-ubuntu-noble-coverage-without-optional-bd:
+  stage: ci-os-support
+  image: ubuntu:noble
+  script:
+    - apt-get update
+    - apt-get build-dep -Ppkg.debputy.minimal-tests,pkg.debputy.test-coverage -y .
+    - py.test-3 -v --cov --cov-branch --doctest-modules --junit-xml=xunit-report.xml --cov-report xml:coverage.xml
+  after_script:
+  - mkdir -p coverage-results/tests-ubuntu-noble-coverage-without-optional-bd
+  - cp .coverage coverage-results/tests-ubuntu-noble-coverage-without-optional-bd/coverage
+  artifacts:
+    paths:
+      - coverage-results/tests-ubuntu-noble-coverage-without-optional-bd
+    reports:
+      junit: xunit-report.xml
+      coverage_report:
+        coverage_format: cobertura
+        path: coverage.xml
+
+
 aggregate-coverage:
   stage: aggregate-coverage
-  image: debian:unstable
+  image: debian:unstable-slim
   coverage: '/(?i)total.*? (100(?:\.0+)?\%|[1-9]?\d(?:\.\d+)?\%)$/'
   script:
   - apt-get update -y
@@ -126,6 +177,8 @@ aggregate-coverage:
   - tests-unstable-coverage
   - tests-unstable-coverage-without-optional-bd
   - tests-unstable-coverage-with-extra-bd
+  - tests-ubuntu-noble-coverage-with-extra-bd
+  - tests-ubuntu-noble-coverage-without-optional-bd
 
 pages:
   stage: pages
@@ -149,7 +202,7 @@ variables:
 
 debputy-reformat:
   stage: ci-test
-  image: debian:sid-slim
+  image: debian:unstable-slim
   script:
     - apt-get update -qq && apt-get -qq build-dep --no-install-recommends --yes .
     - ./debputy.sh reformat --linter-exit-code --no-auto-fix