Skip to content

Commit 6914878

Browse files
mcattamoredhatcursoragent
mcattamoredhat
and
cursoragent
committed
ci: extend RHEL 9.8/9.9/10.3 bootc+ostree test coverage and sync comment-ci
Extend the rhel-9.8/rhel-10.2 case blocks in the bootc test scripts (anaconda-iso, qcow2) to also cover RHEL 9.9 and RHEL 10.3, following the same Copr-primary / compose-RPM-override pattern, using ${ARCH} instead of a hardcoded x86_64. Add the missing Testing Farm jobs to greenboot-ci.yaml: rhel-9.8-bootc, rhel-9.9-bootc, rhel-9.9-ostree, and rhel-10.3-bootc. Mirror the full set of RHEL bootc/ostree jobs into comment-ci.yaml so the same tests can be re-triggered on demand via a "/test" PR comment, keeping the two workflow files in sync. Assisted-by: Claude (claude-sonnet-5) Signed-off-by: Mario Cattamo <mcattamo@redhat.com> Co-authored-by: Cursor <cursoragent@cursor.com>
1 parent 8ba1b4d commit 6914878

10 files changed

Lines changed: 360 additions & 20 deletions

‎.github/workflows/comment-ci.yaml‎

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,75 @@ jobs:
226226
timeout: 90
227227
secrets: "QUAY_USERNAME=${{ secrets.QUAY_USERNAME }};QUAY_PASSWORD=${{ secrets.QUAY_PASSWORD }};STAGE_REDHAT_IO_USERNAME=${{ secrets.STAGE_REDHAT_IO_USERNAME }};STAGE_REDHAT_IO_TOKEN=${{ secrets.STAGE_REDHAT_IO_TOKEN }};DOWNLOAD_NODE=${{ secrets.DOWNLOAD_NODE }}"
228228

229+
rhel-9-8-bootc:
230+
needs: check-pull-request
231+
if: ${{ needs.check-pull-request.outputs.allowed_user == 'true' }}
232+
runs-on: ubuntu-latest
233+
permissions:
234+
statuses: write
235+
236+
steps:
237+
- name: Run the tests
238+
uses: sclorg/testing-farm-as-github-action@230555baceb860aa468d216f1822974836b965d1 # v4.3.1
239+
with:
240+
compose: RHEL-9.8.0-Nightly
241+
api_key: ${{ secrets.TF_API_KEY }}
242+
git_url: ${{ needs.check-pull-request.outputs.repo_url }}
243+
git_ref: ${{ needs.check-pull-request.outputs.ref }}
244+
update_pull_request_status: true
245+
pull_request_status_name: rhel-9.8-bootc
246+
tmt_context: "arch=x86_64;distro=rhel-9-8"
247+
tmt_plan_regex: bootc
248+
variables: "ARCH=x86_64;PR_NUMBER=${{ needs.check-pull-request.outputs.pr_number }}"
249+
timeout: 90
250+
secrets: "QUAY_USERNAME=${{ secrets.QUAY_USERNAME }};QUAY_PASSWORD=${{ secrets.QUAY_PASSWORD }};STAGE_REDHAT_IO_USERNAME=${{ secrets.STAGE_REDHAT_IO_USERNAME }};STAGE_REDHAT_IO_TOKEN=${{ secrets.STAGE_REDHAT_IO_TOKEN }};DOWNLOAD_NODE=${{ secrets.DOWNLOAD_NODE }}"
251+
252+
rhel-9-9-ostree:
253+
needs: check-pull-request
254+
if: ${{ needs.check-pull-request.outputs.allowed_user == 'true' }}
255+
runs-on: ubuntu-latest
256+
permissions:
257+
statuses: write
258+
259+
steps:
260+
- name: Run the tests
261+
uses: sclorg/testing-farm-as-github-action@230555baceb860aa468d216f1822974836b965d1 # v4.3.1
262+
with:
263+
compose: RHEL-9.9.0-Nightly
264+
api_key: ${{ secrets.TF_API_KEY }}
265+
git_url: ${{ needs.check-pull-request.outputs.repo_url }}
266+
git_ref: ${{ needs.check-pull-request.outputs.ref }}
267+
update_pull_request_status: true
268+
pull_request_status_name: rhel-9.9-ostree
269+
tmt_context: "arch=x86_64;distro=rhel-9-9"
270+
tmt_plan_regex: ostree
271+
variables: "ARCH=x86_64;PR_NUMBER=${{ needs.check-pull-request.outputs.pr_number }}"
272+
timeout: 90
273+
secrets: "QUAY_USERNAME=${{ secrets.QUAY_USERNAME }};QUAY_PASSWORD=${{ secrets.QUAY_PASSWORD }};STAGE_REDHAT_IO_USERNAME=${{ secrets.STAGE_REDHAT_IO_USERNAME }};STAGE_REDHAT_IO_TOKEN=${{ secrets.STAGE_REDHAT_IO_TOKEN }};DOWNLOAD_NODE=${{ secrets.DOWNLOAD_NODE }}"
274+
275+
rhel-9-9-bootc:
276+
needs: check-pull-request
277+
if: ${{ needs.check-pull-request.outputs.allowed_user == 'true' }}
278+
runs-on: ubuntu-latest
279+
permissions:
280+
statuses: write
281+
282+
steps:
283+
- name: Run the tests
284+
uses: sclorg/testing-farm-as-github-action@230555baceb860aa468d216f1822974836b965d1 # v4.3.1
285+
with:
286+
compose: RHEL-9.9.0-Nightly
287+
api_key: ${{ secrets.TF_API_KEY }}
288+
git_url: ${{ needs.check-pull-request.outputs.repo_url }}
289+
git_ref: ${{ needs.check-pull-request.outputs.ref }}
290+
update_pull_request_status: true
291+
pull_request_status_name: rhel-9.9-bootc
292+
tmt_context: "arch=x86_64;distro=rhel-9-9"
293+
tmt_plan_regex: bootc
294+
variables: "ARCH=x86_64;PR_NUMBER=${{ needs.check-pull-request.outputs.pr_number }}"
295+
timeout: 90
296+
secrets: "QUAY_USERNAME=${{ secrets.QUAY_USERNAME }};QUAY_PASSWORD=${{ secrets.QUAY_PASSWORD }};STAGE_REDHAT_IO_USERNAME=${{ secrets.STAGE_REDHAT_IO_USERNAME }};STAGE_REDHAT_IO_TOKEN=${{ secrets.STAGE_REDHAT_IO_TOKEN }};DOWNLOAD_NODE=${{ secrets.DOWNLOAD_NODE }}"
297+
229298
rhel-10-2-bootc:
230299
needs: check-pull-request
231300
if: ${{ needs.check-pull-request.outputs.allowed_user == 'true' }}
@@ -248,3 +317,26 @@ jobs:
248317
variables: "ARCH=x86_64;PR_NUMBER=${{ needs.check-pull-request.outputs.pr_number }}"
249318
timeout: 90
250319
secrets: "QUAY_USERNAME=${{ secrets.QUAY_USERNAME }};QUAY_PASSWORD=${{ secrets.QUAY_PASSWORD }};STAGE_REDHAT_IO_USERNAME=${{ secrets.STAGE_REDHAT_IO_USERNAME }};STAGE_REDHAT_IO_TOKEN=${{ secrets.STAGE_REDHAT_IO_TOKEN }};DOWNLOAD_NODE=${{ secrets.DOWNLOAD_NODE }}"
320+
321+
rhel-10-3-bootc:
322+
needs: check-pull-request
323+
if: ${{ needs.check-pull-request.outputs.allowed_user == 'true' }}
324+
runs-on: ubuntu-latest
325+
permissions:
326+
statuses: write
327+
328+
steps:
329+
- name: Run the tests
330+
uses: sclorg/testing-farm-as-github-action@230555baceb860aa468d216f1822974836b965d1 # v4.3.1
331+
with:
332+
compose: RHEL-10.3-Nightly
333+
api_key: ${{ secrets.TF_API_KEY }}
334+
git_url: ${{ needs.check-pull-request.outputs.repo_url }}
335+
git_ref: ${{ needs.check-pull-request.outputs.ref }}
336+
update_pull_request_status: true
337+
pull_request_status_name: rhel-10.3-bootc
338+
tmt_context: "arch=x86_64;distro=rhel-10-3"
339+
tmt_plan_regex: bootc
340+
variables: "ARCH=x86_64;PR_NUMBER=${{ needs.check-pull-request.outputs.pr_number }}"
341+
timeout: 90
342+
secrets: "QUAY_USERNAME=${{ secrets.QUAY_USERNAME }};QUAY_PASSWORD=${{ secrets.QUAY_PASSWORD }};STAGE_REDHAT_IO_USERNAME=${{ secrets.STAGE_REDHAT_IO_USERNAME }};STAGE_REDHAT_IO_TOKEN=${{ secrets.STAGE_REDHAT_IO_TOKEN }};DOWNLOAD_NODE=${{ secrets.DOWNLOAD_NODE }}"

‎.github/workflows/greenboot-ci.yaml‎

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,75 @@ jobs:
227227
timeout: 120
228228
secrets: "QUAY_USERNAME=${{ secrets.QUAY_USERNAME }};QUAY_PASSWORD=${{ secrets.QUAY_PASSWORD }};STAGE_REDHAT_IO_USERNAME=${{ secrets.STAGE_REDHAT_IO_USERNAME }};STAGE_REDHAT_IO_TOKEN=${{ secrets.STAGE_REDHAT_IO_TOKEN }};DOWNLOAD_NODE=${{ secrets.DOWNLOAD_NODE }}"
229229

230+
rhel-9-8-bootc:
231+
needs: check-pull-request
232+
if: ${{ needs.check-pull-request.outputs.allowed_user == 'true' }}
233+
runs-on: ubuntu-latest
234+
permissions:
235+
statuses: write
236+
237+
steps:
238+
- name: Run the tests
239+
uses: sclorg/testing-farm-as-github-action@230555baceb860aa468d216f1822974836b965d1 # v4.3.1
240+
with:
241+
compose: RHEL-9.8.0-Nightly
242+
api_key: ${{ secrets.TF_API_KEY }}
243+
git_url: ${{ needs.check-pull-request.outputs.repo_url }}
244+
git_ref: ${{ needs.check-pull-request.outputs.ref }}
245+
update_pull_request_status: true
246+
pull_request_status_name: rhel-9.8-bootc
247+
tmt_context: "arch=x86_64;distro=rhel-9-8"
248+
tmt_plan_regex: bootc
249+
variables: "ARCH=x86_64;PR_NUMBER=${{ needs.check-pull-request.outputs.pr_number }}"
250+
timeout: 120
251+
secrets: "QUAY_USERNAME=${{ secrets.QUAY_USERNAME }};QUAY_PASSWORD=${{ secrets.QUAY_PASSWORD }};STAGE_REDHAT_IO_USERNAME=${{ secrets.STAGE_REDHAT_IO_USERNAME }};STAGE_REDHAT_IO_TOKEN=${{ secrets.STAGE_REDHAT_IO_TOKEN }};DOWNLOAD_NODE=${{ secrets.DOWNLOAD_NODE }}"
252+
253+
rhel-9-9-ostree:
254+
needs: check-pull-request
255+
if: ${{ needs.check-pull-request.outputs.allowed_user == 'true' }}
256+
runs-on: ubuntu-latest
257+
permissions:
258+
statuses: write
259+
260+
steps:
261+
- name: Run the tests
262+
uses: sclorg/testing-farm-as-github-action@230555baceb860aa468d216f1822974836b965d1 # v4.3.1
263+
with:
264+
compose: RHEL-9.9.0-Nightly
265+
api_key: ${{ secrets.TF_API_KEY }}
266+
git_url: ${{ needs.check-pull-request.outputs.repo_url }}
267+
git_ref: ${{ needs.check-pull-request.outputs.ref }}
268+
update_pull_request_status: true
269+
pull_request_status_name: rhel-9.9-ostree
270+
tmt_context: "arch=x86_64;distro=rhel-9-9"
271+
tmt_plan_regex: ostree
272+
variables: "ARCH=x86_64;PR_NUMBER=${{ needs.check-pull-request.outputs.pr_number }}"
273+
timeout: 120
274+
secrets: "QUAY_USERNAME=${{ secrets.QUAY_USERNAME }};QUAY_PASSWORD=${{ secrets.QUAY_PASSWORD }};STAGE_REDHAT_IO_USERNAME=${{ secrets.STAGE_REDHAT_IO_USERNAME }};STAGE_REDHAT_IO_TOKEN=${{ secrets.STAGE_REDHAT_IO_TOKEN }};DOWNLOAD_NODE=${{ secrets.DOWNLOAD_NODE }}"
275+
276+
rhel-9-9-bootc:
277+
needs: check-pull-request
278+
if: ${{ needs.check-pull-request.outputs.allowed_user == 'true' }}
279+
runs-on: ubuntu-latest
280+
permissions:
281+
statuses: write
282+
283+
steps:
284+
- name: Run the tests
285+
uses: sclorg/testing-farm-as-github-action@230555baceb860aa468d216f1822974836b965d1 # v4.3.1
286+
with:
287+
compose: RHEL-9.9.0-Nightly
288+
api_key: ${{ secrets.TF_API_KEY }}
289+
git_url: ${{ needs.check-pull-request.outputs.repo_url }}
290+
git_ref: ${{ needs.check-pull-request.outputs.ref }}
291+
update_pull_request_status: true
292+
pull_request_status_name: rhel-9.9-bootc
293+
tmt_context: "arch=x86_64;distro=rhel-9-9"
294+
tmt_plan_regex: bootc
295+
variables: "ARCH=x86_64;PR_NUMBER=${{ needs.check-pull-request.outputs.pr_number }}"
296+
timeout: 120
297+
secrets: "QUAY_USERNAME=${{ secrets.QUAY_USERNAME }};QUAY_PASSWORD=${{ secrets.QUAY_PASSWORD }};STAGE_REDHAT_IO_USERNAME=${{ secrets.STAGE_REDHAT_IO_USERNAME }};STAGE_REDHAT_IO_TOKEN=${{ secrets.STAGE_REDHAT_IO_TOKEN }};DOWNLOAD_NODE=${{ secrets.DOWNLOAD_NODE }}"
298+
230299
rhel-10-2-bootc:
231300
needs: check-pull-request
232301
if: ${{ needs.check-pull-request.outputs.allowed_user == 'true' }}
@@ -249,3 +318,26 @@ jobs:
249318
variables: "ARCH=x86_64;PR_NUMBER=${{ needs.check-pull-request.outputs.pr_number }}"
250319
timeout: 120
251320
secrets: "QUAY_USERNAME=${{ secrets.QUAY_USERNAME }};QUAY_PASSWORD=${{ secrets.QUAY_PASSWORD }};STAGE_REDHAT_IO_USERNAME=${{ secrets.STAGE_REDHAT_IO_USERNAME }};STAGE_REDHAT_IO_TOKEN=${{ secrets.STAGE_REDHAT_IO_TOKEN }};DOWNLOAD_NODE=${{ secrets.DOWNLOAD_NODE }}"
321+
322+
rhel-10-3-bootc:
323+
needs: check-pull-request
324+
if: ${{ needs.check-pull-request.outputs.allowed_user == 'true' }}
325+
runs-on: ubuntu-latest
326+
permissions:
327+
statuses: write
328+
329+
steps:
330+
- name: Run the tests
331+
uses: sclorg/testing-farm-as-github-action@230555baceb860aa468d216f1822974836b965d1 # v4.3.1
332+
with:
333+
compose: RHEL-10.3-Nightly
334+
api_key: ${{ secrets.TF_API_KEY }}
335+
git_url: ${{ needs.check-pull-request.outputs.repo_url }}
336+
git_ref: ${{ needs.check-pull-request.outputs.ref }}
337+
update_pull_request_status: true
338+
pull_request_status_name: rhel-10.3-bootc
339+
tmt_context: "arch=x86_64;distro=rhel-10-3"
340+
tmt_plan_regex: bootc
341+
variables: "ARCH=x86_64;PR_NUMBER=${{ needs.check-pull-request.outputs.pr_number }}"
342+
timeout: 120
343+
secrets: "QUAY_USERNAME=${{ secrets.QUAY_USERNAME }};QUAY_PASSWORD=${{ secrets.QUAY_PASSWORD }};STAGE_REDHAT_IO_USERNAME=${{ secrets.STAGE_REDHAT_IO_USERNAME }};STAGE_REDHAT_IO_TOKEN=${{ secrets.STAGE_REDHAT_IO_TOKEN }};DOWNLOAD_NODE=${{ secrets.DOWNLOAD_NODE }}"

‎tests/files/rhel-10-2.repo‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
[RHEL-10.2-NIGHTLY-BaseOS]
22
name=baseos
3-
baseurl=http://REPLACE_ME_HERE/rhel-10/nightly/RHEL-10/latest-RHEL-10.2/compose/BaseOS/x86_64/os
3+
baseurl=http://REPLACE_ME_HERE/rhel-10/nightly/RHEL-10/latest-RHEL-10.2/compose/BaseOS/REPLACE_ARCH_HERE/os/
44
enabled=1
55
gpgcheck=0
66
[RHEL-10.2-NIGHTLY-AppStream]
77
name=appstream
8-
baseurl=http://REPLACE_ME_HERE/rhel-10/nightly/RHEL-10/latest-RHEL-10.2/compose/AppStream/x86_64/os/
8+
baseurl=http://REPLACE_ME_HERE/rhel-10/nightly/RHEL-10/latest-RHEL-10.2/compose/AppStream/REPLACE_ARCH_HERE/os/
99
enabled=1
1010
gpgcheck=0

‎tests/files/rhel-10-3.repo‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
[RHEL-10.3-NIGHTLY-BaseOS]
2+
name=baseos
3+
baseurl=http://REPLACE_ME_HERE/rhel-10/nightly/RHEL-10/latest-RHEL-10.3/compose/BaseOS/REPLACE_ARCH_HERE/os/
4+
enabled=1
5+
gpgcheck=0
6+
[RHEL-10.3-NIGHTLY-AppStream]
7+
name=appstream
8+
baseurl=http://REPLACE_ME_HERE/rhel-10/nightly/RHEL-10/latest-RHEL-10.3/compose/AppStream/REPLACE_ARCH_HERE/os/
9+
enabled=1
10+
gpgcheck=0

‎tests/files/rhel-9-8.repo‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
[RHEL-9.8-NIGHTLY-BaseOS]
22
name=baseos
3-
baseurl=http://REPLACE_ME_HERE/rhel-9/nightly/RHEL-9/latest-RHEL-9.8.0/compose/BaseOS/x86_64/os/
3+
baseurl=http://REPLACE_ME_HERE/rhel-9/nightly/RHEL-9/latest-RHEL-9.8.0/compose/BaseOS/REPLACE_ARCH_HERE/os/
44
enabled=1
55
gpgcheck=0
66
[RHEL-9.8-NIGHTLY-AppStream]
77
name=appstream
8-
baseurl=http://REPLACE_ME_HERE/rhel-9/nightly/RHEL-9/latest-RHEL-9.8.0/compose/AppStream/x86_64/os/
8+
baseurl=http://REPLACE_ME_HERE/rhel-9/nightly/RHEL-9/latest-RHEL-9.8.0/compose/AppStream/REPLACE_ARCH_HERE/os/
99
enabled=1
1010
gpgcheck=0

0 commit comments

Comments
 (0)