Update to 42

Tests: Do not count the number of executables
As the number of checks keeps changing, remove the need of updating the
value.

Resolves: rhbz#2011877

.gitignore

@@ -29,3 +29,4 @@
 /osbuild-composer-39.tar.gz
 /osbuild-composer-40.tar.gz
 /osbuild-composer-41.tar.gz
+/osbuild-composer-42.tar.gz

osbuild-composer.spec

@@ -4,7 +4,7 @@
 
 %global goipath         github.com/osbuild/osbuild-composer
 
-Version:        41
+Version:        42
 
 %gometa
 
@@ -82,12 +82,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 +95,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}
@@ -282,6 +265,9 @@ install -m 0644 -vp test/data/openshift/*                          %{buildroot}%
 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
@@ -446,6 +432,9 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
 %endif
 
 %changelog
+* 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
 

sources

@@ -1 +1 @@
-SHA512 (osbuild-composer-41.tar.gz) = 600dd4c3d55cb5cba30df67a663d8d511b1fc45f3065025592dc228872a80440fa8068faddd7c0692ee4ce0fd2cda4eb68e91f2663daee602b503f0ae16a6eb5
+SHA512 (osbuild-composer-42.tar.gz) = ff9f3e222c8de01b0383e03c30064fd43e12554b935963e2b3693167e341fd6872349de6d01b30e41deccb2cfa404fcc0e2421e8157fe0a54320bc1a75561db5

tests/scripts/run_tests.sh

@@ -17,9 +17,6 @@ cp $TOPDIR/repositories/* /usr/share/tests/osbuild-composer/repositories/
 mkdir /tmp/osbuild-composer-tests
 export WORKSPACE=/tmp/osbuild-composer-tests
 
-# Check that there are no new test executables.
-[ $(find /usr/libexec/tests/osbuild-composer/ -maxdepth 1 -type f | wc -l) -eq "23" ] || exit 5
-
 # In a perfect world, we should be able to run all test executables just by
 # iterating over them. Sadly, this is not possible, see the comments.
 /usr/libexec/tests/osbuild-composer/base_tests.sh