Skip to content

Commit b07f634

Browse files
committed
test: some updates on test
1. add bootc swtich test 2. add bootc install to-disk test 3. cover more distros, like rhel 9.5, fedora 40 and 41(rawhide) Signed-off-by: Xiaofeng Wang <henrywangxf@me.com>
1 parent c9ad9af commit b07f634

20 files changed

+968
-169
lines changed

.github/workflows/integration.yml

Lines changed: 9 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ concurrency:
2020
cancel-in-progress: true
2121

2222
env:
23-
AWS_REGION: us-east-1
23+
AWS_REGION: us-west-2
2424

2525
jobs:
2626
pr-info:
@@ -57,14 +57,14 @@ jobs:
5757
ref: ${{ fromJson(steps.pr-api.outputs.data).head.ref }}
5858
repo_url: ${{ fromJson(steps.pr-api.outputs.data).head.repo.html_url }}
5959

60-
rhel94-integration:
60+
integration:
6161
needs: pr-info
6262
if: ${{ needs.pr-info.outputs.allowed_user == 'true' && !contains(github.event.pull_request.labels.*.name, 'control/skip-ci') }}
6363
continue-on-error: true
6464
strategy:
6565
matrix:
6666
arch: [x86_64, aarch64]
67-
platform: [aws]
67+
distro: [rhel-9-4, rhel-9-5, centos-stream-9, fedora-40, fedora-41]
6868
runs-on: ubuntu-latest
6969

7070
steps:
@@ -75,46 +75,17 @@ jobs:
7575
fetch-depth: 0
7676

7777
- name: Run the tests
78-
uses: sclorg/testing-farm-as-github-action@v1
78+
uses: sclorg/testing-farm-as-github-action@v2
7979
with:
80-
compose: CentOS-Stream-9
80+
compose: Fedora-40
8181
api_key: ${{ secrets.TF_API_KEY }}
8282
git_url: ${{ needs.pr-info.outputs.repo_url }}
8383
git_ref: ${{ needs.pr-info.outputs.ref }}
8484
arch: ${{ matrix.arch }}
85+
update_pull_request_status: true
86+
pull_request_status_name: "bootc-${{ matrix.distro }}-${{ matrix.arch }}"
8587
tmt_context: "arch=${{ matrix.arch }}"
86-
tmt_plan_regex: "${{ matrix.platform }}"
88+
tmt_plan_regex: "/install-upgrade/"
8789
tf_scope: private
8890
secrets: "QUAY_USERNAME=${{ secrets.QUAY_USERNAME }};QUAY_PASSWORD=${{ secrets.QUAY_PASSWORD }};QUAY_SECRET=${{ secrets.QUAY_SECRET }};RHEL_REGISTRY_URL=${{ secrets.RHEL_REGISTRY_URL }};DOWNLOAD_NODE=${{ secrets.DOWNLOAD_NODE }};AWS_ACCESS_KEY_ID=${{ secrets.AWS_ACCESS_KEY_ID }};AWS_SECRET_ACCESS_KEY=${{ secrets.AWS_SECRET_ACCESS_KEY }}"
89-
variables: "TEST_OS=rhel-9-4;PLATFORM=${{ matrix.platform }};ARCH=${{ matrix.arch }};AWS_REGION=${{ env.AWS_REGION }}"
90-
91-
cs9-dev-integration:
92-
needs: pr-info
93-
if: ${{ needs.pr-info.outputs.allowed_user == 'true' && !contains(github.event.pull_request.labels.*.name, 'control/skip-ci') }}
94-
continue-on-error: true
95-
strategy:
96-
matrix:
97-
arch: [x86_64, aarch64]
98-
platform: [aws]
99-
runs-on: ubuntu-latest
100-
101-
steps:
102-
- name: Clone repository
103-
uses: actions/checkout@v4
104-
with:
105-
ref: ${{ needs.pr-info.outputs.sha }}
106-
fetch-depth: 0
107-
108-
- name: Run the tests
109-
uses: sclorg/testing-farm-as-github-action@v1
110-
with:
111-
compose: CentOS-Stream-9
112-
api_key: ${{ secrets.TF_API_KEY }}
113-
git_url: ${{ needs.pr-info.outputs.repo_url }}
114-
git_ref: ${{ needs.pr-info.outputs.ref }}
115-
arch: ${{ matrix.arch }}
116-
tmt_context: "arch=${{ matrix.arch }}"
117-
tmt_plan_regex: "${{ matrix.platform }}"
118-
tf_scope: private
119-
secrets: "QUAY_USERNAME=${{ secrets.QUAY_USERNAME }};QUAY_PASSWORD=${{ secrets.QUAY_PASSWORD }};QUAY_SECRET=${{ secrets.QUAY_SECRET }};AWS_ACCESS_KEY_ID=${{ secrets.AWS_ACCESS_KEY_ID }};AWS_SECRET_ACCESS_KEY=${{ secrets.AWS_SECRET_ACCESS_KEY }}"
120-
variables: "TEST_OS=centos-stream-9;PLATFORM=${{ matrix.platform }};ARCH=${{ matrix.arch }};AWS_REGION=${{ env.AWS_REGION }}"
91+
variables: "TEST_OS=${{ matrix.distro }};ARCH=${{ matrix.arch }};AWS_REGION=${{ env.AWS_REGION }}"

plans/install-upgrade.fmf

Lines changed: 71 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,9 @@ prepare:
55
- how: install
66
package:
77
- ansible-core
8-
- gcc
98
- podman
109
- skopeo
1110
- jq
12-
- python3-devel
1311
- unzip
1412
- how: shell
1513
script: ansible-galaxy collection install https://ansible-collection.s3.amazonaws.com/ansible-posix-1.5.4.tar.gz https://ansible-collection.s3.amazonaws.com/community-general-8.5.0.tar.gz
@@ -18,7 +16,6 @@ execute:
1816

1917
/aws:
2018
summary: Run bootc install and upgrade test on aws
21-
tag: aws
2219
environment+:
2320
PLATFORM: aws
2421
discover+:
@@ -31,3 +28,74 @@ execute:
3128
prepare+:
3229
- how: shell
3330
script: curl "https://awscli.amazonaws.com/awscli-exe-linux-$(uname -m).zip" -o "awscliv2.zip" && unzip awscliv2.zip && sudo ./aws/install
31+
32+
/libvirt:
33+
summary: Run bootc install and upgrade test locally (nested)
34+
environment+:
35+
PLATFORM: libvirt
36+
AIR_GAPPED: 1
37+
discover+:
38+
test:
39+
- /rpm-build
40+
- /bootc-install-upgrade
41+
prepare+:
42+
- how: shell
43+
script: |
44+
source /etc/os-release
45+
if [[ "$ID" == "rhel" ]] || [[ "$ID" == "centos" ]]; then
46+
# EPEL for genisoimage
47+
dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm
48+
fi
49+
- how: install
50+
package:
51+
- qemu-kvm
52+
- libvirt
53+
- virt-install
54+
- genisoimage
55+
adjust+:
56+
- when: arch == ppc64le
57+
enabled: false
58+
- when: arch == x86_64 or arch == aarch64
59+
provision+:
60+
hardware:
61+
cpu:
62+
processors: ">= 2"
63+
memory: ">= 6 GB"
64+
virtualization:
65+
is-supported: true
66+
67+
/to-disk:
68+
summary: Use bootc install to-disk to generate raw image and test locally (nested)
69+
environment+:
70+
PLATFORM: libvirt
71+
IMAGE_TYPE: to-disk
72+
discover+:
73+
test:
74+
- /rpm-build
75+
- /image-install-upgrade
76+
prepare+:
77+
- how: shell
78+
script: |
79+
source /etc/os-release
80+
if [[ "$ID" == "rhel" ]] || [[ "$ID" == "centos" ]]; then
81+
# EPEL for genisoimage
82+
dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm
83+
fi
84+
- how: install
85+
package:
86+
- qemu-img
87+
- qemu-kvm
88+
- libvirt
89+
- virt-install
90+
- genisoimage
91+
adjust+:
92+
- when: arch == ppc64le
93+
enabled: false
94+
- when: arch == x86_64 or arch == aarch64
95+
provision+:
96+
hardware:
97+
cpu:
98+
processors: ">= 2"
99+
memory: ">= 6 GB"
100+
virtualization:
101+
is-supported: true

0 commit comments

Comments
 (0)