diff --git a/.gitignore b/.gitignore index a25c8af..eebdc0c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/osbuild-composer-43.tar.gz +SOURCES/osbuild-composer-44.tar.gz diff --git a/.osbuild-composer.metadata b/.osbuild-composer.metadata index 9bd5185..2d2f075 100644 --- a/.osbuild-composer.metadata +++ b/.osbuild-composer.metadata @@ -1 +1 @@ -8a14a75cd9d557ff9a4526a40b3744d41632de3a SOURCES/osbuild-composer-43.tar.gz +0265ce158f4190a1226d590133d603223bfc40d4 SOURCES/osbuild-composer-44.tar.gz diff --git a/SPECS/osbuild-composer.spec b/SPECS/osbuild-composer.spec index abc6e1d..261a8dc 100644 --- a/SPECS/osbuild-composer.spec +++ b/SPECS/osbuild-composer.spec @@ -2,9 +2,14 @@ # Pass --with tests to rpmbuild to override %bcond_with tests +# When --with relax_requires is specified osbuild-composer-tests +# will require osbuild-composer only by name, excluding version/release +# This is used internally during nightly pipeline testing! +%bcond_with relax_requires + %global goipath github.com/osbuild/osbuild-composer -Version: 43 +Version: 44 %gometa @@ -61,6 +66,7 @@ BuildRequires: golang(github.com/segmentio/ksuid) BuildRequires: golang(github.com/stretchr/testify/assert) BuildRequires: golang(github.com/ubccr/kerby) BuildRequires: golang(github.com/vmware/govmomi) +BuildRequires: golang(github.com/oracle/oci-go-sdk/v54) BuildRequires: golang(cloud.google.com/go) BuildRequires: golang(gopkg.in/ini.v1) %endif @@ -219,6 +225,7 @@ install -m 0755 -vp tools/gen-ssh.sh %{buildroot}% 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/ +install -m 0755 -vp tools/koji-compose-v2.py %{buildroot}%{_libexecdir}/osbuild-composer-test/ install -m 0755 -vp tools/libvirt_test.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/ install -m 0755 -vp tools/set-env-variables.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/ install -m 0755 -vp tools/test-case-generators/generate-test-cases %{buildroot}%{_libexecdir}/osbuild-composer-test/ @@ -369,7 +376,11 @@ The dnf-json binary used by osbuild-composer and the workers. %package tests Summary: Integration tests +%if %{with relax_requires} +Requires: %{name} +%else Requires: %{name} = %{version}-%{release} +%endif Requires: composer-cli Requires: createrepo_c Requires: xorriso @@ -397,6 +408,7 @@ Requires: libvirt-daemon-driver-storage-disk Requires: libvirt-daemon-kvm Requires: qemu-img Requires: qemu-kvm +Requires: rpmdevtools Requires: virt-install Requires: expect Requires: python3-lxml @@ -432,6 +444,9 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c %endif %changelog +* Mon Feb 14 2022 Thomas Lavocat - 44-1 +- New upstream release + * Mon Feb 07 2022 Thomas Lavocat - 43-1 - New upstream release