Skip fedora for now, run Arch & Ubuntu in a matrix

maxfierke · Oct 10, 2023 · 5217d3a · 5217d3a
1 parent cd623df
commit 5217d3a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/.github/workflows/provision.yml b/.github/workflows/provision.yml
@@ -116,7 +116,14 @@ jobs:
   #     run: |
   #       source ~/.mstrap/env.sh && make check-provisioning
 
-  fedora-provision:
+  linux-x86_64-smoke-tests:
+    strategy:
+      matrix:
+        test_name:
+          - archlinux-test
+          #- fedora-38-test # Broken linking w/ OpenSSL
+          #- fedora-39-test # Broken linking w/ OpenSSL
+          - ubuntu-2204-test
     runs-on: ubuntu-latest
 
     steps:
@@ -155,4 +162,9 @@ jobs:
 
     - name: Run Fedora smoke tests
       run: |
-        make smoke-test TEST_NAME=fedora-38-test TARGET_OS=linux TARGET_ARCH=x86_64
+        make smoke-test \
+          TEST_NAME=${{ matrix.test_name }} \
+          TARGET_OS=linux \
+          TARGET_ARCH=x86_64
+      env:
+        MSTRAP_FLAGS: "--config ${{ secrets.TEST_CONFIG_URL }}"
diff --git a/spec/provisioning/docker/test.sh b/spec/provisioning/docker/test.sh
@@ -6,6 +6,7 @@ export BUNDLE_PATH="~/.bundle"
 export GEM_HOME="~/.gems"
 export USER="$(whoami)"
 export SHELL=/bin/bash
+export STRAP_CI=true
 
 MSTRAP_FLAGS=${MSTRAP_FLAGS:-"--debug"}
 WORKSPACE=/workspace