From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Thu, 23 Jan 2025 09:35:06 +0000 (+0100)
Subject: mkosi: Add back --preserve-env when running integrationt tests
X-Git-Tag: v258-rc1~1513
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6733b07d43f3524b66b5ab79a96cad192d2280fc;p=thirdparty%2Fsystemd.git

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.
---

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index 0b6c5dd98ed..e76794116bf 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -113,7 +113,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 7a4c7b6d16e..6f6df0ddf93 100644
--- 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 }} \