Make sure upstream tests run on correct hardware.

diff --git a/.github/workflows/upstream.yml b/.github/workflows/upstream.yml
index 0b1ed138f5ac838673cb4251da7a912b82cbd662..7fda517fff7da5aa3ebdd80a7181216608bd1eea 100644 (file)
--- a/.github/workflows/upstream.yml
+++ b/.github/workflows/upstream.yml
@@ -9,19 +9,25 @@ jobs:
   selfhosted:
     name: "upstream ${{ matrix.target }} ${{ matrix.config }}"
     if: github.repository == 'openssh/openssh-portable-selfhosted'
-    runs-on: 'libvirt'
+    runs-on: ${{ matrix.host }}
     env:
       DEBUG_ACTIONS: true
       EPHEMERAL: true
-      HOST: 'libvirt'
+      HOST:  ${{ matrix.host }}
       TARGET_HOST: ${{ matrix.target }}
       TARGET_CONFIG: ${{ matrix.config }}
       TARGET_DOMAIN: ${{ format('{0}-{1}-{2}', matrix.target, matrix.config, github.run_id) || matrix.target }}
     strategy:
       fail-fast: false
       matrix:
-        target: [ obsdsnap, obsdsnap-i386, obsdsnap-arm64 ]
+        host:
+          - libvirt
+        target: [ obsdsnap, obsdsnap-i386 ]
         config: [ default, without-openssl, ubsan ]
+        include:
+          - { host: libvirt-arm64, target: obsdsnap-arm64, config: default }
+          - { host: libvirt-arm64, target: obsdsnap-arm64, config: without-openssl }
+          - { host: libvirt-arm64, target: obsdsnap-arm64, config: ubsan }
     steps:
     - name: unmount stale workspace
       run: fusermount -u ${GITHUB_WORKSPACE} || true