Skip to content

Commit 201a165

Browse files
committed
test: Update test to sync with Fedora CI gating
According to https://src.fedoraproject.org/rpms/bootc/pull-request/59# Signed-off-by: Xiaofeng Wang <[email protected]>
1 parent 563b7a0 commit 201a165

File tree

3 files changed

+5
-19
lines changed

3 files changed

+5
-19
lines changed

hack/Containerfile.packit

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,6 @@ cp test-artifacts.repo /etc/yum.repos.d/
2323
dnf -y update bootc
2424
./provision-derived.sh
2525

26-
if [[ "$GATING" == true ]]; then
27-
# Install Fedora CI/OSCI required packages for "Prepare dist-git sources" task
28-
dnf install -y rpm-build @buildsys-build 'dnf-command(builddep)'
29-
dnf builddep -y /var/share/test-artifacts/*.src.rpm
30-
fi
31-
3226
# For test-22-logically-bound-install
3327
cp -a lbi/usr/. /usr
3428
for x in curl.container curl-base.image podman.image; do

hack/provision-packit.sh

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -70,18 +70,6 @@ REPOEOF
7070
cp "${BOOTC_TEMPDIR}/rhel.repo" /etc/yum.repos.d
7171
fi
7272

73-
# Fedora CI: https://github.com/fedora-ci/dist-git-pipeline/blob/master/Jenkinsfile#L145
74-
# OSCI: https://gitlab.cee.redhat.com/osci-pipelines/dist-git-pipeline/-/blob/master/Jenkinsfile?ref_type=heads#L93
75-
if [[ -v KOJI_TASK_ID ]] || [[ -v CI_KOJI_TASK_ID ]]; then
76-
# Just left those ls commands here to ring the bell for me when something changed
77-
echo "$TMT_SOURCE_DIR"
78-
ls -al "$TMT_SOURCE_DIR"
79-
ls -al "$TMT_SOURCE_DIR/SRPMS"
80-
GATING="true"
81-
else
82-
GATING="false"
83-
fi
84-
8573
ls -al /etc/yum.repos.d
8674
cat /etc/yum.repos.d/test-artifacts.repo
8775
ls -al /var/share/test-artifacts
@@ -93,7 +81,7 @@ cp /etc/yum.repos.d/test-artifacts.repo "$BOOTC_TEMPDIR"
9381
ls -al "$BOOTC_TEMPDIR" "${BOOTC_TEMPDIR}/bin"
9482

9583
# Do not use just because it's only available on Fedora, not on CS and RHEL
96-
podman build --jobs=4 --from "$BASE" --build-arg GATING="$GATING" -v "$BOOTC_TEMPDIR":/bootc-test:z -t localhost/bootc-integration -f "${BOOTC_TEMPDIR}/Containerfile.packit" "$BOOTC_TEMPDIR"
84+
podman build --jobs=4 --from "$BASE" -v "$BOOTC_TEMPDIR":/bootc-test:z -t localhost/bootc-integration -f "${BOOTC_TEMPDIR}/Containerfile.packit" "$BOOTC_TEMPDIR"
9785

9886
# Keep these in sync with what's used in hack/lbi
9987
podman pull -q --retry 5 --retry-delay 5s quay.io/curl/curl:latest quay.io/curl/curl-base:latest registry.access.redhat.com/ubi9/podman:latest

tmt/plans/integration.fmf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ prepare:
55
# Install image mode system on package mode system
66
# Do not run on image mode VM running on Github CI and Locally
77
# Run on package mode VM running on Packit and Gating
8+
# order 9x means run it at the last job of prepare
89
- how: install
10+
order: 97
911
package:
1012
- podman
1113
- skopeo
@@ -17,6 +19,7 @@ prepare:
1719
- zstd
1820
when: running_env != image_mode
1921
- how: shell
22+
order: 98
2023
script:
2124
- mkdir -p bootc && cp /var/share/test-artifacts/*.src.rpm bootc
2225
- cd bootc && rpm2cpio *.src.rpm | cpio -idmv && rm -f *-vendor.tar.zstd && zstd -d *.tar.zstd && tar -xvf *.tar -C . --strip-components=1 && ls -al
@@ -25,6 +28,7 @@ prepare:
2528
# tmt-reboot and reboot do not work in this case
2629
# reboot in ansible is the only way to reboot in tmt prepare
2730
- how: ansible
31+
order: 99
2832
playbook:
2933
- https://github.com/bootc-dev/bootc/raw/refs/heads/main/hack/packit-reboot.yml
3034
when: running_env != image_mode

0 commit comments

Comments
 (0)