[neon/snap-packaging/plasma-desktop-session-snap/ci-prototype] debian: new attempt

[Carlos De Maine]

Git commit fabb480b51d7b5628fd5e60dbebabc0fc9ab926a by Carlos De Maine.
Committed on 26/04/2024 at 00:15.
Pushed by carlosdem into branch 'ci-prototype'.

new attempt

M  +4    -1    debian/.gitlab-ci-neon.yml
D  +0    -25   debian/gitlab-templates/blocks/snap-base.yml
D  +0    -16   debian/gitlab-templates/blocks/workflow.yml
R  +2    -2    debian/gitlab-templates/snap-snapcraft-lxc.yml [from: debian/gitlab-templates/snap-snapcraft-lxd.yml - 082% similarity]

https://invent.kde.org/neon/snap-packaging/plasma-desktop-session-snap/-/commit/fabb480b51d7b5628fd5e60dbebabc0fc9ab926a

diff --git a/debian/.gitlab-ci-neon.yml b/debian/.gitlab-ci-neon.yml
index fedab81..f47bc8b 100644
--- a/debian/.gitlab-ci-neon.yml
+++ b/debian/.gitlab-ci-neon.yml
@@ -2,4 +2,7 @@
 # SPDX-License-Identifier: CC0-1.0
 
 include:
-  - gitlab-templates/snap-snapcraft-lxd.yml
\ No newline at end of file
+  - project: sysadmin/ci-utilities
+  - local:
+      file:
+        - gitlab-templates/snap-snapcraft-lxc.yml
\ No newline at end of file
diff --git a/debian/gitlab-templates/blocks/snap-base.yml b/debian/gitlab-templates/blocks/snap-base.yml
deleted file mode 100644
index 28d88e9..0000000
--- a/debian/gitlab-templates/blocks/snap-base.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-.snap_base:
-  stage: build
-  tags:
-    - Snap
-  variables:
-    KDE_SNAP_MODULE_NAME: ${CI_PROJECT_NAME}
-    SNAPCRAFT_BUILD_ENVIRONMENT: "host"
-    SNAPCRAFT_MANAGED_MODE: "y"
-  interruptible: true
-  before_script:
-    - git clone https://invent.kde.org/sysadmin/ci-utilities.git --depth=1
-    - git clone https://invent.kde.org/sysadmin/repo-metadata.git ci-utilities/repo-metadata/ --depth=1
-  script:
-    - git config --global --add safe.directory $CI_PROJECT_DIR
-  artifacts:
-    name: Snap artifacts
-    #expose_as: 'Snaps'
-    when: always
-    paths:
-      - "**/*.snap"
-      - "kde-neon-core-dangerous-amd64.tar.gz"
-      - "kde-neon-core-signed-amd64.tar.gz"
-      - "task.log"
-      - "task-debug.log"
-    expire_in: 7 days
diff --git a/debian/gitlab-templates/blocks/workflow.yml b/debian/gitlab-templates/blocks/workflow.yml
deleted file mode 100644
index c79922e..0000000
--- a/debian/gitlab-templates/blocks/workflow.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-stages:
-  - build
-  - test
-  - deploy
-  - publish
-
-workflow:
-  rules:
-    # Prevent branch pipelines if an MR is open on the branch.
-    - if: $CI_COMMIT_BRANCH && $CI_PIPELINE_SOURCE == "push" && $CI_OPEN_MERGE_REQUESTS
-      when: never
-    # Allow merge request pipelines.
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-    # Build tags and branches too
-    - if: $CI_COMMIT_TAG
-    - if: $CI_COMMIT_BRANCH
diff --git a/debian/gitlab-templates/snap-snapcraft-lxd.yml b/debian/gitlab-templates/snap-snapcraft-lxc.yml
similarity index 82%
rename from debian/gitlab-templates/snap-snapcraft-lxd.yml
rename to debian/gitlab-templates/snap-snapcraft-lxc.yml
index 922fc58..eaed63f 100644
--- a/debian/gitlab-templates/snap-snapcraft-lxd.yml
+++ b/debian/gitlab-templates/snap-snapcraft-lxc.yml
@@ -1,6 +1,6 @@
 include:
-  - blocks/snap-base.yml
-  - blocks/workflow.yml
+  - /gitlab-templates/blocks/snap-base.yml
+  - /gitlab-templates/blocks/workflow.yml
 
 snap_snapcraft_lxc:
   extends: .snap_base