gitlab-ci: rework extends: for "check-{patch,tree}" jobs

The "check-{patch,tree}" jobs use the same container as the default
test on Fedora ("pages_build", which also builds our documentation).

Previously, we thus extended "t_fedora:35". But that way we also
got things that we didn't want (.nm_artifacts and .build@template).

Solve this differently, by letting the jobs directly define what they
need. It's not much more, than extending "t_fedora:35" and workaround
to drop stuff we don't want.

1 files changed, 12 insertions, 12 deletions

diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template
index d42d2d186f..092fffcdaa 100644
--- a/.gitlab-ci/ci.template
+++ b/.gitlab-ci/ci.template
@@ -67,12 +67,6 @@ variables:
     paths:
       - nm-test.log
 
-.nm_artifacts_undo:
-  variables:
-    NM_BUILD_TARBALL: 0
-  artifacts:
-    paths: []
-
 #################################################################
 #                                                               #
 #                     containers stage                          #
@@ -204,25 +198,31 @@ t_{{distro.name}}:{{version}}:
 
 check-patch:
   extends:
-   - t_{{pages_build.name}}:{{pages_build.version}}
-   - .nm_artifacts_undo
+    - .fdo.distribution-image@{{pages_build.name}}
+  variables:
+    FDO_DISTRIBUTION_VERSION: '{{pages_build.version}}'
+    FDO_DISTRIBUTION_TAG: ${{pages_build.name.upper()}}_TAG
+  needs:
+    - "{{pages_build.name}}:{{pages_build.version}}@container-prep"
   stage: test
   script:
     - date '+%Y%m%d-%H%M%S'; NM_CHECKPATCH_FETCH_UPSTREAM=1 contrib/scripts/checkpatch-feature-branch.sh
-  after_script:
   allow_failure: true
 
 check-tree:
   extends:
-   - t_{{pages_build.name}}:{{pages_build.version}}
-   - .nm_artifacts_undo
+    - .fdo.distribution-image@{{pages_build.name}}
+  variables:
+    FDO_DISTRIBUTION_VERSION: '{{pages_build.version}}'
+    FDO_DISTRIBUTION_TAG: ${{pages_build.name.upper()}}_TAG
+  needs:
+    - "{{pages_build.name}}:{{pages_build.version}}@container-prep"
   stage: test
   script:
     - date '+%Y%m%d-%H%M%S'; black --check . examples/python/gi/nm-wg-set
     - date '+%Y%m%d-%H%M%S'; git ls-files -z -- 'po/*.po' | xargs -0 -n1 msgfmt -vc
     - date '+%Y%m%d-%H%M%S'; contrib/scripts/nm-code-format.sh -n
     - date '+%Y%m%d-%H%M%S'; ci-fairy generate-template && git diff --exit-code
-  after_script:
 
 pages:
   stage: deploy