Skip to content

Commit b7a53e4

Browse files
committed
ci: split simplified test
1 parent 3478ac2 commit b7a53e4

File tree

5 files changed

+24
-16
lines changed

5 files changed

+24
-16
lines changed

.github/workflows/cs8.yml

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
name: RHEL for Edge test on CS8
22

33
on:
4-
# Triggered by osbuild-composer CI from gitlab
54
repository_dispatch:
6-
types: [osbuild-composer-ci]
5+
types: [trigger-workflow]
76

87
jobs:
98
pr-info:
109
runs-on: ubuntu-latest
1110
steps:
12-
- name: Get PR number from string PR-xxxx
11+
- name: Get PR number from trigger event
1312
id: pr-num
1413
run: |
15-
PR_NUM=$(echo "${{ github.event.client_payload.pr_number }}" | cut -d'-' -f 2)
14+
PR_NUM=$(echo "${{ github.event.client_payload.pr_number }}")
1615
echo "pr_number=$PR_NUM" >> $GITHUB_OUTPUT
1716
1817
- name: Get information for osbuild-composer pull request

.github/workflows/cs9.yml

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
name: RHEL for Edge test on CS9
22

33
on:
4-
# Triggered by osbuild-composer CI from gitlab
54
repository_dispatch:
6-
types: [osbuild-composer-ci]
5+
types: [trigger-workflow]
76

87
jobs:
98
pr-info:
109
runs-on: ubuntu-latest
1110
steps:
12-
- name: Get PR number from string PR-xxxx
11+
- name: Get PR number from trigger event
1312
id: pr-num
1413
run: |
15-
PR_NUM=$(echo "${{ github.event.client_payload.pr_number }}" | cut -d'-' -f 2)
14+
PR_NUM=$(echo "${{ github.event.client_payload.pr_number }}")
1615
echo "pr_number=$PR_NUM" >> $GITHUB_OUTPUT
1716
1817
- name: Get information for osbuild-composer pull request

.github/workflows/fedora-39.yml

+3-4
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,17 @@
22
name: RHEL for Edge test on Fedora 39
33

44
on:
5-
# Triggered by osbuild-composer CI from gitlab
65
repository_dispatch:
7-
types: [osbuild-composer-ci]
6+
types: [trigger-workflow]
87

98
jobs:
109
pr-info:
1110
runs-on: ubuntu-latest
1211
steps:
13-
- name: Get PR number from string PR-xxxx
12+
- name: Get PR number from trigger event
1413
id: pr-num
1514
run: |
16-
PR_NUM=$(echo "${{ github.event.client_payload.pr_number }}" | cut -d'-' -f 2)
15+
PR_NUM=$(echo "${{ github.event.client_payload.pr_number }}")
1716
echo "pr_number=$PR_NUM" >> $GITHUB_OUTPUT
1817
1918
- name: Get information for osbuild-composer pull request

.github/workflows/rhel-8.yml

+3-4
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,17 @@
22
name: RHEL for Edge test on RHEL 8
33

44
on:
5-
# Triggered by osbuild-composer CI from gitlab
65
repository_dispatch:
7-
types: [osbuild-composer-ci]
6+
types: [trigger-workflow]
87

98
jobs:
109
pr-info:
1110
runs-on: ubuntu-latest
1211
steps:
13-
- name: Get PR number from string PR-xxxx
12+
- name: Get PR number from trigger event
1413
id: pr-num
1514
run: |
16-
PR_NUM=$(echo "${{ github.event.client_payload.pr_number }}" | cut -d'-' -f 2)
15+
PR_NUM=$(echo "${{ github.event.client_payload.pr_number }}")
1716
echo "pr_number=$PR_NUM" >> $GITHUB_OUTPUT
1817
1918
- name: Get information for osbuild-composer pull request

.github/workflows/rhel-9.yml

+12
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ jobs:
2828
sha: ${{ fromJson(steps.pr-api.outputs.data).head.sha }}
2929
sender_repo: ${{ fromJson(steps.pr-api.outputs.data).head.repo.full_name }}
3030
sender_branch: ${{ fromJson(steps.pr-api.outputs.data).head.ref }}
31+
pr_number: ${{ steps.pr-num.outputs.pr_number }}
3132

3233
pre-edge-commit-9:
3334
needs: pr-info
@@ -1520,3 +1521,14 @@ jobs:
15201521
path: |
15211522
/tmp/artifacts/*.json
15221523
/tmp/artifacts/*.log
1524+
1525+
trigger-other-os-test:
1526+
if: ${{ always() }}
1527+
needs: [pr-info, edge-installer-9]
1528+
runs-on: ubuntu-latest
1529+
steps:
1530+
- name: trigger other os test
1531+
uses: peter-evans/repository-dispatch@v3
1532+
with:
1533+
event-type: trigger-workflow
1534+
client-payload: '{"pr_number": "${{ needs.pr-info.outputs.pr_number }}"}'

0 commit comments

Comments
 (0)