Skip to content

Commit 0a4b489

Browse files
author
Yi He
committed
ci: fix rhel 9.6 anaconda case failure
1 parent 64a0857 commit 0a4b489

File tree

3 files changed

+37
-25
lines changed

3 files changed

+37
-25
lines changed

.github/workflows/greenboot-ci.yaml

Lines changed: 19 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -61,28 +61,26 @@ jobs:
6161
variables: "ARCH=x86_64"
6262
timeout: 90
6363

64-
Fedora-rawhide-bootc:
65-
needs: check-pull-request
66-
if: ${{ needs.check-pull-request.outputs.allowed_user == 'true' }}
67-
continue-on-error: true
68-
runs-on: ubuntu-latest
64+
# Fedora-rawhide-bootc:
65+
# needs: check-pull-request
66+
# if: ${{ needs.check-pull-request.outputs.allowed_user == 'true' }}
67+
# continue-on-error: true
68+
# runs-on: ubuntu-latest
6969

70-
steps:
71-
- name: Run the tests
72-
uses: sclorg/[email protected]
73-
with:
74-
compose: Fedora-Rawhide
75-
api_key: ${{ secrets.TF_API_KEY }}
76-
git_url: ${{ needs.check-pull-request.outputs.repo_url }}
77-
git_ref: ${{ needs.check-pull-request.outputs.ref }}
78-
# update_pull_request_status: true
79-
# pull_request_status_name: "Fedora-Rawhide-bootc"
80-
tmt_context: "arch=x86_64;distro=fedora-rawhide"
81-
tmt_plan_regex: bootc
82-
tf_scope: private
83-
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 }}"
84-
variables: "ARCH=x86_64"
85-
timeout: 90
70+
# steps:
71+
# - name: Run the tests
72+
# uses: sclorg/[email protected]
73+
# with:
74+
# compose: Fedora-Rawhide
75+
# api_key: ${{ secrets.TF_API_KEY }}
76+
# git_url: ${{ needs.check-pull-request.outputs.repo_url }}
77+
# git_ref: ${{ needs.check-pull-request.outputs.ref }}
78+
# tmt_context: "arch=x86_64;distro=fedora-rawhide"
79+
# tmt_plan_regex: bootc
80+
# tf_scope: private
81+
# 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 }}"
82+
# variables: "ARCH=x86_64"
83+
# timeout: 90
8684

8785
Centos-stream-9-bootc:
8886
needs: check-pull-request
@@ -98,8 +96,6 @@ jobs:
9896
api_key: ${{ secrets.TF_API_KEY }}
9997
git_url: ${{ needs.check-pull-request.outputs.repo_url }}
10098
git_ref: ${{ needs.check-pull-request.outputs.ref }}
101-
# update_pull_request_status: true
102-
# pull_request_status_name: "Centos-stream-9-bootc"
10399
tmt_context: "arch=x86_64;distro=cs-9"
104100
tmt_plan_regex: bootc
105101
tf_scope: private
@@ -121,8 +117,6 @@ jobs:
121117
api_key: ${{ secrets.TF_API_KEY }}
122118
git_url: ${{ needs.check-pull-request.outputs.repo_url }}
123119
git_ref: ${{ needs.check-pull-request.outputs.ref }}
124-
# update_pull_request_status: true
125-
# pull_request_status_name: "Centos-stream-9-bootc"
126120
tmt_context: "arch=x86_64;distro=rhel-9-6"
127121
tmt_plan_regex: bootc
128122
tf_scope: private

tests/files/rhel-9-6.repo

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

tests/greenboot-bootc-anaconda-iso.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ case "${ID}-${VERSION_ID}" in
5555
BASE_IMAGE_URL="registry.stage.redhat.io/rhel9/rhel-bootc:9.6"
5656
BIB_URL="registry.stage.redhat.io/rhel9/bootc-image-builder:9.6"
5757
BOOT_ARGS="uefi"
58+
sed -i "s/REPLACE_ME_HERE/${DOWNLOAD_NODE}/g" files/rhel-9-6.repo
5859
;;
5960
*)
6061
echo "unsupported distro: ${ID}-${VERSION_ID}"
@@ -192,6 +193,13 @@ RUN dnf install -y \
192193
# Clean up by removing the local RPMs if desired
193194
RUN rm -f /tmp/greenboot-*.rpm
194195
EOF
196+
197+
if [[ "$ID" == "rhel" ]]; then
198+
tee -a Containerfile >> /dev/null << EOF
199+
COPY files/rhel-9-6.repo /etc/yum.repos.d/rhel-9-6.repo
200+
EOF
201+
fi
202+
195203
podman build --retry=5 --retry-delay=10s -t quay.io/${QUAY_USERNAME}/greenboot-bootc:${TEST_UUID} -f Containerfile .
196204
greenprint "Pushing greenboot-bootc container to quay.io"
197205
podman push quay.io/${QUAY_USERNAME}/greenboot-bootc:${TEST_UUID}

0 commit comments

Comments
 (0)