Merge pull request canonical#11856 from bboozzoo/bboozzoo/maybe-leap-…

…15.4 spread: add openSUSE Leap 15.4
mardy · Jun 28, 2022 · d431334 · d431334
2 parents d588643 + 76adfdd
commit d431334
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 5 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -385,6 +385,7 @@ jobs:
         - fedora-35-64
         - fedora-36-64
         - opensuse-15.3-64
+        - opensuse-15.4-64
         - opensuse-tumbleweed-64
         - ubuntu-14.04-64
         - ubuntu-16.04-64

diff --git a/packaging/fedora-33 b/packaging/fedora-33
diff --git a/packaging/opensuse-15.2 b/packaging/opensuse-15.2
diff --git a/packaging/opensuse-15.4 b/packaging/opensuse-15.4
@@ -0,0 +1 @@
+opensuse/
diff --git a/spread.yaml b/spread.yaml
@@ -170,6 +170,8 @@ backends:
             # unstable systems below
             - opensuse-15.3-64:
                   workers: 6
+            - opensuse-15.4-64:
+                  workers: 6
             - opensuse-tumbleweed-64:
                   workers: 6
                   manual: true

diff --git a/tests/main/interfaces-calendar-service/task.yaml b/tests/main/interfaces-calendar-service/task.yaml
@@ -25,6 +25,7 @@ systems:
     - -fedora-35-*  # test-snapd-eds is incompatible with eds version shipped with the distro
     - -fedora-36-*  # test-snapd-eds is incompatible with eds version shipped with the distro
     - -opensuse-15.3-*  # test-snapd-eds is incompatible with eds version shipped with the distro
+    - -opensuse-15.4-*  # test-snapd-eds is incompatible with eds version shipped with the distro
     - -opensuse-tumbleweed-*  # test-snapd-eds is incompatible with eds version shipped with the distro
     - -ubuntu-14.04-*  # no tests.session support, eds is too old
     - -ubuntu-2*  # test-snapd-eds is incompatible with eds shipped with the distro

diff --git a/tests/main/interfaces-contacts-service/task.yaml b/tests/main/interfaces-contacts-service/task.yaml
@@ -20,6 +20,7 @@ systems:
     - -fedora-35-*  # test-snapd-eds is incompatible with eds version shipped with the distro
     - -fedora-36-*  # test-snapd-eds is incompatible with eds version shipped with the distro
     - -opensuse-15.3-*  # test-snapd-eds is incompatible with eds version shipped with the distro
+    - -opensuse-15.4-*  # test-snapd-eds is incompatible with eds version shipped with the distro
     - -opensuse-tumbleweed-*  # test-snapd-eds is incompatible with eds version shipped with the distro
     - -ubuntu-14.04-*  # no tests.session support, eds is too old
     - -ubuntu-2*  # test-snapd-eds is incompatible with eds shipped with the distro

diff --git a/tests/main/system-usernames-illegal/task.yaml b/tests/main/system-usernames-illegal/task.yaml
@@ -3,7 +3,7 @@ summary: ensure unapproved user cannot be used with system-usernames
 # List of expected snap install failures due to libseccomp/golang-seccomp being
 # too old. Since the illegal name check happens after verifying system support,
 # we can ignore these.
-systems: [-amazon-linux-2-*, -centos-7-*, -debian-9-*, -debian-10-*, -opensuse-15.2-*, -ubuntu-14.04-*]
+systems: [-amazon-linux-2-*, -centos-7-*, -debian-9-*, -debian-10-*, -ubuntu-14.04-*]
 
 execute: |
     snap_path=$("$TESTSTOOLS"/snaps-state pack-local test-snapd-illegal-system-username)

diff --git a/tests/main/system-usernames-install-twice/task.yaml b/tests/main/system-usernames-install-twice/task.yaml
@@ -4,7 +4,7 @@ summary: ensure snap can be installed twice (reusing the created groups)
 # too old. Since the illegal name check happens after verifying system support,
 # we can ignore these. Ignore ubuntu-core since groupdel doesn't support
 # --extrausers
-systems: [-amazon-linux-2-*, -centos-7-*, -debian-9-*, -debian-10-*, -opensuse-15.2-*, -ubuntu-14.04-*, -ubuntu-core-*]
+systems: [-amazon-linux-2-*, -centos-7-*, -debian-9-*, -debian-10-*, -ubuntu-14.04-*, -ubuntu-core-*]
 
 prepare: |
     snap install --edge test-snapd-daemon-user

diff --git a/tests/main/system-usernames-missing-user/task.yaml b/tests/main/system-usernames-missing-user/task.yaml
@@ -4,7 +4,7 @@ summary: ensure snap fails to install if one of user or group doesn't exist
 # too old. Since the illegal name check happens after verifying system support,
 # we can ignore these. Ignore ubuntu-core since groupdel doesn't support
 # --extrausers
-systems: [-amazon-linux-2-*, -centos-7-*, -debian-9-*, -debian-10-*, -opensuse-15.2-*, -ubuntu-14.04-*, -ubuntu-core-*]
+systems: [-amazon-linux-2-*, -centos-7-*, -debian-9-*, -debian-10-*, -ubuntu-14.04-*, -ubuntu-core-*]
 
 prepare: |
     groupadd --system snap_daemon

diff --git a/tests/main/user-session-env/task.yaml b/tests/main/user-session-env/task.yaml
@@ -79,6 +79,15 @@ execute: |
                 NOMATCH 'XDG_DATA_DIRS=.*[:]?/var/lib/snapd/desktop[:]?.*' < "${user}-child-env"
                 MATCH "PATH=.*[:]?${SNAP_MOUNT_DIR}/bin[:]?.*" < "${user}-child-env"
                 ;;
+            test-fish:opensuse-15.4*)
+                # fish on openSUSE 15.4 somehow magically glues the ENV_* from su and
+                # PATH, but fortunately it also displays ENV_ROOTPATH
+                NOMATCH "PATH=.*[:]?${SNAP_MOUNT_DIR}/bin[:]?.*" < "${user}-profile-env"
+                MATCH "ENV_ROOTPATH\s+.*[:]?${SNAP_MOUNT_DIR}/bin[:]?.*" < "${user}-profile-env"
+                MATCH 'XDG_DATA_DIRS=.*[:]?/var/lib/snapd/desktop[:]?.*' < "${user}-child-env"
+                NOMATCH "PATH=.*[:]?${SNAP_MOUNT_DIR}/bin[:]?.*" < "${user}-child-env"
+                MATCH "ENV_ROOTPATH\s+.*[:]?${SNAP_MOUNT_DIR}/bin[:]?.*" < "${user}-child-env"
+                ;;
             *)
                 MATCH 'XDG_DATA_DIRS=.*[:]?/var/lib/snapd/desktop[:]?.*' < "${user}-profile-env"
                 MATCH "PATH=.*[:]?${SNAP_MOUNT_DIR}/bin[:]?.*" < "${user}-profile-env"