Remove gpu-2404 X11 layout as it conflicts with the existing kf6 X11

layout. Test core24 in spread as we will phase out core22.
canonical · Nov 18, 2024 · 4dcfbc8 · 4dcfbc8
1 parent 4920d1f
commit 4dcfbc8
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 9 deletions.
diff --git a/snapcraft/extensions/kde_neon_6.py b/snapcraft/extensions/kde_neon_6.py
@@ -138,8 +138,6 @@ def kde_snaps(self) -> KDESnaps6:
                 gpu_layouts = {
                     "/usr/share/libdrm": {"bind": "$SNAP/gpu-2404/libdrm"},
                     "/usr/share/drirc.d": {"symlink": "$SNAP/gpu-2404/drirc.d"},
-                    "/usr/share/X11/XErrorDB": {
-                        "symlink": "$SNAP/gpu-2404/X11/XErrorDB"
                     },
                 }
             case _:

diff --git a/tests/spread/extensions/kde-neon-6/task.yaml b/tests/spread/extensions/kde-neon-6/task.yaml
@@ -29,7 +29,7 @@ execute: |
   cd "$SNAP_DIR"
   output="$(snapcraft)"
   snap install neon-hello-6_*.snap --dangerous
-  snap connect neon-hello-6:kf6-core22 kf6-core22:kf6-core22
+  snap connect neon-hello-6:kf6-core24 kf6-core24:kf6-core24
 
   [ "$(neon-hello-6)" = "hello world" ]
 
@@ -43,7 +43,7 @@ execute: |
 
   # Verify content snap was installed for dependency checks.
   snap list gtk-common-themes
-  snap list kf6-core22
+  snap list kf6-core24
 
   # Verify all dependencies were found.
   if echo "$output" | grep -q "part is missing libraries"; then

diff --git a/tests/spread/extensions/snaps/neon-hello-6/snap/snapcraft.yaml b/tests/spread/extensions/snaps/neon-hello-6/snap/snapcraft.yaml
@@ -5,6 +5,7 @@ description: It simply prints a hello world
 
 grade: devel
 confinement: strict
+base: core24
 
 apps:
   neon-hello-6:

diff --git a/tests/unit/extensions/test_kde_neon_6.py b/tests/unit/extensions/test_kde_neon_6.py
@@ -241,7 +241,6 @@ def test_get_root_snippet_core24(kde_neon_6_extension_core24):
             "/usr/share/qt6": {"symlink": "$SNAP/kf6/usr/share/qt6"},
             "/usr/share/libdrm": {"bind": "$SNAP/gpu-2404/libdrm"},
             "/usr/share/drirc.d": {"symlink": "$SNAP/gpu-2404/drirc.d"},
-            "/usr/share/X11/XErrorDB": {"symlink": "$SNAP/gpu-2404/X11/XErrorDB"},
         },
         "plugs": {
             "desktop": {"mount-host-font-cache": False},
@@ -293,9 +292,6 @@ def test_get_root_snippet_with_gpu(kde_neon_6_extension_core24):
     assert snippet["layout"]["/usr/share/drirc.d"] == {
         "symlink": "$SNAP/gpu-2404/drirc.d",
     }
-    assert snippet["layout"]["/usr/share/X11/XErrorDB"] == {
-        "symlink": "$SNAP/gpu-2404/X11/XErrorDB",
-    }
 
 
 def test_get_root_snippet_without_gpu(kde_neon_6_extension):
@@ -384,7 +380,6 @@ def test_get_root_snippet_with_external_sdk_core24(
             "/usr/share/qt6": {"symlink": "$SNAP/kf6/usr/share/qt6"},
             "/usr/share/libdrm": {"bind": "$SNAP/gpu-2404/libdrm"},
             "/usr/share/drirc.d": {"symlink": "$SNAP/gpu-2404/drirc.d"},
-            "/usr/share/X11/XErrorDB": {"symlink": "$SNAP/gpu-2404/X11/XErrorDB"},
         },
         "plugs": {
             "desktop": {"mount-host-font-cache": False},