mkosi: Add back --preserve-env when running integrationt tests

The test wrapper script depends on various github actions environment
variables so let's make sure those are propagated.

(cherry picked from commit 6733b07d43f3524b66b5ab79a96cad192d2280fc)

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index 034c22882816f498831a7e8db7a49e84be7aa1ca..7fc7518dcc0c4b933f1e4d37621fee3f1036263f 100644 (file)
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -104,7 +104,10 @@ jobs:
 
       - name: Run integration tests
         run: |
-          sudo mkosi sandbox \
+          # --preserve-env makes sure all the github actions environment variables are propagated which are
+          # used in integration-test-wrapper.py to construct the `gh` command line to download the journals
+          # of failed tests.
+          sudo --preserve-env mkosi sandbox \
             meson test \
             -C build \
             --no-rebuild \

diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml
index 7a4c7b6d16ec8521a6321d2e239d26e749d8a8c2..6f6df0ddf935abc6d1b1bc1e47937690290a9a4c 100644 (file)
--- a/.github/workflows/mkosi.yml
+++ b/.github/workflows/mkosi.yml
@@ -209,7 +209,10 @@ jobs:
               MAX_LINES=()
           fi
 
-          sudo mkosi sandbox \
+          # --preserve-env makes sure all the github actions environment variables are propagated which are
+          # used in integration-test-wrapper.py to construct the `gh` command line to download the journals
+          # of failed tests.
+          sudo --preserve-env mkosi sandbox \
             env \
             TEST_PREFER_QEMU=${{ matrix.vm }} \
             TEST_SKIP=${{ matrix.skip }} \