[QE] update pr check on linux-arm64

lilyLuLiu · Jan 14, 2025 · 4bcd632 · 4bcd632
1 parent 064da69
commit 4bcd632
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 7 deletions.
diff --git a/.github/workflows/linux-qe-template.yml b/.github/workflows/linux-qe-template.yml
@@ -21,9 +21,6 @@ jobs:
       statuses: write # needed to update commit status (pending/failure/sucess)
       checks: write # as documented in https://github.com/mikepenz/action-junit-report?tab=readme-ov-file#pr-run-permissions
     steps:
-      - name: Check out repository code
-        uses: actions/checkout@v4
-
       - name: Download gh context
         id: download-gh-context-artifact
         uses: actions/download-artifact@v4
@@ -52,12 +49,11 @@ jobs:
           status_context="${status_context}/Linux-ARM64"
           echo "status_context=${status_context}" >> "$GITHUB_ENV"
 
-          ocp_version_line=$(cat Makefile | grep "OPENSHIFT_VERSION ?=")
-          ocp_bundle_v=${ocp_version_line##*= } 
+          ocp_bundle_v=$(cat ocp_bundle_v.json)
           echo "ocp_bundle_v=${ocp_bundle_v}" >> "$GITHUB_ENV"
           echo "ocp_bundle_v=${ocp_bundle_v}"
-          microshift_version_line=$(cat Makefile | grep "MICROSHIFT_VERSION ?=")
-          microshift_bundle_v=${microshift_version_line##*= } 
+
+          microshift_bundle_v=$(cat microshift_bundle_v.json)
           echo "microshift_bundle_v=${microshift_bundle_v}" >> "$GITHUB_ENV"
           echo "microshift_bundle_v=${microshift_bundle_v}"
 
@@ -128,6 +124,7 @@ jobs:
           $ssh_cmd 'mkdir -p /home/crctest/.ssh' < /dev/null
           $ssh_cmd 'cp /root/.ssh/authorized_keys /home/crctest/.ssh/' < /dev/null
           $ssh_cmd 'chown -R crctest:crctest /home/crctest/.ssh/'  < /dev/null
+          $ssh_cmd 'dnf install podman -y'  < /dev/null
 
           # Install CRC on the reserved machine
           echo "Start installing crc on reserved machine"

diff --git a/.github/workflows/windows-artifacts.yml b/.github/workflows/windows-artifacts.yml
@@ -109,3 +109,23 @@ jobs:
         with:
           name: gh-context
           path: gh_context.json
+      - name: Check out repository code
+        uses: actions/checkout@v4
+      - name: Save the bundle version
+        run: |
+          ocp_version_line=$(cat Makefile | grep "OPENSHIFT_VERSION ?=")
+          ocp_bundle_v=${ocp_version_line##*= } 
+          echo $ocp_bundle_v > ocp_bundle_v.json
+          microshift_version_line=$(cat Makefile | grep "MICROSHIFT_VERSION ?=")
+          microshift_bundle_v=${microshift_version_line##*= } 
+          echo $microshift_bundle_v > microshift_bundle_v.json
+      - name: Upload the ocp bundle version artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: ocp_bundle_v
+          path: ocp_bundle_v.json
+      - name: Upload the microshift bundle version artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: microshift_bundle_v
+          path: microshift_bundle_v.json