From 2bd1b277e8357a617ec23429c57c08f4c9e09e18 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 02 2021 10:36:09 +0000 Subject: import osbuild-composer-28.7-1.el8_4 --- diff --git a/.gitignore b/.gitignore index 5077426..af64c8b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/osbuild-composer-28.6.tar.gz +SOURCES/osbuild-composer-28.7.tar.gz diff --git a/.osbuild-composer.metadata b/.osbuild-composer.metadata index 68925a7..383eb10 100644 --- a/.osbuild-composer.metadata +++ b/.osbuild-composer.metadata @@ -1 +1 @@ -1f4e8612339d328ce758d3bc6eb61f7f9cb92d88 SOURCES/osbuild-composer-28.6.tar.gz +a075fc6b5f4da8621d3425d5aec9d15265afac2c SOURCES/osbuild-composer-28.7.tar.gz diff --git a/SOURCES/0001-Skip-libvirt-qcow2-uefi-test.patch b/SOURCES/0001-Skip-libvirt-qcow2-uefi-test.patch new file mode 100644 index 0000000..fbb59ec --- /dev/null +++ b/SOURCES/0001-Skip-libvirt-qcow2-uefi-test.patch @@ -0,0 +1,25 @@ +From d7f7f8f1f638c06ea5e02f0e092facfc079f50ff Mon Sep 17 00:00:00 2001 +From: Martin Sehnoutka +Date: Tue, 31 Aug 2021 15:14:07 +0200 +Subject: [PATCH] Skip libvirt qcow2 uefi test + +--- + test/cases/libvirt.sh | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/test/cases/libvirt.sh b/test/cases/libvirt.sh +index 7c6bd3ab..479bf5b3 100644 +--- a/test/cases/libvirt.sh ++++ b/test/cases/libvirt.sh +@@ -15,5 +15,7 @@ source /etc/os-release + # RHEL 8.4 and Centos Stream 8 images also supports uefi, check that + if [[ "${ID}-${VERSION_ID}" == "rhel-8.4" || "${ID}-${VERSION_ID}" == "centos-8" ]]; then + echo "🐄 Booting qcow2 image in UEFI mode on RHEL/Centos Stream" +- /usr/libexec/osbuild-composer-test/libvirt_test.sh qcow2 uefi ++ echo "Skipping because it causes issues in CI which doesn't support KVM" ++ # See this BZ for additional context: https://bugzilla.redhat.com/show_bug.cgi?id=1975242 ++ #/usr/libexec/osbuild-composer-test/libvirt_test.sh qcow2 uefi + fi +-- +2.21.1 (Apple Git-122.3) + diff --git a/SPECS/osbuild-composer.spec b/SPECS/osbuild-composer.spec index bd7cf37..7277f9d 100644 --- a/SPECS/osbuild-composer.spec +++ b/SPECS/osbuild-composer.spec @@ -4,7 +4,7 @@ %global goipath github.com/osbuild/osbuild-composer -Version: 28.6 +Version: 28.7 %gometa @@ -26,6 +26,7 @@ ExcludeArch: i686 License: ASL 2.0 URL: %{gourl} Source0: %{gosource} +Patch0: 0001-Skip-libvirt-qcow2-uefi-test.patch BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} @@ -55,6 +56,7 @@ BuildRequires: golang(github.com/gophercloud/gophercloud) BuildRequires: golang(github.com/stretchr/testify/assert) BuildRequires: golang(github.com/ubccr/kerby) BuildRequires: golang(github.com/vmware/govmomi) +BuildRequires: golang(gopkg.in/ini.v1) %endif Requires: %{name}-core = %{version}-%{release} @@ -179,8 +181,10 @@ install -m 0755 -vp _bin/osbuild-image-tests %{buildroot}%{_l install -m 0755 -vp _bin/osbuild-auth-tests %{buildroot}%{_libexecdir}/osbuild-composer-test/ install -m 0755 -vp _bin/osbuild-koji-tests %{buildroot}%{_libexecdir}/osbuild-composer-test/ install -m 0755 -vp _bin/cloud-cleaner %{buildroot}%{_libexecdir}/osbuild-composer-test/ +install -m 0755 -vp tools/define-compose-url.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/ install -m 0755 -vp tools/provision.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/ install -m 0755 -vp tools/gen-certs.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/ +install -m 0755 -vp tools/gen-ssh.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/ install -m 0755 -vp tools/image-info %{buildroot}%{_libexecdir}/osbuild-composer-test/ install -m 0755 -vp tools/run-koji-container.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/ install -m 0755 -vp tools/koji-compose.py %{buildroot}%{_libexecdir}/osbuild-composer-test/ @@ -267,8 +271,8 @@ The core osbuild-composer binary. This is suitable both for spawning in containe Summary: The worker for osbuild-composer Requires: systemd Requires: qemu-img -Requires: osbuild >= 27.2 -Requires: osbuild-ostree >= 27.2 +Requires: osbuild >= 27.3 +Requires: osbuild-ostree >= 27.3 # remove in F34 Obsoletes: golang-github-osbuild-composer-worker < %{version}-%{release} @@ -334,6 +338,7 @@ Requires: virt-install Requires: expect Requires: python3-lxml Requires: httpd +Requires: mod_ssl Requires: openssl Requires: podman-plugins %if 0%{?fedora} @@ -358,6 +363,9 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c %endif %changelog +* Wed Aug 25 2021 Martin Sehnoutka - 28.7-1 +- New upstream release (rhbz#1973034) + * Tue Apr 27 2021 Achilleas Koutsou - 28.6-1 - New upstream release (rhbz#1955094)