Compare commits
No commits in common. "imports/c8s/osbuild-composer-38-1.el8" and "c8" have entirely different histories.
imports/c8
...
c8
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
|||||||
SOURCES/osbuild-composer-38.tar.gz
|
SOURCES/osbuild-composer-101.tar.gz
|
||||||
|
@ -1 +1 @@
|
|||||||
9698cbcd423729cdb5cbf41148cbc137fb030254 SOURCES/osbuild-composer-38.tar.gz
|
0feb86b5dcd146ce5b87816ae482eb50ed507c16 SOURCES/osbuild-composer-101.tar.gz
|
||||||
|
@ -2,9 +2,17 @@
|
|||||||
# Pass --with tests to rpmbuild to override
|
# Pass --with tests to rpmbuild to override
|
||||||
%bcond_with tests
|
%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
|
||||||
|
|
||||||
|
# The minimum required osbuild version
|
||||||
|
%global min_osbuild_version 109
|
||||||
|
|
||||||
%global goipath github.com/osbuild/osbuild-composer
|
%global goipath github.com/osbuild/osbuild-composer
|
||||||
|
|
||||||
Version: 38
|
Version: 101
|
||||||
|
|
||||||
%gometa
|
%gometa
|
||||||
|
|
||||||
@ -24,7 +32,7 @@ Summary: An image building service based on osbuild
|
|||||||
ExcludeArch: i686 armv7hl
|
ExcludeArch: i686 armv7hl
|
||||||
|
|
||||||
# Upstream license specification: Apache-2.0
|
# Upstream license specification: Apache-2.0
|
||||||
License: ASL 2.0
|
License: Apache-2.0
|
||||||
URL: %{gourl}
|
URL: %{gourl}
|
||||||
Source0: %{gosource}
|
Source0: %{gosource}
|
||||||
|
|
||||||
@ -34,35 +42,19 @@ BuildRequires: systemd
|
|||||||
BuildRequires: krb5-devel
|
BuildRequires: krb5-devel
|
||||||
BuildRequires: python3-docutils
|
BuildRequires: python3-docutils
|
||||||
BuildRequires: make
|
BuildRequires: make
|
||||||
|
# Build requirements of 'theproglottis/gpgme' package
|
||||||
|
BuildRequires: gpgme-devel
|
||||||
|
BuildRequires: libassuan-devel
|
||||||
|
# Build requirements of 'github.com/containers/storage' package
|
||||||
|
BuildRequires: device-mapper-devel
|
||||||
%if 0%{?fedora}
|
%if 0%{?fedora}
|
||||||
BuildRequires: systemd-rpm-macros
|
BuildRequires: systemd-rpm-macros
|
||||||
BuildRequires: git
|
BuildRequires: git
|
||||||
BuildRequires: golang(github.com/aws/aws-sdk-go)
|
# Build requirements of 'github.com/containers/storage' package
|
||||||
BuildRequires: golang(github.com/Azure/azure-sdk-for-go)
|
BuildRequires: btrfs-progs-devel
|
||||||
BuildRequires: golang(github.com/Azure/azure-storage-blob-go/azblob)
|
# DO NOT REMOVE the BUNDLE_START and BUNDLE_END markers as they are used by 'tools/rpm_spec_add_provides_bundle.sh' to generate the Provides: bundled list
|
||||||
BuildRequires: golang(github.com/BurntSushi/toml)
|
# BUNDLE_START
|
||||||
BuildRequires: golang(github.com/coreos/go-semver/semver)
|
# BUNDLE_END
|
||||||
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)
|
|
||||||
BuildRequires: golang(github.com/getkin/kin-openapi/openapi3)
|
|
||||||
BuildRequires: golang(github.com/kolo/xmlrpc)
|
|
||||||
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/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)
|
|
||||||
BuildRequires: golang(cloud.google.com/go)
|
|
||||||
BuildRequires: golang(gopkg.in/ini.v1)
|
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
Requires: %{name}-core = %{version}-%{release}
|
Requires: %{name}-core = %{version}-%{release}
|
||||||
@ -71,26 +63,6 @@ Requires: systemd
|
|||||||
|
|
||||||
Provides: weldr
|
Provides: weldr
|
||||||
|
|
||||||
%if 0%{?rhel}
|
|
||||||
Obsoletes: lorax-composer <= 29
|
|
||||||
Conflicts: lorax-composer
|
|
||||||
%endif
|
|
||||||
|
|
||||||
# Remove when we stop releasing into Fedora 35
|
|
||||||
%if 0%{?fedora} >= 34
|
|
||||||
# lorax 34.3 is the first one without the composer subpackage
|
|
||||||
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
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
%{common_description}
|
%{common_description}
|
||||||
|
|
||||||
@ -98,21 +70,11 @@ Obsoletes: osbuild-composer-koji <= 23
|
|||||||
%if 0%{?rhel}
|
%if 0%{?rhel}
|
||||||
%forgeautosetup -p1
|
%forgeautosetup -p1
|
||||||
%else
|
%else
|
||||||
%goprep
|
%goprep -k
|
||||||
%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
|
%endif
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
export GOFLAGS="-buildmode=pie"
|
||||||
%if 0%{?rhel}
|
%if 0%{?rhel}
|
||||||
GO_BUILD_PATH=$PWD/_build
|
GO_BUILD_PATH=$PWD/_build
|
||||||
install -m 0755 -vd $(dirname $GO_BUILD_PATH/src/%{goipath})
|
install -m 0755 -vd $(dirname $GO_BUILD_PATH/src/%{goipath})
|
||||||
@ -121,7 +83,17 @@ cd $GO_BUILD_PATH/src/%{goipath}
|
|||||||
install -m 0755 -vd _bin
|
install -m 0755 -vd _bin
|
||||||
export PATH=$PWD/_bin${PATH:+:$PATH}
|
export PATH=$PWD/_bin${PATH:+:$PATH}
|
||||||
export GOPATH=$GO_BUILD_PATH:%{gopath}
|
export GOPATH=$GO_BUILD_PATH:%{gopath}
|
||||||
export GOFLAGS=-mod=vendor
|
export GOFLAGS+=" -mod=vendor"
|
||||||
|
%endif
|
||||||
|
%if 0%{?fedora}
|
||||||
|
# Fedora disables Go modules by default, but we want to use them.
|
||||||
|
# Undefine the macro which disables it to use the default behavior.
|
||||||
|
%undefine gomodulesmode
|
||||||
|
%endif
|
||||||
|
|
||||||
|
# btrfs-progs-devel is not available on RHEL
|
||||||
|
%if 0%{?rhel}
|
||||||
|
GOTAGS="exclude_graphdriver_btrfs"
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# Set the commit hash so that composer can report what source version
|
# Set the commit hash so that composer can report what source version
|
||||||
@ -130,10 +102,12 @@ export GOFLAGS=-mod=vendor
|
|||||||
%if %{?commit:1}0
|
%if %{?commit:1}0
|
||||||
export LDFLAGS="${LDFLAGS} -X 'github.com/osbuild/osbuild-composer/internal/common.GitRev=%{commit}'"
|
export LDFLAGS="${LDFLAGS} -X 'github.com/osbuild/osbuild-composer/internal/common.GitRev=%{commit}'"
|
||||||
%endif
|
%endif
|
||||||
export LDFLAGS="${LDFLAGS} -X 'github.com/osbuild/osbuild-composer/internal/common.RpmVersion=%{name}-%{epoch}:%{version}-%{release}.%{_arch}'"
|
export LDFLAGS="${LDFLAGS} -X 'github.com/osbuild/osbuild-composer/internal/common.RpmVersion=%{name}-%{?epoch:%epoch:}%{version}-%{release}.%{_arch}'"
|
||||||
|
|
||||||
%gobuild -o _bin/osbuild-composer %{goipath}/cmd/osbuild-composer
|
%gobuild ${GOTAGS:+-tags=$GOTAGS} -o _bin/osbuild-composer %{goipath}/cmd/osbuild-composer
|
||||||
%gobuild -o _bin/osbuild-worker %{goipath}/cmd/osbuild-worker
|
%gobuild ${GOTAGS:+-tags=$GOTAGS} -o _bin/osbuild-worker %{goipath}/cmd/osbuild-worker
|
||||||
|
%gobuild ${GOTAGS:+-tags=$GOTAGS} -o _bin/osbuild-jobsite-manager %{goipath}/cmd/osbuild-jobsite-manager
|
||||||
|
%gobuild ${GOTAGS:+-tags=$GOTAGS} -o _bin/osbuild-jobsite-builder %{goipath}/cmd/osbuild-jobsite-builder
|
||||||
|
|
||||||
make man
|
make man
|
||||||
|
|
||||||
@ -152,15 +126,15 @@ export GOPATH=%{gobuilddir}:%{gopath}
|
|||||||
|
|
||||||
TEST_LDFLAGS="${LDFLAGS:-} -B 0x$(od -N 20 -An -tx1 -w100 /dev/urandom | tr -d ' ')"
|
TEST_LDFLAGS="${LDFLAGS:-} -B 0x$(od -N 20 -An -tx1 -w100 /dev/urandom | tr -d ' ')"
|
||||||
|
|
||||||
go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-composer-cli-tests %{goipath}/cmd/osbuild-composer-cli-tests
|
go test -c -tags="integration${GOTAGS:+,$GOTAGS}" -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-composer-cli-tests %{goipath}/cmd/osbuild-composer-cli-tests
|
||||||
go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-dnf-json-tests %{goipath}/cmd/osbuild-dnf-json-tests
|
go test -c -tags="integration${GOTAGS:+,$GOTAGS}" -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-dnf-json-tests %{goipath}/cmd/osbuild-dnf-json-tests
|
||||||
go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-weldr-tests %{goipath}/internal/client/
|
go test -c -tags="integration${GOTAGS:+,$GOTAGS}" -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-weldr-tests %{goipath}/internal/client/
|
||||||
go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-image-tests %{goipath}/cmd/osbuild-image-tests
|
go test -c -tags="integration${GOTAGS:+,$GOTAGS}" -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${GOTAGS:+,$GOTAGS}" -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${GOTAGS:+,$GOTAGS}" -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 test -c -tags="integration${GOTAGS:+,$GOTAGS}" -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 test -c -tags="integration${GOTAGS:+,$GOTAGS}" -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-service-maintenance-tests %{goipath}/cmd/osbuild-service-maintenance
|
||||||
go build -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-mock-openid-provider %{goipath}/cmd/osbuild-mock-openid-provider
|
go build -tags="integration${GOTAGS:+,$GOTAGS}" -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-mock-openid-provider %{goipath}/cmd/osbuild-mock-openid-provider
|
||||||
|
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
@ -168,7 +142,8 @@ go build -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-mock-openi
|
|||||||
install -m 0755 -vd %{buildroot}%{_libexecdir}/osbuild-composer
|
install -m 0755 -vd %{buildroot}%{_libexecdir}/osbuild-composer
|
||||||
install -m 0755 -vp _bin/osbuild-composer %{buildroot}%{_libexecdir}/osbuild-composer/
|
install -m 0755 -vp _bin/osbuild-composer %{buildroot}%{_libexecdir}/osbuild-composer/
|
||||||
install -m 0755 -vp _bin/osbuild-worker %{buildroot}%{_libexecdir}/osbuild-composer/
|
install -m 0755 -vp _bin/osbuild-worker %{buildroot}%{_libexecdir}/osbuild-composer/
|
||||||
install -m 0755 -vp dnf-json %{buildroot}%{_libexecdir}/osbuild-composer/
|
install -m 0755 -vp _bin/osbuild-jobsite-manager %{buildroot}%{_libexecdir}/osbuild-composer/
|
||||||
|
install -m 0755 -vp _bin/osbuild-jobsite-builder %{buildroot}%{_libexecdir}/osbuild-composer/
|
||||||
|
|
||||||
# Only include repositories for the distribution and release
|
# Only include repositories for the distribution and release
|
||||||
install -m 0755 -vd %{buildroot}%{_datadir}/osbuild-composer/repositories
|
install -m 0755 -vd %{buildroot}%{_datadir}/osbuild-composer/repositories
|
||||||
@ -224,7 +199,7 @@ install -m 0755 -vp _bin/osbuild-image-tests %{buildroot}%{_l
|
|||||||
install -m 0755 -vp _bin/osbuild-auth-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-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/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-service-maintenance-tests %{buildroot}%{_libexecdir}/osbuild-composer-test/
|
||||||
install -m 0755 -vp _bin/osbuild-mock-openid-provider %{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/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/provision.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/
|
||||||
@ -234,9 +209,19 @@ 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/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.py %{buildroot}%{_libexecdir}/osbuild-composer-test/
|
||||||
install -m 0755 -vp tools/libvirt_test.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/
|
install -m 0755 -vp tools/libvirt_test.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/
|
||||||
|
install -m 0755 -vp tools/s3_test.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/
|
||||||
|
install -m 0755 -vp tools/generic_s3_test.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/
|
||||||
|
install -m 0755 -vp tools/generic_s3_https_test.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/
|
||||||
|
install -m 0755 -vp tools/run-mock-auth-servers.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/set-env-variables.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/
|
||||||
install -m 0755 -vd %{buildroot}%{_libexecdir}/tests/osbuild-composer
|
install -m 0755 -vd %{buildroot}%{_libexecdir}/tests/osbuild-composer
|
||||||
install -m 0755 -vp test/cases/* %{buildroot}%{_libexecdir}/tests/osbuild-composer/
|
install -m 0755 -vp test/cases/*.sh %{buildroot}%{_libexecdir}/tests/osbuild-composer/
|
||||||
|
|
||||||
|
install -m 0755 -vd %{buildroot}%{_libexecdir}/tests/osbuild-composer/api
|
||||||
|
install -m 0755 -vp test/cases/api/*.sh %{buildroot}%{_libexecdir}/tests/osbuild-composer/api/
|
||||||
|
|
||||||
|
install -m 0755 -vd %{buildroot}%{_libexecdir}/tests/osbuild-composer/api/common
|
||||||
|
install -m 0755 -vp test/cases/api/common/*.sh %{buildroot}%{_libexecdir}/tests/osbuild-composer/api/common/
|
||||||
|
|
||||||
install -m 0755 -vd %{buildroot}%{_datadir}/tests/osbuild-composer/ansible
|
install -m 0755 -vd %{buildroot}%{_datadir}/tests/osbuild-composer/ansible
|
||||||
install -m 0644 -vp test/data/ansible/* %{buildroot}%{_datadir}/tests/osbuild-composer/ansible/
|
install -m 0644 -vp test/data/ansible/* %{buildroot}%{_datadir}/tests/osbuild-composer/ansible/
|
||||||
@ -272,17 +257,18 @@ install -m 0644 -vp test/data/koji/* %{buildroot}%{_d
|
|||||||
install -m 0755 -vd %{buildroot}%{_datadir}/tests/osbuild-composer/x509
|
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 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 0755 -vd %{buildroot}%{_datadir}/tests/osbuild-composer/schemas
|
||||||
install -m 0644 -vp internal/jobqueue/dbjobqueue/schemas/* %{buildroot}%{_datadir}/tests/osbuild-composer/schemas/
|
install -m 0644 -vp pkg/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
|
%endif
|
||||||
|
|
||||||
%check
|
%check
|
||||||
|
export GOFLAGS="-buildmode=pie"
|
||||||
%if 0%{?rhel}
|
%if 0%{?rhel}
|
||||||
export GOFLAGS=-mod=vendor
|
export GOFLAGS+=" -mod=vendor -tags=exclude_graphdriver_btrfs"
|
||||||
export GOPATH=$PWD/_build:%{gopath}
|
export GOPATH=$PWD/_build:%{gopath}
|
||||||
# cd inside GOPATH, otherwise go with GO111MODULE=off ignores vendor directory
|
# cd inside GOPATH, otherwise go with GO111MODULE=off ignores vendor directory
|
||||||
cd $PWD/_build/src/%{goipath}
|
cd $PWD/_build/src/%{goipath}
|
||||||
@ -292,13 +278,13 @@ cd $PWD/_build/src/%{goipath}
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%post
|
%post
|
||||||
%systemd_post osbuild-composer.service osbuild-composer.socket osbuild-composer-api.socket osbuild-remote-worker.socket
|
%systemd_post osbuild-composer.service osbuild-composer.socket osbuild-composer-api.socket osbuild-composer-prometheus.socket osbuild-remote-worker.socket
|
||||||
|
|
||||||
%preun
|
%preun
|
||||||
%systemd_preun osbuild-composer.service osbuild-composer.socket osbuild-composer-api.socket osbuild-remote-worker.socket
|
%systemd_preun osbuild-composer.service osbuild-composer.socket osbuild-composer-api.socket osbuild-composer-prometheus.socket osbuild-remote-worker.socket
|
||||||
|
|
||||||
%postun
|
%postun
|
||||||
%systemd_postun_with_restart osbuild-composer.service osbuild-composer.socket osbuild-composer-api.socket osbuild-remote-worker.socket
|
%systemd_postun_with_restart osbuild-composer.service osbuild-composer.socket osbuild-composer-api.socket osbuild-composer-prometheus.socket osbuild-remote-worker.socket
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%license LICENSE
|
%license LICENSE
|
||||||
@ -307,13 +293,16 @@ cd $PWD/_build/src/%{goipath}
|
|||||||
%{_unitdir}/osbuild-composer.service
|
%{_unitdir}/osbuild-composer.service
|
||||||
%{_unitdir}/osbuild-composer.socket
|
%{_unitdir}/osbuild-composer.socket
|
||||||
%{_unitdir}/osbuild-composer-api.socket
|
%{_unitdir}/osbuild-composer-api.socket
|
||||||
|
%{_unitdir}/osbuild-composer-prometheus.socket
|
||||||
%{_unitdir}/osbuild-local-worker.socket
|
%{_unitdir}/osbuild-local-worker.socket
|
||||||
%{_unitdir}/osbuild-remote-worker.socket
|
%{_unitdir}/osbuild-remote-worker.socket
|
||||||
%{_sysusersdir}/osbuild-composer.conf
|
%{_sysusersdir}/osbuild-composer.conf
|
||||||
|
|
||||||
%package core
|
%package core
|
||||||
Summary: The core osbuild-composer binary
|
Summary: The core osbuild-composer binary
|
||||||
Requires: %{name}-dnf-json = %{version}-%{release}
|
Requires: osbuild-depsolve-dnf >= %{min_osbuild_version}
|
||||||
|
Provides: %{name}-dnf-json = %{version}-%{release}
|
||||||
|
Obsoletes: %{name}-dnf-json < %{version}-%{release}
|
||||||
|
|
||||||
%description core
|
%description core
|
||||||
The core osbuild-composer binary. This is suitable both for spawning in containers and by systemd.
|
The core osbuild-composer binary. This is suitable both for spawning in containers and by systemd.
|
||||||
@ -326,19 +315,21 @@ The core osbuild-composer binary. This is suitable both for spawning in containe
|
|||||||
Summary: The worker for osbuild-composer
|
Summary: The worker for osbuild-composer
|
||||||
Requires: systemd
|
Requires: systemd
|
||||||
Requires: qemu-img
|
Requires: qemu-img
|
||||||
Requires: osbuild >= 37
|
Requires: osbuild >= %{min_osbuild_version}
|
||||||
Requires: osbuild-ostree >= 37
|
Requires: osbuild-ostree >= %{min_osbuild_version}
|
||||||
Requires: %{name}-dnf-json = %{version}-%{release}
|
Requires: osbuild-lvm2 >= %{min_osbuild_version}
|
||||||
|
Requires: osbuild-luks2 >= %{min_osbuild_version}
|
||||||
# remove in F34
|
Requires: osbuild-depsolve-dnf >= %{min_osbuild_version}
|
||||||
Obsoletes: golang-github-osbuild-composer-worker < %{version}-%{release}
|
Provides: %{name}-dnf-json = %{version}-%{release}
|
||||||
Provides: golang-github-osbuild-composer-worker = %{version}-%{release}
|
Obsoletes: %{name}-dnf-json < %{version}-%{release}
|
||||||
|
|
||||||
%description worker
|
%description worker
|
||||||
The worker for osbuild-composer
|
The worker for osbuild-composer
|
||||||
|
|
||||||
%files worker
|
%files worker
|
||||||
%{_libexecdir}/osbuild-composer/osbuild-worker
|
%{_libexecdir}/osbuild-composer/osbuild-worker
|
||||||
|
%{_libexecdir}/osbuild-composer/osbuild-jobsite-manager
|
||||||
|
%{_libexecdir}/osbuild-composer/osbuild-jobsite-builder
|
||||||
%{_unitdir}/osbuild-worker@.service
|
%{_unitdir}/osbuild-worker@.service
|
||||||
%{_unitdir}/osbuild-remote-worker@.service
|
%{_unitdir}/osbuild-remote-worker@.service
|
||||||
|
|
||||||
@ -348,36 +339,27 @@ The worker for osbuild-composer
|
|||||||
%preun worker
|
%preun worker
|
||||||
# systemd_preun uses systemctl disable --now which doesn't work well with template services.
|
# systemd_preun uses systemctl disable --now which doesn't work well with template services.
|
||||||
# See https://github.com/systemd/systemd/issues/15620
|
# See https://github.com/systemd/systemd/issues/15620
|
||||||
# The following lines mimicks its behaviour by running two commands:
|
# The following lines mimicks its behaviour by running two commands.
|
||||||
if [ -d /run/systemd/system ]; then
|
# The scriptlet is supposed to run only when the package is being removed.
|
||||||
|
if [ $1 -eq 0 ] && [ -d /run/systemd/system ]; then
|
||||||
# disable and stop all the worker services
|
# disable and stop all the worker services
|
||||||
systemctl --no-reload disable osbuild-worker@.service osbuild-remote-worker@.service
|
systemctl --no-reload disable osbuild-worker@.service osbuild-remote-worker@.service
|
||||||
systemctl stop "osbuild-worker@*.service" "osbuild-remote-worker@*.service"
|
systemctl stop "osbuild-worker@*.service" "osbuild-remote-worker@*.service"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
%postun worker
|
%postun worker
|
||||||
# restart all the worker services
|
# restart all the worker services
|
||||||
%systemd_postun_with_restart "osbuild-worker@*.service" "osbuild-remote-worker@*.service"
|
%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
|
|
||||||
|
|
||||||
# Conflicts with older versions of composer that provide the same files
|
|
||||||
# this can be removed when RHEL 8 and Fedora 35 reach EOL
|
|
||||||
Conflicts: osbuild-composer <= 35
|
|
||||||
|
|
||||||
%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}
|
%if %{with tests} || 0%{?rhel}
|
||||||
|
|
||||||
%package tests
|
%package tests
|
||||||
Summary: Integration tests
|
Summary: Integration tests
|
||||||
|
%if %{with relax_requires}
|
||||||
|
Requires: %{name}
|
||||||
|
%else
|
||||||
Requires: %{name} = %{version}-%{release}
|
Requires: %{name} = %{version}-%{release}
|
||||||
|
%endif
|
||||||
Requires: composer-cli
|
Requires: composer-cli
|
||||||
Requires: createrepo_c
|
Requires: createrepo_c
|
||||||
Requires: xorriso
|
Requires: xorriso
|
||||||
@ -405,6 +387,7 @@ Requires: libvirt-daemon-driver-storage-disk
|
|||||||
Requires: libvirt-daemon-kvm
|
Requires: libvirt-daemon-kvm
|
||||||
Requires: qemu-img
|
Requires: qemu-img
|
||||||
Requires: qemu-kvm
|
Requires: qemu-kvm
|
||||||
|
Requires: rpmdevtools
|
||||||
Requires: virt-install
|
Requires: virt-install
|
||||||
Requires: expect
|
Requires: expect
|
||||||
Requires: python3-lxml
|
Requires: python3-lxml
|
||||||
@ -412,12 +395,11 @@ Requires: httpd
|
|||||||
Requires: mod_ssl
|
Requires: mod_ssl
|
||||||
Requires: openssl
|
Requires: openssl
|
||||||
Requires: firewalld
|
Requires: firewalld
|
||||||
# see https://bugzilla.redhat.com/show_bug.cgi?id=1986333
|
|
||||||
%if 0%{?rhel} && 0%{?rhel} != 9
|
|
||||||
Requires: podman-plugins
|
Requires: podman-plugins
|
||||||
%endif
|
|
||||||
Requires: dnf-plugins-core
|
Requires: dnf-plugins-core
|
||||||
Requires: skopeo
|
Requires: skopeo
|
||||||
|
Requires: make
|
||||||
|
Requires: python3-pip
|
||||||
%if 0%{?fedora}
|
%if 0%{?fedora}
|
||||||
# koji and ansible are not in RHEL repositories. Depending on them breaks RHEL
|
# 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
|
# gating (see OSCI-1541). The test script must enable EPEL and install those
|
||||||
@ -440,6 +422,141 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Feb 26 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 101-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Wed Feb 07 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 100-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Wed Jan 24 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 99-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Wed Jan 10 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 98-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Wed Dec 13 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 96-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Wed Nov 29 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 95-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Wed Nov 15 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 94-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Wed Nov 01 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 93-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Wed Oct 18 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 92-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Wed Oct 04 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 91-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Thu Sep 21 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 90-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Wed Sep 06 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 89-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Thu Aug 24 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 88-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Wed Aug 09 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 87-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Wed Jul 26 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 86-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Fri Jul 14 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 85-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Wed Jun 14 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 84-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Wed May 17 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 82-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Wed Apr 19 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 80-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Wed Apr 05 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 79-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Wed Mar 08 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 77-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Wed Feb 22 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 75-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Wed Feb 08 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 74-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Wed Jan 25 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 73-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Wed Jan 11 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 72-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Wed Dec 28 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 71-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Wed Dec 14 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 70-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Wed Nov 30 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 69-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Wed Nov 16 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 68-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Wed Nov 02 2022 imagebuilder-bots+imagebuilder-bot@redhat.com <imagebuilder-bot> - 67-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Mon Aug 29 2022 Ondřej Budai <ondrej@budai.cz> - 62-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Wed Aug 24 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 60-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Thu Aug 11 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 59-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Thu Jul 28 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 58-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Mon Jul 18 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 57-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Wed Jun 15 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 55-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Wed Jun 01 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 54-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Mon May 23 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 53-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Wed May 04 2022 Ondřej Budai <ondrej@budai.cz> - 51-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Tue Mar 01 2022 Ondřej Budai <ondrej@budai.cz> - 46-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Sat Feb 19 2022 Ondřej Budai <ondrej@budai.cz> - 45-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Mon Feb 14 2022 Thomas Lavocat <tlavocat@redhat.com> - 44-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Mon Feb 07 2022 Thomas Lavocat <tlavocat@redhat.com> - 43-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Tue Jan 18 2022 Thomas Lavocat <tlavocat@redhat.com> - 42-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Thu Dec 09 2021 Ondřej Budai <ondrej@budai.cz> - 40-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
* Fri Oct 15 2021 Achilleas Koutsou <achilleas@redhat.com> - 37-1
|
* Fri Oct 15 2021 Achilleas Koutsou <achilleas@redhat.com> - 37-1
|
||||||
- New upstream release
|
- New upstream release
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user