Use older disk version for preparing upgrade-test

Signed-off-by: Fredrik Lönnegren <fredrik.lonnegren@suse.com>
rancher · Feb 15, 2024 · ee9cdd0 · ee9cdd0
1 parent cc53c13
commit ee9cdd0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -3,7 +3,7 @@ on:
   push:
     tags:
       - v**
-  pull_request_target:
+  pull_request:
     types:
       - opened
       - synchronize

diff --git a/.github/workflows/build_and_test_x86.yaml b/.github/workflows/build_and_test_x86.yaml
@@ -173,7 +173,12 @@ jobs:
           make test-deps
       - run: |
           git fetch --prune --unshallow
-      - name: Cached Disk
+      - if: ${{ matrix.test == "test-upgrade" }}
+        name: Download specific disk
+        run: |
+          wget https://github.com/rancher/elemental-toolkit/releases/download/v1.1.4/elemental-${{ inputs.flavor }}-v1.1.4.${{ env.ARCH }}.qcow2 -O /tmp/elemental-${{ inputs.flavor }}.${{ env.ARCH }}.qcow2
+      - if: ${{ matrix.test != "test-upgrade" }}
+        name: Cached Disk
         id: cache-disk
         uses: actions/cache/restore@v4
         env:

diff --git a/tests/assets/chroot_hooks.yaml b/tests/assets/chroot_hooks.yaml
@@ -1,8 +1,8 @@
-name: "Setup cos config"
+name: "Debug hooks"
 stages:
    after-upgrade-chroot:
      - commands:
         - echo > /after-upgrade-chroot
    after-reset-chroot:
      - commands:
-        - echo > /after-reset-chroot
+        - echo > /after-reset-chroot
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ on: @@
       push:
         tags:
           - v**
-      pull_request_target:
+      pull_request:
         types:
           - opened
           - synchronize
@@ Expand Down @@