import osbuild-composer-45-1.el9

.gitignore

@@ -1 +1 @@
-SOURCES/osbuild-composer-40.tar.gz
+SOURCES/osbuild-composer-45.tar.gz

.osbuild-composer.metadata

@@ -1 +1 @@
-7d5fe0ccb1502ae71f0332bc50d0f489c4e1d92d SOURCES/osbuild-composer-40.tar.gz
+47108ba5c6070459880624ec2ab065e110fc01f0 SOURCES/osbuild-composer-45.tar.gz

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:        40
+Version:        45
 
 %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
@@ -82,12 +88,6 @@ Conflicts: lorax-composer
 Obsoletes: lorax-composer < 34.3
 %endif
 
-# Remove when we stop releasing into Fedora 33
-%if 0%{?fedora} <= 33
-Obsoletes: golang-github-osbuild-composer < %{version}-%{release}
-Provides:  golang-github-osbuild-composer = %{version}-%{release}
-%endif
-
 # remove when F34 is EOL
 Obsoletes: osbuild-composer-koji <= 23
 
@@ -101,17 +101,6 @@ Obsoletes: osbuild-composer-koji <= 23
 %goprep
 %endif
 
-%if 0%{?fedora} >= 34
-# Fedora 34 and newer ships a newer version of github.com/getkin/kin-openapi
-# package which has a different API than the older ones. Let's make the auto-
-# generated code compatible by applying some sed magic.
-#
-# Remove when F33 is EOL
-sed -i "s/openapi3.Swagger/openapi3.T/;s/openapi3.NewSwaggerLoader().LoadSwaggerFromData/openapi3.NewLoader().LoadFromData/" internal/cloudapi/v1/openapi.v1.gen.go
-sed -i "s/openapi3.Swagger/openapi3.T/;s/openapi3.NewSwaggerLoader().LoadSwaggerFromData/openapi3.NewLoader().LoadFromData/" internal/cloudapi/v2/openapi.v2.gen.go
-sed -i "s/openapi3.Swagger/openapi3.T/;s/openapi3.NewSwaggerLoader().LoadSwaggerFromData/openapi3.NewLoader().LoadFromData/" internal/worker/api/api.gen.go
-%endif
-
 %build
 export GOFLAGS="-buildmode=pie"
 %if 0%{?rhel}
@@ -236,8 +225,10 @@ install -m 0755 -vp tools/gen-ssh.sh                            %{buildroot}%{_l
 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/
 install -m 0755 -vd                                                %{buildroot}%{_libexecdir}/tests/osbuild-composer
 install -m 0755 -vp test/cases/*                                   %{buildroot}%{_libexecdir}/tests/osbuild-composer/
 
@@ -281,6 +272,9 @@ install -m 0644 -vp test/data/openshift/*                       %{buildroot}%{_d
 install -m 0755 -vd                                                %{buildroot}%{_datadir}/tests/osbuild-composer/schemas
 install -m 0644 -vp internal/jobqueue/dbjobqueue/schemas/*         %{buildroot}%{_datadir}/tests/osbuild-composer/schemas/
 
+install -m 0755 -vd                                               %{buildroot}%{_datadir}/tests/osbuild-composer/upgrade8to9
+install -m 0644 -vp test/data/upgrade8to9/*                       %{buildroot}%{_datadir}/tests/osbuild-composer/upgrade8to9/
+
 %endif
 
 %check
@@ -375,12 +369,18 @@ The dnf-json binary used by osbuild-composer and the workers.
 
 %files dnf-json
 %{_libexecdir}/osbuild-composer/dnf-json
+%{_unitdir}/osbuild-dnf-json.service
+%{_unitdir}/osbuild-dnf-json.socket
 
 %if %{with tests} || 0%{?rhel}
 
 %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
@@ -408,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
@@ -443,6 +444,21 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
 %endif
 
 %changelog
+* Fri Feb 18 2022 Ondřej Budai <ondrej@budai.cz> - 45-1
+- New upstream release
+
+* Fri Feb 11 2022 Thomas Lavocat <tlavocat@redhat.com> - 44-1
+- New upstream release
+
+* Wed Jan 26 2022 Thomas Lavocat <tlavocat@redhat.com> - 43-1
+- New upstream release
+
+* Wed Jan 12 2022 Thomas Lavocat <tlavocat@redhat.com> - 42-1
+- New upstream release
+
+* Wed Dec 22 2021 Ondřej Budai <ondrej@budai.cz> - 41-1
+- New upstream release
+
 * Thu Dec 09 2021 Ondřej Budai <ondrej@budai.cz> - 40-1
 - New upstream release