Update to 36

Resolves: rhbz#2002999
Resolves: rhbz#2008928
Resolves: rhbz#2006253

.gitignore

@@ -23,3 +23,4 @@
 /osbuild-composer-31.tar.gz
 /osbuild-composer-32.tar.gz
 /osbuild-composer-33.tar.gz
+/osbuild-composer-36.tar.gz

osbuild-composer.spec

@@ -4,7 +4,7 @@
 
 %global goipath         github.com/osbuild/osbuild-composer
 
-Version:        33
+Version:        36
 
 %gometa
 
@@ -20,9 +20,8 @@ Name:           osbuild-composer
 Release:        1%{?dist}
 Summary:        An image building service based on osbuild
 
-# osbuild-composer doesn't have support for building i686 images
+# osbuild-composer doesn't have support for building i686 and armv7hl images
-# and also RHEL and Fedora has now only limited support for this arch.
+ExcludeArch:    i686 armv7hl
-ExcludeArch:    i686
 
 # Upstream license specification: Apache-2.0
 License:        ASL 2.0
@@ -46,6 +45,7 @@ BuildRequires:  golang(github.com/coreos/go-semver/semver)
 BuildRequires:  golang(github.com/coreos/go-systemd/activation)
 BuildRequires:  golang(github.com/deepmap/oapi-codegen/pkg/codegen)
 BuildRequires:  golang(github.com/go-chi/chi)
+BuildRequires:  golang(github.com/golang-jwt/jwt)
 BuildRequires:  golang(github.com/google/uuid)
 BuildRequires:  golang(github.com/jackc/pgx/v4)
 BuildRequires:  golang(github.com/julienschmidt/httprouter)
@@ -56,6 +56,8 @@ BuildRequires:  golang(github.com/gobwas/glob)
 BuildRequires:  golang(github.com/google/go-cmp/cmp)
 BuildRequires:  golang(github.com/gophercloud/gophercloud)
 BuildRequires:  golang(github.com/prometheus/client_golang/prometheus/promhttp)
+BuildRequires:  golang(github.com/openshift-online/ocm-sdk-go)
+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)
@@ -80,9 +82,11 @@ Conflicts: lorax-composer
 Obsoletes: lorax-composer < 34.3
 %endif
 
-# remove in F34
+# 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
@@ -103,7 +107,9 @@ Obsoletes: osbuild-composer-koji <= 23
 # 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/openapi.gen.go
+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
@@ -118,6 +124,14 @@ export GOPATH=$GO_BUILD_PATH:%{gopath}
 export GOFLAGS=-mod=vendor
 %endif
 
+# Set the commit hash so that composer can report what source version
+# was used to build it. This has to be set explicitly when calling rpmbuild,
+# this script will not attempt to automatically discover it.
+%if %{?commit:1}0
+export LDFLAGS="${LDFLAGS} -X 'github.com/osbuild/osbuild-composer/internal/common.GitRev=%{commit}'"
+%endif
+export LDFLAGS="${LDFLAGS} -X 'github.com/osbuild/osbuild-composer/internal/common.RpmVersion=%{name}-%{epoch}:%{version}-%{release}.%{_arch}'"
+
 %gobuild -o _bin/osbuild-composer %{goipath}/cmd/osbuild-composer
 %gobuild -o _bin/osbuild-worker %{goipath}/cmd/osbuild-worker
 
@@ -146,6 +160,7 @@ go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-auth-tes
 go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-koji-tests %{goipath}/cmd/osbuild-koji-tests
 go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-composer-dbjobqueue-tests %{goipath}/cmd/osbuild-composer-dbjobqueue-tests
 go build -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/cloud-cleaner %{goipath}/cmd/cloud-cleaner
+go build -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-mock-openid-provider %{goipath}/cmd/osbuild-mock-openid-provider
 
 %endif
 
@@ -155,8 +170,38 @@ install -m 0755 -vp _bin/osbuild-composer                       %{buildroot}%{_l
 install -m 0755 -vp _bin/osbuild-worker                         %{buildroot}%{_libexecdir}/osbuild-composer/
 install -m 0755 -vp dnf-json                                    %{buildroot}%{_libexecdir}/osbuild-composer/
 
+# Only include repositories for the distribution and release
 install -m 0755 -vd                                             %{buildroot}%{_datadir}/osbuild-composer/repositories
-install -m 0644 -vp repositories/*                              %{buildroot}%{_datadir}/osbuild-composer/repositories/
+# CentOS also defines rhel so we check for centos first
+%if 0%{?centos}
+
+# CentOS 9 supports building for CentOS 8 and later
+%if 0%{?centos} >= 9
+install -m 0644 -vp repositories/centos-*                       %{buildroot}%{_datadir}/osbuild-composer/repositories/
+%else
+# CentOS 8 only supports building for CentOS 8
+install -m 0644 -vp repositories/centos-%{centos}*              %{buildroot}%{_datadir}/osbuild-composer/repositories/
+install -m 0644 -vp repositories/centos-stream-%{centos}*       %{buildroot}%{_datadir}/osbuild-composer/repositories/
+
+%endif
+%else
+%if 0%{?rhel}
+# RHEL 9 supports building for RHEL 8 and later
+%if 0%{?rhel} >= 9
+install -m 0644 -vp repositories/rhel-*                         %{buildroot}%{_datadir}/osbuild-composer/repositories/
+
+%else
+# RHEL 8 only supports building for 8
+install -m 0644 -vp repositories/rhel-%{rhel}*                  %{buildroot}%{_datadir}/osbuild-composer/repositories/
+
+%endif
+%endif
+%endif
+
+# Fedora can build for all included fedora releases
+%if 0%{?fedora}
+install -m 0644 -vp repositories/fedora-*                       %{buildroot}%{_datadir}/osbuild-composer/repositories/
+%endif
 
 install -m 0755 -vd                                             %{buildroot}%{_unitdir}
 install -m 0644 -vp distribution/*.{service,socket}             %{buildroot}%{_unitdir}/
@@ -180,6 +225,7 @@ install -m 0755 -vp _bin/osbuild-auth-tests                     %{buildroot}%{_l
 install -m 0755 -vp _bin/osbuild-koji-tests                     %{buildroot}%{_libexecdir}/osbuild-composer-test/
 install -m 0755 -vp _bin/osbuild-composer-dbjobqueue-tests      %{buildroot}%{_libexecdir}/osbuild-composer-test/
 install -m 0755 -vp _bin/cloud-cleaner                          %{buildroot}%{_libexecdir}/osbuild-composer-test/
+install -m 0755 -vp _bin/osbuild-mock-openid-provider           %{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/
@@ -188,6 +234,7 @@ install -m 0755 -vp tools/image-info                            %{buildroot}%{_l
 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/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 -vd                                             %{buildroot}%{_libexecdir}/tests/osbuild-composer
 install -m 0755 -vp test/cases/*                                %{buildroot}%{_libexecdir}/tests/osbuild-composer/
 
@@ -266,21 +313,22 @@ cd $PWD/_build/src/%{goipath}
 
 %package core
 Summary:    The core osbuild-composer binary
+Requires:   %{name}-dnf-json = %{version}-%{release}
 
 %description core
 The core osbuild-composer binary. This is suitable both for spawning in containers and by systemd.
 
 %files core
 %{_libexecdir}/osbuild-composer/osbuild-composer
-%{_libexecdir}/osbuild-composer/dnf-json
 %{_datadir}/osbuild-composer/
 
 %package worker
 Summary:    The worker for osbuild-composer
 Requires:   systemd
 Requires:   qemu-img
-Requires:   osbuild >= 30
+Requires:   osbuild >= 37
-Requires:   osbuild-ostree >= 30
+Requires:   osbuild-ostree >= 37
+Requires:   %{name}-dnf-json = %{version}-%{release}
 
 # remove in F34
 Obsoletes: golang-github-osbuild-composer-worker < %{version}-%{release}
@@ -310,6 +358,15 @@ systemctl stop "osbuild-worker@*.service" "osbuild-remote-worker@*.service"
 # restart all the worker services
 %systemd_postun_with_restart "osbuild-worker@*.service" "osbuild-remote-worker@*.service"
 
+%package dnf-json
+Summary: The dnf-json binary used by osbuild-composer and the workers
+
+%description dnf-json
+The dnf-json binary used by osbuild-composer and the workers.
+
+%files dnf-json
+%{_libexecdir}/osbuild-composer/dnf-json
+
 %if %{with tests} || 0%{?rhel}
 
 %package tests
@@ -348,6 +405,7 @@ Requires:   python3-lxml
 Requires:   httpd
 Requires:   mod_ssl
 Requires:   openssl
+Requires:   firewalld
 # see https://bugzilla.redhat.com/show_bug.cgi?id=1986333
 %if 0%{?rhel} && 0%{?rhel} != 9
 Requires:   podman-plugins
@@ -376,6 +434,9 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
 %endif
 
 %changelog
+* Thu Oct 14 2021 Achilleas Koutsou <achilleas@redhat.com> - 36-1
+- New upstream release
+
 * Mon Aug 30 2021 Tom Gundersen <teg@jklm.no> - 33-1
 - New upstream release
 

sources

@@ -1 +1 @@
-SHA512 (osbuild-composer-33.tar.gz) = 6df738d560d35be59f2fe05b315de03afe3718087cd3a07d531a50fa4b74639be861dfa63ed8332d99ae30159a1cbf0950867d3890bdb4aa3635d169d4694651
+SHA512 (osbuild-composer-36.tar.gz) = ce3e8c3f9cbb074712fc48c35860bff5e6ec8740597aa29d016ad8de2beae7046987d4a74148c7419a05334358518ba13d43d6259569659f57baefb3bb611814