Compare commits

...

No commits in common. "c9-beta" and "c9s-update-bootc-1-4" have entirely different histories.

9 changed files with 113 additions and 105 deletions

View File

@ -1,2 +0,0 @@
9ca5bceee40bd840b691c0a8024b2b6a916c36e7 SOURCES/bootc-1.8.0-vendor.tar.zstd
b97adc7d411b192030dddea89366e2d6ebc5c7c2 SOURCES/bootc-1.8.0.tar.zstd

1
.fmf/version Normal file
View File

@ -0,0 +1 @@
1

44
.gitignore vendored
View File

@ -1,2 +1,42 @@
SOURCES/bootc-1.8.0-vendor.tar.zstd
SOURCES/bootc-1.8.0.tar.zstd
/bootc-0.1.4.tar.zstd
/bootc-0.1.4-vendor.tar.zstd
/bootc-0.1.5.tar.zstd
/bootc-0.1.5-vendor.tar.zstd
/bootc-0.1.6-vendor.tar.zstd
/bootc-0.1.6.tar.zstd
/bootc-0.1.7-vendor.tar.zstd
/bootc-0.1.7.tar.zstd
/bootc-0.1.8.tar.zstd
/bootc-0.1.8-vendor.tar.zstd
/bootc-0.1.9.tar.zstd
/bootc-0.1.9-vendor.tar.zstd
/bootc-0.1.10-vendor.tar.zstd
/bootc-0.1.10.tar.zstd
/bootc-0.1.11.tar.zstd
/bootc-0.1.11-vendor.tar.zstd
/bootc-0.1.12.tar.zstd
/bootc-0.1.12-vendor.tar.zstd
/bootc-0.1.13.tar.zstd
/bootc-0.1.13-vendor.tar.zstd
/bootc-0.1.14-vendor.tar.zstd
/bootc-0.1.14.tar.zstd
/bootc-0.1.15.tar.zstd
/bootc-0.1.15-vendor.tar.zstd
/bootc-0.1.16.tar.zstd
/bootc-0.1.16-vendor.tar.zstd
/bootc-1.1.0.tar.zstd
/bootc-1.1.0-vendor.tar.zstd
/bootc-1.1.2.tar.zstd
/bootc-1.1.2-vendor.tar.zstd
/bootc-1.1.4.tar.zstd
/bootc-1.1.4-vendor.tar.zstd
/bootc-1.1.5.tar.zstd
/bootc-1.1.5-vendor.tar.zstd
/bootc-1.1.6-vendor.tar.zstd
/bootc-1.1.6.tar.zstd
/bootc-1.1.7.tar.zstd
/bootc-1.1.7-vendor.tar.zstd
/bootc-1.3.0.tar.zstd
/bootc-1.3.0-vendor.tar.zstd
/bootc-1.4.0.tar.zstd
/bootc-1.4.0-vendor.tar.zstd

View File

@ -1,65 +0,0 @@
diff --git i/tmt/tests/bootc-install-provision.sh w/tmt/tests/bootc-install-provision.sh
index c4c884b..29df30c 100755
--- i/tmt/tests/bootc-install-provision.sh
+++ w/tmt/tests/bootc-install-provision.sh
@@ -4,6 +4,8 @@ set -exuo pipefail
BOOTC_TEMPDIR=$(mktemp -d)
trap 'rm -rf -- "$BOOTC_TEMPDIR"' EXIT
+ARCH=$(uname -m)
+
# LBI only enabled for test-22-logically-bound-install
LBI="${LBI:-disabled}"
@@ -16,6 +18,28 @@ case "$ID" in
"fedora")
TIER1_IMAGE_URL="${TIER1_IMAGE_URL:-quay.io/fedora/fedora-bootc:${VERSION_ID}}"
;;
+ "rhel")
+ TIER1_IMAGE_URL="${TIER1_IMAGE_URL:-images.paas.redhat.com/bootc/rhel-bootc:latest-${VERSION_ID}}"
+
+ CURRENT_COMPOSE_ID=$(skopeo inspect --no-tags --retry-times=5 --tls-verify=false "docker://${TIER1_IMAGE_URL}" | jq -r '.Labels."redhat.compose-id"')
+
+ if [[ -n ${CURRENT_COMPOSE_ID} ]]; then
+ if [[ ${CURRENT_COMPOSE_ID} == *-updates-* ]]; then
+ BATCH_COMPOSE="updates/"
+ else
+ BATCH_COMPOSE=""
+ fi
+ else
+ BATCH_COMPOSE="updates/"
+ CURRENT_COMPOSE_ID=latest-RHEL-$VERSION_ID
+ fi
+
+ # use latest compose if specific compose is not accessible
+ RC=$(curl -skIw '%{http_code}' -o /dev/null "http://download.eng.bos.redhat.com/rhel-${VERSION_ID%%.*}/nightly/${BATCH_COMPOSE}RHEL-${VERSION_ID%%.*}/${CURRENT_COMPOSE_ID}/STATUS")
+ if [[ $RC != "200" ]]; then
+ CURRENT_COMPOSE_ID=latest-RHEL-${VERSION_ID%%}
+ fi
+ ;;
esac
if [ "$TMT_REBOOT_COUNT" -eq 0 ]; then
@@ -93,6 +117,22 @@ COMMONEOF
tee "$FEDORA_CI_CONTAINERFILE" > /dev/null << FEDORACIEOF
FROM $TIER1_IMAGE_URL
+RUN <<REPORUN
+tee "/etc/yum.repos.d/rhel.repo" >/dev/null <<RHELREPOEOF
+[rhel-baseos]
+name=baseos
+baseurl=http://download.eng.bos.redhat.com/rhel-${VERSION_ID%%.*}/nightly/${BATCH_COMPOSE}RHEL-${VERSION_ID%%.*}/${CURRENT_COMPOSE_ID}/compose/BaseOS/${ARCH}/os/
+enabled=1
+gpgcheck=0
+
+[rhel-appstream]
+name=appstream
+baseurl=http://download.eng.bos.redhat.com/rhel-${VERSION_ID%%.*}/nightly/${BATCH_COMPOSE}RHEL-${VERSION_ID%%.*}/${CURRENT_COMPOSE_ID}/compose/AppStream/${ARCH}/os/
+enabled=1
+gpgcheck=0
+RHELREPOEOF
+REPORUN
+
RUN dnf -y upgrade /rpms/*.rpm
FEDORACIEOF
cat >"$CONTAINERFILE" <<REALEOF

View File

@ -1,14 +0,0 @@
diff --git i/tmt/tests/bootc-install-provision.sh w/tmt/tests/bootc-install-provision.sh
index 6c9968c..c617d5e 100755
--- i/tmt/tests/bootc-install-provision.sh
+++ w/tmt/tests/bootc-install-provision.sh
@@ -50,7 +50,8 @@ if [ "$TMT_REBOOT_COUNT" -eq 0 ]; then
fi
# Some rhts-*, rstrnt-* and tmt-* commands are in /usr/local/bin
- cp -r /usr/local/bin "$BOOTC_TEMPDIR"
+ cp -r /var/lib/tmt/scripts "$BOOTC_TEMPDIR/bin"
+ ls -al "$BOOTC_TEMPDIR/bin"
# Check image building folder content
ls -al "$BOOTC_TEMPDIR"

View File

@ -12,8 +12,8 @@
%endif
Name: bootc
Version: 1.8.0
Release: 2%{?dist}
Version: 1.4.0
Release: 1%{?dist}
Summary: Bootable container system
# Apache-2.0
@ -29,11 +29,6 @@ URL: https://github.com/containers/bootc
Source0: %{url}/releases/download/v%{version}/bootc-%{version}.tar.zstd
Source1: %{url}/releases/download/v%{version}/bootc-%{version}-vendor.tar.zstd
# Don't remove, downstream patch only
# Patch for integration test RHEL 9.x and 10.x support
Patch0: 0000-bootc-inistall-provision.patch
Patch1: 0001-bootc-inistall-provision.patch
# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
ExcludeArch: %{ix86}
@ -153,21 +148,6 @@ chmod +x %{?buildroot}/%{system_reinstall_bootc_install_podman_path}
%{system_reinstall_bootc_install_podman_path}
%changelog
* Fri Sep 05 2025 Colin Walters <walters@verbum.org> - 1.8.0-2
- Update to 1.8.0
* Tue Aug 26 2025 Joseph Marrero <jmarrero@fedoraproject.org> - 1.7.1-1
- Update to 1.7.1
- Resolves: #RHEL-111339
* Thu Aug 21 2025 Joseph Marrero <jmarrero@fedoraproject.org> - 1.7.0-1
- Update to 1.7.0
- Resolves: #RHEL-109555
* Fri Jul 22 2025 Gursewak Mangat <gurssing@redhat.com> - 1.5.1-1
- Update to 1.5.1
- Resolves: #RHEL-104335
* Fri Jul 11 2025 Gursewak Mangat <gurssing@redhat.com> - 1.4.0-1
- Update to 1.4.0
- Resolves: #RHEL-103125

17
gating.yaml Normal file
View File

@ -0,0 +1,17 @@
--- !Policy
product_versions:
- fedora-*
decision_contexts:
- bodhi_update_push_stable
- bodhi_update_push_testing
subject_type: koji_build
rules:
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
--- !Policy
product_versions:
- rhel-9
- rhel-10
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

49
plans/all.fmf Normal file
View File

@ -0,0 +1,49 @@
discover:
how: fmf
dist-git-source: true
dist-git-install-builddeps: true
prepare:
- how: install
package:
- podman
- skopeo
- jq
execute:
how: tmt
/test-01-readonly:
summary: Execute booted readonly/nondestructive tests
discover+:
test:
- /tmt/tests/bootc-install-provision
- test-01-readonly
/test-20-local-upgrade:
summary: Execute local upgrade tests
discover+:
test:
- /tmt/tests/bootc-install-provision
- test-20-local-upgrade
/test-21-logically-bound-switch:
summary: Execute logically bound images tests for switching images
discover+:
test:
- /tmt/tests/bootc-install-provision
- test-21-logically-bound-switch
/test-22-logically-bound-install:
summary: Execute logically bound images tests for switching images
environment+:
LBI: enabled
discover+:
test:
- /tmt/tests/bootc-install-provision
- test-22-logically-bound-install
/test-23-install-outside-container:
summary: Execute tests for installing outside of a container
discover+:
test:
- /tmt/tests/bootc-install-provision
- test-23-install-outside-container

2
sources Normal file
View File

@ -0,0 +1,2 @@
SHA512 (bootc-1.4.0.tar.zstd) = fe31cbdd08560bad3e333cee73b56eff2c2ea81a846932cbaa2f607d95d2f3b5104ece9232d64290672909aa6aac8754c0e61a993e91db42e7b128635da62c9a
SHA512 (bootc-1.4.0-vendor.tar.zstd) = cf462ef87fcc16bdd9d32d5b561504ab7ff233e0a9a3b683b50d47494ef19c78948870e274f6571092ce770d9e8c7c470100e9a4dc961645e67790a868ba1d5c