release: Tmp distro

.github/actions/download-install-debian-deps/action.yaml

@@ -27,6 +27,6 @@ runs:
         sudo apt update
         ln -s packaging/ubuntu-16.04 debian
         sudo apt build-dep -y "${{ inputs.snapd-src-dir }}"
-        sudo apt install -y clang
+        sudo apt install -y clang dbus-x11
         sudo apt install -y gcovr lcov
         rm -rf ./debian-deps

.github/workflows/ci-release.yaml

@@ -0,0 +1,92 @@
+name: Release Testing
+on:
+  pull_request:
+    branches: [ "release/**" ]
+
+jobs:
+  run-gate:
+    if: ${{ !contains(github.event.pull_request.labels.*.name, 'Skip spread') }}
+    runs-on: ubuntu-latest
+    steps:
+      - run: echo "Running release testing."
+
+  snap-builds:
+    uses: ./.github/workflows/snap-builds.yaml
+    needs: run-gate
+    with:
+      runs-on: '["ubuntu-latest"]'
+      toolchain: default
+      variant: test
+
+  find-lowest-supported:
+    runs-on: ubuntu-latest
+    needs: run-gate
+    outputs:
+      system: ${{ steps.find-lowest-supported.outputs.system }}
+    steps:
+      - name: Find lowest supported Ubuntu version
+        id: find-lowest-supported
+        run: |
+          sudo apt update
+          version=$(ubuntu-distro-info --supported --release | head -1 | awk '{print $1}')
+          echo "Setting lowest supported system to ubuntu-$version-64"
+          echo "system=ubuntu-$version-64" >> $GITHUB_OUTPUT
+
+  test-snapd-deb:
+    needs: [snap-builds, find-lowest-supported]
+    uses: ./.github/workflows/spread-tests.yaml
+    with:
+      runs-on: '["ubuntu-latest"]'
+      group: deb-test
+      backend: garden
+      systems: ${{ needs.find-lowest-supported.outputs.system }}
+      tasks: 'tests/release/distro-upgrade'
+      rules: ''
+      spread-env: "SPREAD_SNAPD_DEB_FROM_REPO=false SPREAD_SNAP_REEXEC=0"
+      upload-artifacts: true
+
+  test-snapd-snap:
+    needs: [snap-builds, find-lowest-supported]
+    uses: ./.github/workflows/spread-tests.yaml
+    with:
+      runs-on: '["ubuntu-latest"]'
+      group: snap-test
+      backend: garden
+      systems: ${{ needs.find-lowest-supported.outputs.system }}
+      tasks: 'tests/release/distro-upgrade'
+      rules: ''
+      upload-artifacts: true
+
+  report-results:
+    needs: [test-snapd-deb, test-snapd-snap]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download
+        uses: actions/download-artifact@v8
+        with:
+          pattern: spread-artifacts-*
+          merge-multiple: true
+
+      - name: Untar artifacts
+        run: |
+          find . -name "*.tar.gz" | while read filename; do 
+            dir="${filename%.tar.gz}"
+            mkdir -p "$dir"
+            tar -xzf "$filename" -C "$dir"
+            rm "$filename"
+          done
+          find . -name "*.txt" -type f -delete
+          echo "All files after delete"
+          find . -type f
+
+      - name: Report results
+        run: |
+          echo "--------------------------------------------"
+          echo "----------------Snap results----------------"
+          echo "--------------------------------------------"
+          find spread-artifacts-snap-test* -type f -exec sh -c 'echo $1; cat $1' _ {} \;
+          echo "-------------------------------------------"
+          echo "----------------Deb results----------------"
+          echo "-------------------------------------------"
+          find spread-artifacts-deb-test* -type f -exec sh -c 'echo $1; cat $1' _ {} \;
+

.github/workflows/ci-test.yaml

@@ -26,6 +26,14 @@ jobs:
           include-snapd-build-fips-go-channel: true
           include-latest-go-channel: false
 
+      - name: Check go channels
+        run: |
+          echo "Resolved Go channels: ${{ steps.resolve-go-channels.outputs.go-channels }}"
+          if [ -z "${{ steps.resolve-go-channels.outputs.go-channels }}" ]; then
+            echo "Error: No Go channels resolved" >&2
+            exit 1
+          fi
+
   snap-builds:
     uses: ./.github/workflows/snap-builds.yaml
     with:

.github/workflows/rerun.yaml

@@ -38,7 +38,7 @@ jobs:
         uses: actions/checkout@v6
 
       - name: Get PR number
-        uses: actions/github-script@v8
+        uses: actions/github-script@v9
         with:
           script: |
             let page = 1;
@@ -55,7 +55,7 @@ jobs:
               });
               allArtifacts = allArtifacts.concat(response.data.artifacts);
               page++;
-            } while (response.data.artifacts.length === per_page);
+            } while (allArtifacts.length < response.data.total_count);
             let matchArtifact = allArtifacts.filter((artifact) => {
               return artifact.name == "pr_number"
             })[0];

.github/workflows/spread-results-reporter.yaml

@@ -19,7 +19,7 @@ jobs:
         uses: actions/checkout@v6
 
       - name: Get PR number
-        uses: actions/github-script@v8
+        uses: actions/github-script@v9
         with:
           script: |
             let page = 1;
@@ -36,7 +36,7 @@ jobs:
               });
               allArtifacts = allArtifacts.concat(response.data.artifacts);
               page++;
-            } while (response.data.artifacts.length === per_page);
+            } while (allArtifacts.length < response.data.total_count);
             let matchArtifact = allArtifacts.filter((artifact) => {
               return artifact.name == "pr_number"
             })[0];
@@ -53,7 +53,7 @@ jobs:
         run: unzip pr_number.zip
 
       - name: Get generated data
-        uses: actions/github-script@v8
+        uses: actions/github-script@v9
         with:
           script: |
             let page = 1;
@@ -70,7 +70,7 @@ jobs:
               });
               allArtifacts = allArtifacts.concat(response.data.artifacts);
               page++;
-            } while (response.data.artifacts.length === per_page);
+            } while (allArtifacts.length < response.data.total_count);
 
             let matchingArtifacts = allArtifacts.filter((artifact) => {
               return artifact.name.startsWith(`spread-results-${context.payload.workflow_run.id}-${context.payload.workflow_run.run_attempt}`);

.github/workflows/spread-tests.yaml

@@ -372,7 +372,7 @@ jobs:
       if: ${{ env.SKIP_SPREAD_LABEL != 'true' && env.RUN_TESTS == 'true' }}
       env:
         SYSTEMS: ${{ inputs.systems }}
-      uses: actions/github-script@v8
+      uses: actions/github-script@v9
       with:
         script: |
           let fs = require('fs');
@@ -381,11 +381,21 @@ jobs:
           let child_process = require('child_process');
           let systems = process.env.SYSTEMS.split(' ');
 
-          let allArtifacts = await github.rest.actions.listWorkflowRunArtifacts({
-            owner: context.repo.owner,
-            repo: context.repo.repo,
-            run_id: context.runId,
-          });
+          let page = 1;
+          let per_page = 100;
+          let allArtifacts = [];
+          let response;
+          do {
+            response = await github.rest.actions.listWorkflowRunArtifacts({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              run_id: context.runId,
+              per_page: per_page,
+              page: page
+            });
+            allArtifacts = allArtifacts.concat(response.data.artifacts);
+            page++;
+          } while (allArtifacts.length < response.data.total_count);
 
           for (let system of systems) {
             let artifactName = `package-${system}`;
@@ -395,7 +405,7 @@ jobs:
               const arch = match[2] || '';
               artifactName = `package-ubuntu-${version}.04${arch}-64`;
             }
-            let artifact = allArtifacts.data.artifacts.find(a => a.name === artifactName);
+            let artifact = allArtifacts.find(a => a.name === artifactName);
             if (!artifact) {
               console.log(`Artifact not found for system: ${system}`);
               continue;

.woke.yaml

@@ -32,3 +32,4 @@ ignore_files:
   - packaging/ubuntu-16.04/changelog
   - tests/lib/snaps/store/test-snapd-ovmf/snapcraft.yaml
   - tests/lib/tools/tests.session
+  - tests/main/remove-impacted-by-mounts/task.yaml

boot/boot.go

@@ -343,7 +343,7 @@ func GetCurrentBoot(t snap.Type, dev snap.Device) (snap.PlaceInfo, error) {
 // bootStateUpdate carries the state for an on-going boot state update.
 // At the end it can be used to commit it.
 type bootStateUpdate interface {
-	commit(markedSuccesful bool) error
+	commit() error
 }
 
 // MarkBootSuccessful marks the current boot as successful. This means
@@ -403,8 +403,7 @@ func MarkBootSuccessful(dev snap.Device) error {
 	}
 
 	if u != nil {
-		const markedSuccessful = true
-		if err := u.commit(markedSuccessful); err != nil {
+		if err := u.commit(); err != nil {
 			return fmt.Errorf(errPrefix, err)
 		}
 	}

boot/boot_test.go

@@ -20,7 +20,6 @@
 package boot_test
 
 import (
-	"encoding/json"
 	"errors"
 	"fmt"
 	"os"
@@ -5268,49 +5267,3 @@ func (s *bootenv20Suite) TestMarkBootSuccessfulClassModes(c *C) {
 	c.Check(m2.Base, Equals, "")
 	c.Check(m2.TryBase, Equals, "")
 }
-
-func (s *bootenv20Suite) TestMarkBootSuccessfulAutoRepair(c *C) {
-	m := &boot.Modeenv{
-		Mode:           "run",
-		CurrentKernels: []string{s.kern1.Filename()},
-	}
-	defer setupUC20Bootenv(
-		c,
-		s.bootloader,
-		&bootenv20Setup{
-			modeenv:    m,
-			kern:       s.kern1,
-			kernStatus: boot.DefaultStatus,
-		},
-	)()
-
-	data := map[string]any{
-		"ubuntu-data": map[string]any{
-			"unlock-key": "recovery",
-		},
-		"ubuntu-save": map[string]any{
-			"unlock-key": "run",
-		},
-	}
-	jsonData, err := json.Marshal(data)
-	c.Assert(err, IsNil)
-
-	err = os.MkdirAll(filepath.Join(s.rootdir, "run/snapd/snap-bootstrap"), 0755)
-	c.Assert(err, IsNil)
-	err = os.WriteFile(filepath.Join(s.rootdir, "run/snapd/snap-bootstrap/unlocked.json"), jsonData, 0644)
-	c.Assert(err, IsNil)
-
-	resealCalls := 0
-	defer boot.MockResealKeyToModeenv(func(rootdir string, modeenv *boot.Modeenv, opts boot.ResealKeyToModeenvOptions, unlocker boot.Unlocker) error {
-		resealCalls++
-		c.Check(opts.Force, Equals, true)
-		c.Check(opts.EnsureProvisioned, Equals, true)
-		return nil
-	})()
-
-	dev := boottest.MockClassicWithModesDevice("", nil)
-
-	err = boot.MarkBootSuccessful(dev)
-	c.Assert(err, IsNil)
-	c.Check(resealCalls, Equals, 1)
-}

boot/bootstate16.go

@@ -114,7 +114,7 @@ func newBootStateUpdate16(u bootStateUpdate, names ...string) (*bootStateUpdate1
 	return &bootStateUpdate16{bl: bl, env: m, toCommit: make(map[string]string)}, nil
 }
 
-func (u16 *bootStateUpdate16) commit(markedSuccessful bool) error {
+func (u16 *bootStateUpdate16) commit() error {
 	if len(u16.toCommit) == 0 {
 		// nothing to do
 		return nil

boot/bootstate20.go

@@ -21,7 +21,6 @@ package boot
 
 import (
 	"fmt"
-	"os"
 	"path/filepath"
 	"sync"
 	"sync/atomic"
@@ -189,7 +188,7 @@ func newBootStateUpdate20(m *Modeenv) (*bootStateUpdate20, error) {
 }
 
 // commit will write out boot state persistently to disk.
-func (u20 *bootStateUpdate20) commit(markedSuccessful bool) error {
+func (u20 *bootStateUpdate20) commit() error {
 	if !isModeenvLocked() {
 		return fmt.Errorf("internal error: cannot commit modeenv without the lock")
 	}
@@ -225,18 +224,6 @@ func (u20 *bootStateUpdate20) commit(markedSuccessful bool) error {
 		resealOpts.ExpectReseal = resealExpectedByModeenvChange(u20.writeModeenv, u20.modeenv)
 	}
 
-	if markedSuccessful {
-		autoRepair, err := isUnlockedWithRecoveryKey()
-		if err != nil {
-			if !os.IsNotExist(err) {
-				return err
-			}
-		} else if autoRepair {
-			resealOpts.Force = true
-			resealOpts.EnsureProvisioned = true
-		}
-	}
-
 	// next reseal using the modeenv values, we do this before any
 	// post-modeenv tasks so if we are rebooted at any point after
 	// the reseal even before the post tasks are completed, we

boot/kernel_os.go

@@ -48,8 +48,7 @@ func (bp *coreBootParticipant) SetNextBoot(bootCtx NextBootContext) (rebootInfo
 	}
 
 	if u != nil {
-		const markedSuccessful = false
-		if err := u.commit(markedSuccessful); err != nil {
+		if err := u.commit(); err != nil {
 			return RebootInfo{RebootRequired: false}, fmt.Errorf(errPrefix, err)
 		}
 	}

boot/unlocked_state.go

@@ -95,20 +95,3 @@ func LoadDiskUnlockState(name string) (*DiskUnlockState, error) {
 
 	return ret, nil
 }
-
-// isUnlockedWithRecoveryKey tells whether a recovery key has been
-// typed to unlock a disk during boot.
-func isUnlockedWithRecoveryKey() (bool, error) {
-	state, err := LoadDiskUnlockState(UnlockedStateFileName)
-	if err != nil {
-		return false, err
-	}
-
-	if state.State != nil {
-		return state.State.NumActivatedContainersWithRecoveryKey() != 0, nil
-	} else {
-		// This is a case of an old snap-boostrap that does not provide the activate state API result.
-		// We still can guess based on the old status.
-		return state.UbuntuData.UnlockKey == "recovery" || state.UbuntuSave.UnlockKey == "recovery", nil
-	}
-}

cmd/snap-bootstrap/blkid/blkid_test.go

@@ -52,7 +52,7 @@ func (s *blkidSuite) SetUpTest(c *C) {
 	tmp := c.MkDir()
 	image := filepath.Join(tmp, "image")
 
-	cmd := exec.Command(systemdRepart, "--offline=yes", "--size=64M", "--empty=create", "--definitions=test-data/repart.d", image)
+	cmd := exec.Command(systemdRepart, "--offline=yes", "--size=64M", "--empty=create", "--definitions=testdata/repart.d", image)
 	err = cmd.Run()
 	if err != nil {
 		c.Skip("systemd-repart is not working")