Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 9 commits into from
May 31, 2024
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ apps:
command: usr/bin/appstream-desktop
common-id: io.snapcraft.appstream
confinement: strict
grade: devel
grade: stable
mr-cal marked this conversation as resolved.
Show resolved Hide resolved
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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
name: appstream-desktop
base: core24

grade: devel
confinement: strict
adopt-info: appstream-desktop

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
name: appstream-desktop
base: core24

grade: devel
confinement: strict
adopt-info: appstream-desktop

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 0 additions & 1 deletion tests/spread/core24/clean/snaps/clean/snap/snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ name: clean
version: '1.0'
summary: test
description: test
grade: devel
confinement: strict
base: core24

Expand Down
2 changes: 1 addition & 1 deletion tests/spread/core24/components/expected-snap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion tests/spread/core24/components/snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ name: craftctl-default
version: '1.0'
summary: test
description: test
grade: devel
confinement: strict
base: core24

Expand Down
13 changes: 13 additions & 0 deletions tests/spread/core24/grade/snapcraft.yaml
Original file line number Diff line number Diff line change
@@ -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
18 changes: 18 additions & 0 deletions tests/spread/core24/grade/task.yaml
Original file line number Diff line number Diff line change
@@ -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
1 change: 0 additions & 1 deletion tests/spread/core24/grammar/snap/snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 0 additions & 1 deletion tests/spread/core24/hooks/default/snap/snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 0 additions & 1 deletion tests/spread/core24/lifecycle/snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ summary: snapcraft lifecycle
description: |
A test to ensure we can pull, build, stage and prime

grade: devel
confinement: strict

apps:
Expand Down
1 change: 0 additions & 1 deletion tests/spread/core24/linters-file/lint-file/snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ version: '0.1'
summary: Lint a packaged snapcraft file.
description: spread test

grade: devel
confinement: strict

parts:
Expand Down
Original file line number Diff 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
Original file line number Diff 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: classic

lint:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ version: '0.1'
summary: Ignore missing library linter issues
description: spread test

grade: devel
confinement: strict

lint:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ version: '0.1'
summary: Ignore unused library linter issues
description: spread test

grade: devel
confinement: strict

lint:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ version: '0.1'
summary: Raise linter warnings for missing libraries
description: spread test

grade: devel
confinement: strict

parts:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ version: '0.1'
summary: Raise linter warnings for unused libraries.
description: spread test

grade: devel
confinement: strict

parts:
Expand Down
1 change: 0 additions & 1 deletion tests/spread/core24/metadata-links/snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ name: test-apt-key-fingerprint
version: '1.0'
summary: test
description: test
grade: devel
confinement: strict
base: core24

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ name: test-apt-key-name
version: '1.0'
summary: test
description: test
grade: devel
confinement: strict
base: core24

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ name: test-apt-keyserver
version: '1.0'
summary: test
description: test
grade: devel
confinement: strict
base: core24

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ name: test-apt-ppa
version: '1.0'
summary: test
description: test
grade: devel
confinement: strict
base: core24

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ name: test-apt-ppa
version: '1.0'
summary: test
description: test
grade: devel
confinement: strict
base: core24

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ name: test-pin
version: '1.0'
summary: test
description: test
grade: devel
confinement: strict
base: core24

Expand Down
1 change: 0 additions & 1 deletion tests/spread/core24/packing/snap/snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ description: |
store.
base: core24

grade: devel
confinement: devmode

parts:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 0 additions & 1 deletion tests/spread/core24/plugs-warn/snap/snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Loading
Loading