Commit b8032176 authored by Rocky Automation's avatar Rocky Automation 📺
Browse files

import osbuild-composer-33.2-1.el8

parent 1cb75b38
SOURCES/osbuild-composer-28.7.tar.gz
SOURCES/osbuild-composer-33.2.tar.gz
a075fc6b5f4da8621d3425d5aec9d15265afac2c SOURCES/osbuild-composer-28.7.tar.gz
81bb6510f5b066c9e963c1af119e15191d77d7c3 SOURCES/osbuild-composer-33.2.tar.gz
From 68d35eb7c218a03d2aab769f0a2df6bc2fd97c00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Budai?= <ondrej@budai.cz>
Date: Tue, 28 Sep 2021 10:07:32 +0200
Subject: [PATCH] fix image format
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Ondřej Budai <ondrej@budai.cz>
---
test/data/manifests/rhel_85-aarch64-qcow2-boot.json | 2 +-
test/data/manifests/rhel_85-aarch64-qcow2-customize.json | 2 +-
test/data/manifests/rhel_85-ppc64le-qcow2-boot.json | 2 +-
test/data/manifests/rhel_85-ppc64le-qcow2-customize.json | 2 +-
test/data/manifests/rhel_85-s390x-qcow2-boot.json | 2 +-
test/data/manifests/rhel_85-s390x-qcow2-customize.json | 2 +-
test/data/manifests/rhel_85-x86_64-qcow2-boot.json | 2 +-
test/data/manifests/rhel_85-x86_64-qcow2-customize.json | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/test/data/manifests/rhel_85-aarch64-qcow2-boot.json b/test/data/manifests/rhel_85-aarch64-qcow2-boot.json
index 83ceef02..3713d9f4 100644
--- a/test/data/manifests/rhel_85-aarch64-qcow2-boot.json
+++ b/test/data/manifests/rhel_85-aarch64-qcow2-boot.json
@@ -10421,7 +10421,7 @@
"::1 localhost localhost.localdomain localhost6 localhost6.localdomain6"
],
"image-format": {
- "compat": "1.1",
+ "compat": "0.10",
"type": "qcow2"
},
"locale": {
diff --git a/test/data/manifests/rhel_85-aarch64-qcow2-customize.json b/test/data/manifests/rhel_85-aarch64-qcow2-customize.json
index f0345e4d..d560127c 100644
--- a/test/data/manifests/rhel_85-aarch64-qcow2-customize.json
+++ b/test/data/manifests/rhel_85-aarch64-qcow2-customize.json
@@ -12845,7 +12845,7 @@
"::1 localhost localhost.localdomain localhost6 localhost6.localdomain6"
],
"image-format": {
- "compat": "1.1",
+ "compat": "0.10",
"type": "qcow2"
},
"keyboard": {
diff --git a/test/data/manifests/rhel_85-ppc64le-qcow2-boot.json b/test/data/manifests/rhel_85-ppc64le-qcow2-boot.json
index 09e71eab..d9fb34e1 100644
--- a/test/data/manifests/rhel_85-ppc64le-qcow2-boot.json
+++ b/test/data/manifests/rhel_85-ppc64le-qcow2-boot.json
@@ -11154,7 +11154,7 @@
"::1 localhost localhost.localdomain localhost6 localhost6.localdomain6"
],
"image-format": {
- "compat": "1.1",
+ "compat": "0.10",
"type": "qcow2"
},
"locale": {
diff --git a/test/data/manifests/rhel_85-ppc64le-qcow2-customize.json b/test/data/manifests/rhel_85-ppc64le-qcow2-customize.json
index cb98fec0..d91754d3 100644
--- a/test/data/manifests/rhel_85-ppc64le-qcow2-customize.json
+++ b/test/data/manifests/rhel_85-ppc64le-qcow2-customize.json
@@ -14011,7 +14011,7 @@
"::1 localhost localhost.localdomain localhost6 localhost6.localdomain6"
],
"image-format": {
- "compat": "1.1",
+ "compat": "0.10",
"type": "qcow2"
},
"keyboard": {
diff --git a/test/data/manifests/rhel_85-s390x-qcow2-boot.json b/test/data/manifests/rhel_85-s390x-qcow2-boot.json
index bda6729e..83d34b43 100644
--- a/test/data/manifests/rhel_85-s390x-qcow2-boot.json
+++ b/test/data/manifests/rhel_85-s390x-qcow2-boot.json
@@ -11859,7 +11859,7 @@
"::1 localhost localhost.localdomain localhost6 localhost6.localdomain6"
],
"image-format": {
- "compat": "1.1",
+ "compat": "0.10",
"type": "qcow2"
},
"locale": {
diff --git a/test/data/manifests/rhel_85-s390x-qcow2-customize.json b/test/data/manifests/rhel_85-s390x-qcow2-customize.json
index 0d28e11e..744d5964 100644
--- a/test/data/manifests/rhel_85-s390x-qcow2-customize.json
+++ b/test/data/manifests/rhel_85-s390x-qcow2-customize.json
@@ -14174,7 +14174,7 @@
"::1 localhost localhost.localdomain localhost6 localhost6.localdomain6"
],
"image-format": {
- "compat": "1.1",
+ "compat": "0.10",
"type": "qcow2"
},
"keyboard": {
diff --git a/test/data/manifests/rhel_85-x86_64-qcow2-boot.json b/test/data/manifests/rhel_85-x86_64-qcow2-boot.json
index ac1077ca..04c9139c 100644
--- a/test/data/manifests/rhel_85-x86_64-qcow2-boot.json
+++ b/test/data/manifests/rhel_85-x86_64-qcow2-boot.json
@@ -10603,7 +10603,7 @@
"::1 localhost localhost.localdomain localhost6 localhost6.localdomain6"
],
"image-format": {
- "compat": "1.1",
+ "compat": "0.10",
"type": "qcow2"
},
"locale": {
diff --git a/test/data/manifests/rhel_85-x86_64-qcow2-customize.json b/test/data/manifests/rhel_85-x86_64-qcow2-customize.json
index 88ee9075..b8ac87d2 100644
--- a/test/data/manifests/rhel_85-x86_64-qcow2-customize.json
+++ b/test/data/manifests/rhel_85-x86_64-qcow2-customize.json
@@ -13070,7 +13070,7 @@
"::1 localhost localhost.localdomain localhost6 localhost6.localdomain6"
],
"image-format": {
- "compat": "1.1",
+ "compat": "0.10",
"type": "qcow2"
},
"keyboard": {
--
2.32.0
This diff is collapsed.
......@@ -4,14 +4,16 @@
%global goipath github.com/osbuild/osbuild-composer
Version: 28.7
Version: 33.2
%gometa
%global common_description %{expand:
An image building service based on osbuild
It is inspired by lorax-composer and exposes the same API.
As such, it is a drop-in replacement.
A service for building customized OS artifacts, such as VM images and OSTree
commits, that uses osbuild under the hood. Besides building images for local
usage, it can also upload images directly to cloud.
It is compatible with composer-cli and cockpit-composer clients.
}
Name: osbuild-composer
......@@ -26,7 +28,8 @@ ExcludeArch: i686
License: ASL 2.0
URL: %{gourl}
Source0: %{gosource}
Patch0: 0001-Skip-libvirt-qcow2-uefi-test.patch
Patch0: 0000-fix-image-format.patch
Patch1: 0001-add-rhel-86-test-repositories.patch
BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
......@@ -46,6 +49,7 @@ 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/google/uuid)
BuildRequires: golang(github.com/jackc/pgx/v4)
BuildRequires: golang(github.com/julienschmidt/httprouter)
BuildRequires: golang(github.com/getkin/kin-openapi/openapi3)
BuildRequires: golang(github.com/kolo/xmlrpc)
......@@ -53,9 +57,11 @@ BuildRequires: golang(github.com/labstack/echo/v4)
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/stretchr/testify/assert)
BuildRequires: golang(github.com/ubccr/kerby)
BuildRequires: golang(github.com/vmware/govmomi)
BuildRequires: golang(cloud.google.com/go)
BuildRequires: golang(gopkg.in/ini.v1)
%endif
......@@ -93,20 +99,13 @@ Obsoletes: osbuild-composer-koji <= 23
%goprep
%endif
%if 0%{?fedora} && 0%{?fedora} <= 32
# Fedora 32 and older ships different kolo/xmlrpc and azure/azblob APIs. We
# cannot specify build tags in gobuild macro because the macro itself
# specifies build tags and -tags argument cannot be used more than once.
# Therefore, this ugly hack with build tags switcharoo is required.
# Remove when F32 is EOL.
# Remove the build constraint from the wrappers of the old APIs
sed -i "s$// +build kolo_xmlrpc_oldapi$// +build !kolo_xmlrpc_oldapi$" internal/upload/koji/xmlrpc-response-oldapi.go
sed -i "s$// +build azblob_oldapi$// +build !azblob_oldapi$" internal/upload/azure/page_blob_url_oldapi.go
# Add a build constraint to the wrappers of the new APIs
sed -i "s$// +build !kolo_xmlrpc_oldapi$// +build kolo_xmlrpc_oldapi$" internal/upload/koji/xmlrpc-response.go
sed -i "s$// +build !azblob_oldapi$// +build azblob_oldapi$" internal/upload/azure/page_blob_url.go
%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/openapi.gen.go
%endif
%build
......@@ -147,6 +146,7 @@ go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-weldr-te
go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-image-tests %{goipath}/cmd/osbuild-image-tests
go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-auth-tests %{goipath}/cmd/osbuild-auth-tests
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
%endif
......@@ -157,8 +157,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 +210,7 @@ install -m 0755 -vp _bin/osbuild-dnf-json-tests %{buildroot}%{_l
install -m 0755 -vp _bin/osbuild-image-tests %{buildroot}%{_libexecdir}/osbuild-composer-test/
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/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 tools/define-compose-url.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/
install -m 0755 -vp tools/provision.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/
......@@ -207,6 +238,9 @@ install -m 0644 -vp test/data/cloud-init/* %{buildroot}%{_d
install -m 0755 -vd %{buildroot}%{_datadir}/tests/osbuild-composer/composer
install -m 0644 -vp test/data/composer/* %{buildroot}%{_datadir}/tests/osbuild-composer/composer/
install -m 0755 -vd %{buildroot}%{_datadir}/tests/osbuild-composer/worker
install -m 0644 -vp test/data/worker/* %{buildroot}%{_datadir}/tests/osbuild-composer/worker/
install -m 0755 -vd %{buildroot}%{_datadir}/tests/osbuild-composer/repositories
install -m 0644 -vp test/data/repositories/* %{buildroot}%{_datadir}/tests/osbuild-composer/repositories/
......@@ -223,6 +257,12 @@ install -m 0644 -vp test/data/koji/* %{buildroot}%{_d
install -m 0755 -vd %{buildroot}%{_datadir}/tests/osbuild-composer/x509
install -m 0644 -vp test/data/x509/* %{buildroot}%{_datadir}/tests/osbuild-composer/x509/
install -m 0755 -vd %{buildroot}%{_datadir}/tests/osbuild-composer/openshift
install -m 0644 -vp test/data/openshift/* %{buildroot}%{_datadir}/tests/osbuild-composer/openshift/
install -m 0755 -vd %{buildroot}%{_datadir}/tests/osbuild-composer/schemas
install -m 0644 -vp internal/jobqueue/dbjobqueue/schemas/* %{buildroot}%{_datadir}/tests/osbuild-composer/schemas/
%endif
%check
......@@ -271,8 +311,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.3
Requires: osbuild-ostree >= 27.3
Requires: osbuild >= 30
Requires: osbuild-ostree >= 30
# remove in F34
Obsoletes: golang-github-osbuild-composer-worker < %{version}-%{release}
......@@ -309,7 +349,7 @@ Summary: Integration tests
Requires: %{name} = %{version}-%{release}
Requires: composer-cli
Requires: createrepo_c
Requires: genisoimage
Requires: xorriso
Requires: qemu-kvm-core
Requires: systemd-container
Requires: jq
......@@ -340,7 +380,13 @@ 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
%endif
Requires: dnf-plugins-core
Requires: skopeo
%if 0%{?fedora}
# koji and ansible are not in RHEL repositories. Depending on them breaks RHEL
# gating (see OSCI-1541). The test script must enable EPEL and install those
......@@ -363,25 +409,19 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
%endif
%changelog
* Wed Aug 25 2021 Martin Sehnoutka <msehnout@redhat.com> - 28.7-1
- New upstream release (rhbz#1973034)
* Tue Apr 27 2021 Achilleas Koutsou <achilleas@redhat.com> - 28.6-1
- New upstream release (rhbz#1955094)
* Fri Apr 23 2021 Achilleas Koutsou <achilleas@redhat.com> - 28.5-1
- New upstream release (rhbz#1951192)
* Tue Sep 28 2021 Ondřej Budai <ondrej@budai.cz> - 33.2-1
- New upstream release
* Fri Apr 09 2021 Ondrej Budai <obudai@redhat.com> - 28.4-1
* Wed Sep 15 2021 Ondřej Budai <ondrej@budai.cz> - 33.1-1
- New upstream release
* Mon Mar 22 2021 Ondrej Budai <obudai@redhat.com> - 28.3-1
* Mon Aug 30 2021 Tom Gundersen <teg@jklm.no> - 33-1
- New upstream release
* Thu Mar 18 2021 Ondrej Budai <obudai@redhat.com> - 28.2-1
* Sun Aug 29 2021 Tom Gundersen <teg@jklm.no> - 32-2
- New upstream release
* Wed Mar 17 2021 Ondrej Budai <obudai@redhat.com> - 28.1-1
* Thu Aug 12 2021 Ondřej Budai <ondrej@budai.cz> - 31-1
- New upstream release
* Sat Feb 20 2021 Martin Sehnoutka <msehnout@redhat.com> - 28-1
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment