Skip to content

Commit 7beb0b3

Browse files
lilyLuLiupraveenkumar
authored andcommitted
[QE] update pr check on linux-arm64
1 parent 48dd862 commit 7beb0b3

2 files changed

Lines changed: 25 additions & 7 deletions

File tree

.github/workflows/linux-qe-template.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,19 @@ jobs:
2121
statuses: write # needed to update commit status (pending/failure/sucess)
2222
checks: write # as documented in https://github.com/mikepenz/action-junit-report?tab=readme-ov-file#pr-run-permissions
2323
steps:
24-
- name: Check out repository code
25-
uses: actions/checkout@v4
26-
2724
- name: Download gh context
2825
id: download-gh-context-artifact
2926
uses: actions/download-artifact@v4
3027
with:
3128
name: gh-context
3229
run-id: ${{inputs.trigger-workflow-run-id}}
3330
github-token: ${{ github.token }}
31+
- name: Download bundle_version
32+
uses: actions/download-artifact@v4
33+
with:
34+
name: bundle_version
35+
run-id: ${{inputs.trigger-workflow-run-id}}
36+
github-token: ${{ github.token }}
3437

3538
- name: prepare
3639
run: |
@@ -52,12 +55,11 @@ jobs:
5255
status_context="${status_context}/Linux-ARM64"
5356
echo "status_context=${status_context}" >> "$GITHUB_ENV"
5457
55-
ocp_version_line=$(cat Makefile | grep "OPENSHIFT_VERSION ?=")
56-
ocp_bundle_v=${ocp_version_line##*= }
58+
ocp_bundle_v=$(sed -n '1p' bundle_version.json)
5759
echo "ocp_bundle_v=${ocp_bundle_v}" >> "$GITHUB_ENV"
5860
echo "ocp_bundle_v=${ocp_bundle_v}"
59-
microshift_version_line=$(cat Makefile | grep "MICROSHIFT_VERSION ?=")
60-
microshift_bundle_v=${microshift_version_line##*= }
61+
62+
microshift_bundle_v=$(sed -n '2p' bundle_version.json)
6163
echo "microshift_bundle_v=${microshift_bundle_v}" >> "$GITHUB_ENV"
6264
echo "microshift_bundle_v=${microshift_bundle_v}"
6365
@@ -128,6 +130,7 @@ jobs:
128130
$ssh_cmd 'mkdir -p /home/crctest/.ssh' < /dev/null
129131
$ssh_cmd 'cp /root/.ssh/authorized_keys /home/crctest/.ssh/' < /dev/null
130132
$ssh_cmd 'chown -R crctest:crctest /home/crctest/.ssh/' < /dev/null
133+
$ssh_cmd 'dnf install podman -y' < /dev/null
131134
132135
# Install CRC on the reserved machine
133136
echo "Start installing crc on reserved machine"

.github/workflows/windows-artifacts.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,3 +109,18 @@ jobs:
109109
with:
110110
name: gh-context
111111
path: gh_context.json
112+
- name: Check out repository code
113+
uses: actions/checkout@v4
114+
- name: Save the bundle version
115+
run: |
116+
ocp_version_line=$(cat Makefile | grep "OPENSHIFT_VERSION ?=")
117+
ocp_bundle_v=${ocp_version_line##*= }
118+
echo $ocp_bundle_v > bundle_version.json
119+
microshift_version_line=$(cat Makefile | grep "MICROSHIFT_VERSION ?=")
120+
microshift_bundle_v=${microshift_version_line##*= }
121+
echo $microshift_bundle_v >> bundle_version.json
122+
- name: Upload the ocp bundle version artifact
123+
uses: actions/upload-artifact@v4
124+
with:
125+
name: bundle_version
126+
path: bundle_version.json

0 commit comments

Comments
 (0)