forked from rpms/osbuild-composer
Merge branch 'c8' into a8
This commit is contained in:
eabdullin
Stepan Oksanichenko
commit
ce6870bc23
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
|||||||
SOURCES/osbuild-composer-46.3.tar.gz
|
SOURCES/osbuild-composer-62.tar.gz
|
||||||
|
|||||||
@ -1 +1 @@
|
|||||||
705a76eb84367b62d4ba6c8448bda83d5f9ce100 SOURCES/osbuild-composer-46.3.tar.gz
|
507b6d1c7dd00aafb3fc3988d7a1f61be10a0c03 SOURCES/osbuild-composer-62.tar.gz
|
||||||
|
|||||||
@ -9,7 +9,7 @@
|
|||||||
|
|
||||||
%global goipath github.com/osbuild/osbuild-composer
|
%global goipath github.com/osbuild/osbuild-composer
|
||||||
|
|
||||||
Version: 46.3
|
Version: 62
|
||||||
|
|
||||||
%gometa
|
%gometa
|
||||||
|
|
||||||
@ -39,36 +39,15 @@ 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
|
||||||
%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)
|
# 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/Azure/azure-sdk-for-go)
|
# BUNDLE_START
|
||||||
BuildRequires: golang(github.com/Azure/azure-storage-blob-go/azblob)
|
# BUNDLE_END
|
||||||
BuildRequires: golang(github.com/BurntSushi/toml)
|
|
||||||
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)
|
|
||||||
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(github.com/oracle/oci-go-sdk/v54)
|
|
||||||
BuildRequires: golang(cloud.google.com/go)
|
|
||||||
BuildRequires: golang(gopkg.in/ini.v1)
|
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
Requires: %{name}-core = %{version}-%{release}
|
Requires: %{name}-core = %{version}-%{release}
|
||||||
@ -88,9 +67,6 @@ Conflicts: lorax-composer
|
|||||||
Obsoletes: lorax-composer < 34.3
|
Obsoletes: lorax-composer < 34.3
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# remove when F34 is EOL
|
|
||||||
Obsoletes: osbuild-composer-koji <= 23
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
%{common_description}
|
%{common_description}
|
||||||
|
|
||||||
@ -98,7 +74,7 @@ Obsoletes: osbuild-composer-koji <= 23
|
|||||||
%if 0%{?rhel}
|
%if 0%{?rhel}
|
||||||
%forgeautosetup -p1
|
%forgeautosetup -p1
|
||||||
%else
|
%else
|
||||||
%goprep
|
%goprep -k
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%build
|
%build
|
||||||
@ -150,7 +126,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-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 -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-composer-dbjobqueue-tests %{goipath}/cmd/osbuild-composer-dbjobqueue-tests
|
||||||
go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-composer-manifest-tests %{goipath}/cmd/osbuild-composer-manifest-tests
|
go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-composer-manifest-tests %{goipath}/cmd/osbuild-composer-manifest-tests
|
||||||
go build -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/cloud-cleaner %{goipath}/cmd/cloud-cleaner
|
go test -c -tags=integration -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 -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-mock-openid-provider %{goipath}/cmd/osbuild-mock-openid-provider
|
||||||
|
|
||||||
%endif
|
%endif
|
||||||
@ -200,7 +176,7 @@ install -m 0755 -vp _bin/osbuild-auth-tests %{buildroot}%
|
|||||||
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/osbuild-composer-manifest-tests %{buildroot}%{_libexecdir}/osbuild-composer-test/
|
install -m 0755 -vp _bin/osbuild-composer-manifest-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/
|
||||||
@ -209,12 +185,21 @@ install -m 0755 -vp tools/gen-ssh.sh %{buildroot}%
|
|||||||
install -m 0755 -vp tools/image-info %{buildroot}%{_libexecdir}/osbuild-composer-test/
|
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/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/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/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 -vp tools/test-case-generators/generate-test-cases %{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 -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/
|
||||||
@ -254,7 +239,7 @@ install -m 0755 -vd %{buildroot}%
|
|||||||
install -m 0644 -vp test/data/openshift/* %{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 0755 -vd %{buildroot}%{_datadir}/tests/osbuild-composer/upgrade8to9
|
||||||
install -m 0644 -vp test/data/upgrade8to9/* %{buildroot}%{_datadir}/tests/osbuild-composer/upgrade8to9/
|
install -m 0644 -vp test/data/upgrade8to9/* %{buildroot}%{_datadir}/tests/osbuild-composer/upgrade8to9/
|
||||||
@ -308,16 +293,12 @@ 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 >= 49
|
Requires: osbuild >= 63
|
||||||
Requires: osbuild-ostree >= 49
|
Requires: osbuild-ostree >= 63
|
||||||
Requires: osbuild-lvm2 >= 49
|
Requires: osbuild-lvm2 >= 63
|
||||||
Requires: osbuild-luks2 >= 49
|
Requires: osbuild-luks2 >= 63
|
||||||
Requires: %{name}-dnf-json = %{version}-%{release}
|
Requires: %{name}-dnf-json = %{version}-%{release}
|
||||||
|
|
||||||
# remove in F34
|
|
||||||
Obsoletes: golang-github-osbuild-composer-worker < %{version}-%{release}
|
|
||||||
Provides: golang-github-osbuild-composer-worker = %{version}-%{release}
|
|
||||||
|
|
||||||
%description worker
|
%description worker
|
||||||
The worker for osbuild-composer
|
The worker for osbuild-composer
|
||||||
|
|
||||||
@ -355,8 +336,6 @@ The dnf-json binary used by osbuild-composer and the workers.
|
|||||||
|
|
||||||
%files dnf-json
|
%files dnf-json
|
||||||
%{_libexecdir}/osbuild-composer/dnf-json
|
%{_libexecdir}/osbuild-composer/dnf-json
|
||||||
%{_unitdir}/osbuild-dnf-json.service
|
|
||||||
%{_unitdir}/osbuild-dnf-json.socket
|
|
||||||
|
|
||||||
%if %{with tests} || 0%{?rhel}
|
%if %{with tests} || 0%{?rhel}
|
||||||
|
|
||||||
@ -402,12 +381,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
|
||||||
@ -430,14 +408,35 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Fri Jun 10 2022 Eduard Abdullin <eabdullin@almalinux.org> - 46.3-1.alma
|
* Tue Nov 08 2022 Eduard Abdullin <eabdullin@almalinux.org> - 62-1.alma
|
||||||
- Install AlmaLinux repositories
|
- Install AlmaLinux repositories
|
||||||
- Add AlmaLinux support
|
- Add AlmaLinux support
|
||||||
|
|
||||||
* Thu Apr 28 2022 Ondřej Budai <ondrej@budai.cz> - 46.3-1
|
* Mon Aug 29 2022 Ondřej Budai <ondrej@budai.cz> - 62-1
|
||||||
- New upstream release
|
- New upstream release
|
||||||
|
|
||||||
* Fri Apr 01 2022 Simon Steinbeiss <simon.steinbeiss@redhat.com> - 46.1-1
|
* 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
|
- New upstream release
|
||||||
|
|
||||||
* Tue Mar 01 2022 Ondřej Budai <ondrej@budai.cz> - 46-1
|
* Tue Mar 01 2022 Ondřej Budai <ondrej@budai.cz> - 46-1
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user