diff --git a/.gitignore b/.gitignore index 0a89d15..e2c317c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/osbuild-composer-46.3.tar.gz +SOURCES/osbuild-composer-62.tar.gz diff --git a/.osbuild-composer.metadata b/.osbuild-composer.metadata index 4390ef9..9576688 100644 --- a/.osbuild-composer.metadata +++ b/.osbuild-composer.metadata @@ -1 +1 @@ -705a76eb84367b62d4ba6c8448bda83d5f9ce100 SOURCES/osbuild-composer-46.3.tar.gz +507b6d1c7dd00aafb3fc3988d7a1f61be10a0c03 SOURCES/osbuild-composer-62.tar.gz diff --git a/SPECS/osbuild-composer.spec b/SPECS/osbuild-composer.spec index 67dea26..319135c 100644 --- a/SPECS/osbuild-composer.spec +++ b/SPECS/osbuild-composer.spec @@ -9,7 +9,7 @@ %global goipath github.com/osbuild/osbuild-composer -Version: 46.3 +Version: 62 %gometa @@ -39,36 +39,15 @@ BuildRequires: systemd BuildRequires: krb5-devel BuildRequires: python3-docutils BuildRequires: make +# Build requirements of 'theproglottis/gpgme' package +BuildRequires: gpgme-devel +BuildRequires: libassuan-devel %if 0%{?fedora} BuildRequires: systemd-rpm-macros BuildRequires: git -BuildRequires: golang(github.com/aws/aws-sdk-go) -BuildRequires: golang(github.com/Azure/azure-sdk-for-go) -BuildRequires: golang(github.com/Azure/azure-storage-blob-go/azblob) -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) +# 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 +# BUNDLE_START +# BUNDLE_END %endif Requires: %{name}-core = %{version}-%{release} @@ -88,9 +67,6 @@ Conflicts: lorax-composer Obsoletes: lorax-composer < 34.3 %endif -# remove when F34 is EOL -Obsoletes: osbuild-composer-koji <= 23 - %description %{common_description} @@ -98,7 +74,7 @@ Obsoletes: osbuild-composer-koji <= 23 %if 0%{?rhel} %forgeautosetup -p1 %else -%goprep +%goprep -k %endif %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-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 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 %endif @@ -216,7 +192,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-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/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 tools/define-compose-url.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/ install -m 0755 -vp tools/provision.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/ @@ -225,12 +201,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/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-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/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/test-case-generators/generate-test-cases %{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/ +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 0644 -vp test/data/ansible/* %{buildroot}%{_datadir}/tests/osbuild-composer/ansible/ @@ -270,7 +255,7 @@ install -m 0755 -vd %{buildroot}% 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/ +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/ @@ -324,16 +309,12 @@ 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 >= 49 -Requires: osbuild-ostree >= 49 -Requires: osbuild-lvm2 >= 49 -Requires: osbuild-luks2 >= 49 +Requires: osbuild >= 63 +Requires: osbuild-ostree >= 63 +Requires: osbuild-lvm2 >= 63 +Requires: osbuild-luks2 >= 63 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 The worker for osbuild-composer @@ -371,8 +352,6 @@ The dnf-json binary used by osbuild-composer and the workers. %files dnf-json %{_libexecdir}/osbuild-composer/dnf-json -%{_unitdir}/osbuild-dnf-json.service -%{_unitdir}/osbuild-dnf-json.socket %if %{with tests} || 0%{?rhel} @@ -418,12 +397,11 @@ 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 +Requires: make +Requires: python3-pip %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 @@ -446,10 +424,31 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c %endif %changelog -* Thu Apr 28 2022 Ondřej Budai - 46.3-1 +* Mon Aug 29 2022 Ondřej Budai - 62-1 - New upstream release -* Fri Apr 01 2022 Simon Steinbeiss - 46.1-1 +* Wed Aug 24 2022 imagebuilder-bot - 60-1 +- New upstream release + +* Thu Aug 11 2022 imagebuilder-bot - 59-1 +- New upstream release + +* Thu Jul 28 2022 imagebuilder-bot - 58-1 +- New upstream release + +* Mon Jul 18 2022 imagebuilder-bot - 57-1 +- New upstream release + +* Wed Jun 15 2022 imagebuilder-bot - 55-1 +- New upstream release + +* Wed Jun 01 2022 imagebuilder-bot - 54-1 +- New upstream release + +* Mon May 23 2022 imagebuilder-bot - 53-1 +- New upstream release + +* Wed May 04 2022 Ondřej Budai - 51-1 - New upstream release * Tue Mar 01 2022 Ondřej Budai - 46-1