[neon/ubuntu-core/models.add-models-pipeline] debian: Restore snap_base in image jobs

[Antoine Gonzalez]

Git commit 13a32bd0af65b74fbc2cca69aff94de8f73b527b by Antoine Gonzalez.
Committed on 07/08/2024 at 15:55.
Pushed by daspood into branch 'models.add-models-pipeline'.

Restore snap_base in image jobs

M  +4    -12   debian/neon-core-image-dangerous.yml
M  +4    -12   debian/neon-core-image-signed.yml

https://invent.kde.org/neon/ubuntu-core/-/commit/13a32bd0af65b74fbc2cca69aff94de8f73b527b

diff --git a/debian/neon-core-image-dangerous.yml b/debian/neon-core-image-dangerous.yml
index ca29847..0a904c3 100644
--- a/debian/neon-core-image-dangerous.yml
+++ b/debian/neon-core-image-dangerous.yml
@@ -1,12 +1,13 @@
 include:
   - project: sysadmin/ci-utilities
     file:
+      - /gitlab-templates/blocks/snap-base.yml
       - /gitlab-templates/blocks/workflow.yml
 
 neon_core_image_dangerous:
-  tags:
-    - Snap
-  stage: build
+  extends: .snap_base
+  inherit:
+    default: true
   script:
     # build the image with the project's tooling
     - echo building kde-neon-core in dangerous mode ...
@@ -16,13 +17,4 @@ neon_core_image_dangerous:
     # copy the gun zipped tar to the artifacts dir
     - cp -vf ./*.tar.gz  $CI_PROJECT_DIR/.kde-ci-packages/
   interruptible: true
-  artifacts:
-    name: CI artifacts
-    expose_as: 'KDE Neon Core images'
-    when: always
-    paths:
-      - ".kde-ci-packages/"
-      - "task.log"
-      - "task-debug.log"
-    expire_in: 7 days
 
diff --git a/debian/neon-core-image-signed.yml b/debian/neon-core-image-signed.yml
index 6a66be2..9d79e8e 100644
--- a/debian/neon-core-image-signed.yml
+++ b/debian/neon-core-image-signed.yml
@@ -1,12 +1,13 @@
 include:
   - project: sysadmin/ci-utilities
     file:
+      - /gitlab-templates/blocks/snap-base.yml
       - /gitlab-templates/blocks/workflow.yml
 
 neon_core_image_signed:
-  tags:
-    - Snap
-  stage: build
+  extends: .snap_base
+  inherit:
+    default: true
   script:
     # build the image with the project's tooling
     - echo building kde-neon-core in signed mode ...
@@ -16,12 +17,3 @@ neon_core_image_signed:
     # copy the gun zipped tar to the artifacts dir
     - cp -vf ./*.tar.gz  $CI_PROJECT_DIR/.kde-ci-packages/
   interruptible: true
-  artifacts:
-    name: CI artifacts
-    expose_as: 'KDE Neon Core images'
-    when: always
-    paths:
-      - ".kde-ci-packages/"
-      - "task.log"
-      - "task-debug.log"
-    expire_in: 7 days