tests: drop grade: devel from core24 spread tests (#4750)

Signed-off-by: Callahan Kovacs <callahan.kovacs@canonical.com>
canonical · May 31, 2024 · 5008723 · 5008723
1 parent 2e1f97b
commit 5008723
Show file tree

Hide file tree

Showing 52 changed files with 35 additions and 51 deletions.
diff --git a/tests/spread/core24/appstream-desktop/desktop/expected_snap.yaml b/tests/spread/core24/appstream-desktop/desktop/expected_snap.yaml
@@ -22,7 +22,7 @@ apps:
     command: usr/bin/appstream-desktop
     common-id: io.snapcraft.appstream
 confinement: strict
-grade: devel
+grade: stable
 environment:
   LD_LIBRARY_PATH: ${SNAP_LIBRARY_PATH}${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
   PATH: $SNAP/usr/sbin:$SNAP/usr/bin:$SNAP/sbin:$SNAP/bin:$PATH

diff --git a/tests/spread/core24/appstream-desktop/desktop/snap/snapcraft.yaml b/tests/spread/core24/appstream-desktop/desktop/snap/snapcraft.yaml
@@ -1,7 +1,6 @@
 name: appstream-desktop
 base: core24
 
-grade: devel
 confinement: strict
 adopt-info: appstream-desktop
 

diff --git a/tests/spread/core24/appstream-desktop/icon-desktop/expected_snap.yaml b/tests/spread/core24/appstream-desktop/icon-desktop/expected_snap.yaml
@@ -22,7 +22,7 @@ apps:
     command: usr/bin/appstream-desktop
     common-id: io.snapcraft.appstream
 confinement: strict
-grade: devel
+grade: stable
 environment:
   LD_LIBRARY_PATH: ${SNAP_LIBRARY_PATH}${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
   PATH: $SNAP/usr/sbin:$SNAP/usr/bin:$SNAP/sbin:$SNAP/bin:$PATH

diff --git a/tests/spread/core24/appstream-desktop/icon-desktop/snap/snapcraft.yaml b/tests/spread/core24/appstream-desktop/icon-desktop/snap/snapcraft.yaml
@@ -1,7 +1,6 @@
 name: appstream-desktop
 base: core24
 
-grade: devel
 confinement: strict
 adopt-info: appstream-desktop
 

diff --git a/tests/spread/core24/clean/snaps/clean-with-long-name/snap/snapcraft.yaml b/tests/spread/core24/clean/snaps/clean-with-long-name/snap/snapcraft.yaml
@@ -2,7 +2,6 @@ name: clean-i-am-40-characters-long-xxxxxxxxxx
 version: '1.0'
 summary: test
 description: test
-grade: devel
 confinement: strict
 base: core24
 

diff --git a/tests/spread/core24/clean/snaps/clean/snap/snapcraft.yaml b/tests/spread/core24/clean/snaps/clean/snap/snapcraft.yaml
@@ -2,7 +2,6 @@ name: clean
 version: '1.0'
 summary: test
 description: test
-grade: devel
 confinement: strict
 base: core24
 

diff --git a/tests/spread/core24/components/expected-snap.yaml b/tests/spread/core24/components/expected-snap.yaml
@@ -9,7 +9,7 @@ apps:
   hello:
     command: bin/hello
 confinement: strict
-grade: devel
+grade: stable
 environment:
   LD_LIBRARY_PATH: ${SNAP_LIBRARY_PATH}${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
   PATH: $SNAP/usr/sbin:$SNAP/usr/bin:$SNAP/sbin:$SNAP/bin:$PATH

diff --git a/tests/spread/core24/components/snapcraft.yaml b/tests/spread/core24/components/snapcraft.yaml
@@ -3,7 +3,6 @@ version: "1.0"
 summary: Build a snap with components
 description: Build a snap with components
 base: core24
-grade: devel
 confinement: strict
 
 apps:

diff --git a/tests/spread/core24/content-interface-provider-found/snapcraft.yaml b/tests/spread/core24/content-interface-provider-found/snapcraft.yaml
@@ -5,7 +5,6 @@ description: |
   Defining a plug using the content interface should install the snap
   listed under default-provider.
 
-grade: devel
 base: core24
 confinement: devmode
 

diff --git a/tests/spread/core24/content-interface-provider-not-found/snapcraft.yaml b/tests/spread/core24/content-interface-provider-not-found/snapcraft.yaml
@@ -5,7 +5,6 @@ description: |
   Defining a plug using the content interface should only warn when it
   cannot find the snap listed under default-provider.
 
-grade: devel
 base: core24
 confinement: devmode
 

diff --git a/tests/spread/core24/craftctl/test-craftctl-default/snap/snapcraft.yaml b/tests/spread/core24/craftctl/test-craftctl-default/snap/snapcraft.yaml
@@ -2,7 +2,6 @@ name: craftctl-default
 version: '1.0'
 summary: test
 description: test
-grade: devel
 confinement: strict
 base: core24
 

diff --git a/tests/spread/core24/grade/snapcraft.yaml b/tests/spread/core24/grade/snapcraft.yaml
@@ -0,0 +1,13 @@
+name: grade-snap
+version: "1.0"
+summary: Build a snap to test the grade
+description: Build a snap to test the grade
+base: core24
+confinement: strict
+
+grade: stable
+
+parts:
+  hello:
+    source: .
+    plugin: nil
diff --git a/tests/spread/core24/grade/task.yaml b/tests/spread/core24/grade/task.yaml
@@ -0,0 +1,18 @@
+summary: Set the grade of a snap
+
+environment:
+  SNAP_GRADE/stable: stable
+  SNAP_GRADE/devel: devel
+
+prepare: |
+  #shellcheck source=tests/spread/tools/snapcraft-yaml.sh
+  . "$TOOLS_DIR/snapcraft-yaml.sh"
+  set_grade "snapcraft.yaml" "${SNAP_GRADE}"
+
+restore: |
+  snapcraft clean --destructive-mode
+
+execute: |
+  snapcraft prime --destructive-mode
+
+  grep -q "grade: ${SNAP_GRADE}" prime/meta/snap.yaml
diff --git a/tests/spread/core24/grammar/snap/snapcraft.yaml b/tests/spread/core24/grammar/snap/snapcraft.yaml
@@ -4,7 +4,6 @@ summary: test
 description: |
   Exercise snapcraft's advanced grammar keywords, `on`, and `to`.
   This test leverages the platform keywords, `build-on` and `build-for`.
-grade: devel
 confinement: strict
 base: core24
 platforms:

diff --git a/tests/spread/core24/hooks/aux/build-aux/snap/snapcraft.yaml b/tests/spread/core24/hooks/aux/build-aux/snap/snapcraft.yaml
@@ -3,7 +3,6 @@ base: core24
 version: '1.0'
 summary: Test conflicting generated and project hooks.
 description: Project hooks in $PROJECT/snap/hooks/ should take priority over conflicting code generated hooks.
-grade: devel
 confinement: strict
 
 parts:

diff --git a/tests/spread/core24/hooks/default/snap/snapcraft.yaml b/tests/spread/core24/hooks/default/snap/snapcraft.yaml
@@ -3,7 +3,6 @@ base: core24
 version: '1.0'
 summary: Test conflicting generated and project hooks.
 description: Project hooks in $PROJECT/snap/hooks/ should take priority over conflicting code generated hooks.
-grade: devel
 confinement: strict
 
 parts:

diff --git a/tests/spread/core24/lifecycle/snapcraft.yaml b/tests/spread/core24/lifecycle/snapcraft.yaml
@@ -5,7 +5,6 @@ summary: snapcraft lifecycle
 description: |
   A test to ensure we can pull, build, stage and prime
 
-grade: devel
 confinement: strict
 
 apps:

diff --git a/tests/spread/core24/linters-file/lint-file/snapcraft.yaml b/tests/spread/core24/linters-file/lint-file/snapcraft.yaml
@@ -4,7 +4,6 @@ version: '0.1'
 summary: Lint a packaged snapcraft file.
 description: spread test
 
-grade: devel
 confinement: strict
 
 parts:

diff --git a/tests/spread/core24/linters-pack/classic-libc/snap/snapcraft.yaml b/tests/spread/core24/linters-pack/classic-libc/snap/snapcraft.yaml
@@ -8,7 +8,6 @@ description: |
   we live in tweetspace and your description wants to look good in the snap
   store.
 
-grade: devel # must be 'stable' to release into candidate/stable channels
 confinement: strict
 
 lint:

diff --git a/tests/spread/core24/linters-pack/classic/snap/snapcraft.yaml b/tests/spread/core24/linters-pack/classic/snap/snapcraft.yaml
@@ -8,7 +8,6 @@ description: |
   we live in tweetspace and your description wants to look good in the snap
   store.
 
-grade: devel # must be 'stable' to release into candidate/stable channels
 confinement: classic
 
 lint:

diff --git a/tests/spread/core24/linters-pack/library-gnome/snap/snapcraft.yaml b/tests/spread/core24/linters-pack/library-gnome/snap/snapcraft.yaml
@@ -20,7 +20,6 @@ description: |
   decimal, and hexadecimal), boolean algebra, one’s and two’s complementation,
   character to character code conversion, and more.
 
-grade: devel # must be 'stable' to release into candidate/stable channels
 confinement: strict
 base: core24
 

diff --git a/tests/spread/core24/linters-pack/library-ignore-missing/snap/snapcraft.yaml b/tests/spread/core24/linters-pack/library-ignore-missing/snap/snapcraft.yaml
@@ -4,7 +4,6 @@ version: '0.1'
 summary: Ignore missing library linter issues
 description: spread test
 
-grade: devel
 confinement: strict
 
 lint:

diff --git a/tests/spread/core24/linters-pack/library-ignore-unused/snap/snapcraft.yaml b/tests/spread/core24/linters-pack/library-ignore-unused/snap/snapcraft.yaml
@@ -4,7 +4,6 @@ version: '0.1'
 summary: Ignore unused library linter issues
 description: spread test
 
-grade: devel
 confinement: strict
 
 lint:

diff --git a/tests/spread/core24/linters-pack/library-ignored-mixed/snap/snapcraft.yaml b/tests/spread/core24/linters-pack/library-ignored-mixed/snap/snapcraft.yaml
@@ -4,7 +4,6 @@ version: '0.1'
 summary: Ignore a mix of unused and missing library linter issues
 description: spread test
 
-grade: devel
 confinement: strict
 
 lint:

diff --git a/tests/spread/core24/linters-pack/library-missing/snap/snapcraft.yaml b/tests/spread/core24/linters-pack/library-missing/snap/snapcraft.yaml
@@ -4,7 +4,6 @@ version: '0.1'
 summary: Raise linter warnings for missing libraries
 description: spread test
 
-grade: devel
 confinement: strict
 
 parts:

diff --git a/tests/spread/core24/linters-pack/library-unused/snap/snapcraft.yaml b/tests/spread/core24/linters-pack/library-unused/snap/snapcraft.yaml
@@ -4,7 +4,6 @@ version: '0.1'
 summary: Raise linter warnings for unused libraries.
 description: spread test
 
-grade: devel
 confinement: strict
 
 parts:

diff --git a/tests/spread/core24/metadata-links/snapcraft.yaml b/tests/spread/core24/metadata-links/snapcraft.yaml
@@ -4,7 +4,6 @@ description: |
   Verify that top level metadata links in snapcraft.yaml are created at a top level
   links entry in snap.yaml.
 version: "1.0"
-grade: devel
 confinement: strict
 base: core24
 issues:

diff --git a/tests/spread/core24/package-repositories/test-apt-key-fingerprint/snap/snapcraft.yaml b/tests/spread/core24/package-repositories/test-apt-key-fingerprint/snap/snapcraft.yaml
@@ -2,7 +2,6 @@ name: test-apt-key-fingerprint
 version: '1.0'
 summary: test
 description: test
-grade: devel
 confinement: strict
 base: core24
 

diff --git a/tests/spread/core24/package-repositories/test-apt-key-name/snap/snapcraft.yaml b/tests/spread/core24/package-repositories/test-apt-key-name/snap/snapcraft.yaml
@@ -2,7 +2,6 @@ name: test-apt-key-name
 version: '1.0'
 summary: test
 description: test
-grade: devel
 confinement: strict
 base: core24
 

diff --git a/tests/spread/core24/package-repositories/test-apt-keyserver/snap/snapcraft.yaml b/tests/spread/core24/package-repositories/test-apt-keyserver/snap/snapcraft.yaml
@@ -2,7 +2,6 @@ name: test-apt-keyserver
 version: '1.0'
 summary: test
 description: test
-grade: devel
 confinement: strict
 base: core24
 

diff --git a/tests/spread/core24/package-repositories/test-apt-path/snap/snapcraft.yaml b/tests/spread/core24/package-repositories/test-apt-path/snap/snapcraft.yaml
@@ -2,7 +2,6 @@ name: test-apt-ppa
 version: '1.0'
 summary: test
 description: test
-grade: devel
 confinement: strict
 base: core24
 

diff --git a/tests/spread/core24/package-repositories/test-apt-ppa/snap/snapcraft.yaml b/tests/spread/core24/package-repositories/test-apt-ppa/snap/snapcraft.yaml
@@ -2,7 +2,6 @@ name: test-apt-ppa
 version: '1.0'
 summary: test
 description: test
-grade: devel
 confinement: strict
 base: core24
 

diff --git a/tests/spread/core24/package-repositories/test-foreign-armhf/snapcraft.yaml b/tests/spread/core24/package-repositories/test-foreign-armhf/snapcraft.yaml
@@ -2,7 +2,6 @@ name: test-foreign-armhf
 version: '1.0'
 summary: test package repos with different architectures
 description: test package repos with different architectures
-grade: devel
 confinement: strict
 base: core24
 platforms:

diff --git a/tests/spread/core24/package-repositories/test-foreign-i386/snapcraft.yaml b/tests/spread/core24/package-repositories/test-foreign-i386/snapcraft.yaml
@@ -2,7 +2,6 @@ name: test-foreign-i386
 version: '1.0'
 summary: test package repos with different architectures
 description: test package repos with different architectures
-grade: devel
 confinement: strict
 base: core24
 platforms:

diff --git a/tests/spread/core24/package-repositories/test-multi-keys/snap/snapcraft.yaml b/tests/spread/core24/package-repositories/test-multi-keys/snap/snapcraft.yaml
@@ -2,7 +2,6 @@ name: test-multi-keys
 version: '1.0'
 summary: test
 description: test installing a package repository with an asset file with multiple keys
-grade: devel
 confinement: strict
 base: core24
 

diff --git a/tests/spread/core24/package-repositories/test-pin/snap/snapcraft.yaml b/tests/spread/core24/package-repositories/test-pin/snap/snapcraft.yaml
@@ -2,7 +2,6 @@ name: test-pin
 version: '1.0'
 summary: test
 description: test
-grade: devel
 confinement: strict
 base: core24
 

diff --git a/tests/spread/core24/packing/snap/snapcraft.yaml b/tests/spread/core24/packing/snap/snapcraft.yaml
@@ -8,7 +8,6 @@ description: |
   store.
 base: core24
 
-grade: devel
 confinement: devmode
 
 parts:

diff --git a/tests/spread/core24/platforms/snaps/build-for-match/snap/snapcraft.yaml b/tests/spread/core24/platforms/snaps/build-for-match/snap/snapcraft.yaml
@@ -4,7 +4,6 @@ summary: test
 description: |
   Only snaps should be built where `build-for` matches the
   command line argument `--build-for <architecture>`.
-grade: devel
 confinement: strict
 base: core24
 platforms:

diff --git a/tests/spread/core24/platforms/snaps/build-for-no-match/snap/snapcraft.yaml b/tests/spread/core24/platforms/snaps/build-for-no-match/snap/snapcraft.yaml
@@ -4,7 +4,6 @@ summary: test
 description: |
   No snaps should be built if there no `build-for` that matches
   command line argument `--build-for <architecture>`.
-grade: devel
 confinement: strict
 base: core24
 platforms:

diff --git a/tests/spread/core24/platforms/snaps/build-on-no-match/snap/snapcraft.yaml b/tests/spread/core24/platforms/snaps/build-on-no-match/snap/snapcraft.yaml
@@ -4,7 +4,6 @@ summary: test
 description: |
   When build-on doesn't match the host architecture,
   no snaps should be built.
-grade: devel
 confinement: strict
 base: core24
 platforms:

diff --git a/tests/spread/core24/platforms/snaps/env-var-match/snap/snapcraft.yaml b/tests/spread/core24/platforms/snaps/env-var-match/snap/snapcraft.yaml
@@ -4,7 +4,6 @@ summary: test
 description: |
   Only snaps should be built where `build-for` matches the
   environmental variable `SNAPCRAFT_BUILD_FOR`.
-grade: devel
 confinement: strict
 base: core24
 platforms:

diff --git a/tests/spread/core24/platforms/snaps/env-var-no-match/snap/snapcraft.yaml b/tests/spread/core24/platforms/snaps/env-var-no-match/snap/snapcraft.yaml
@@ -4,7 +4,6 @@ summary: test
 description: |
   No snaps should be built if there no `build-for`
   matches the environmental variable `SNAPCRAFT_BUILD_FOR`.
-grade: devel
 confinement: strict
 base: core24
 platforms:

diff --git a/tests/spread/core24/platforms/snaps/multiple-build-for/snap/snapcraft.yaml b/tests/spread/core24/platforms/snaps/multiple-build-for/snap/snapcraft.yaml
@@ -3,7 +3,6 @@ version: "1.0"
 summary: test
 description: |
   Building on amd64 would match two snaps, so the "naked" build should fail.
-grade: devel
 confinement: strict
 base: core24
 platforms:

diff --git a/tests/spread/core24/platforms/snaps/platform-match/snap/snapcraft.yaml b/tests/spread/core24/platforms/snaps/platform-match/snap/snapcraft.yaml
@@ -4,7 +4,6 @@ summary: test
 description: |
   Only snaps should be built where `platform` matches the
   command line argument `--platform <platform>`.
-grade: devel
 confinement: strict
 base: core24
 platforms:

diff --git a/tests/spread/core24/platforms/snaps/platform-no-match/snap/snapcraft.yaml b/tests/spread/core24/platforms/snaps/platform-no-match/snap/snapcraft.yaml
@@ -4,7 +4,6 @@ summary: test
 description: |
   No snaps should be built if there no `platform` that matches
   command line argument `--platform <platform>`.
-grade: devel
 confinement: strict
 base: core24
 platforms:

diff --git a/tests/spread/core24/platforms/snaps/single-arch/snap/snapcraft.yaml b/tests/spread/core24/platforms/snaps/single-arch/snap/snapcraft.yaml
@@ -3,7 +3,6 @@ version: "1.0"
 summary: test
 description: |
   A single platform should create a single snap file.
-grade: devel
 confinement: strict
 base: core24
 platforms:

diff --git a/tests/spread/core24/plugs-warn/snap/snapcraft.yaml b/tests/spread/core24/plugs-warn/snap/snapcraft.yaml
@@ -4,7 +4,6 @@ version: '0.1'
 summary: Check warnings for top-level enabling of slots and plugs
 description: Check warnings for top-level enabling of slots and plugs.
 
-grade: devel
 confinement: strict
 
 plugs:
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,6 @@ description: | @@
       we live in tweetspace and your description wants to look good in the snap
       store.
-    grade: devel # must be 'stable' to release into candidate/stable channels
     confinement: strict
     lint:
@@ Expand Down @@