diff --git a/.gitignore b/.gitignore index 6215fb5..3220308 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ /osbuild-composer-41.tar.gz /osbuild-composer-42.tar.gz /osbuild-composer-43.tar.gz +/osbuild-composer-44.tar.gz diff --git a/.packit.yaml b/.packit.yaml index 992416a..10430a8 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -34,7 +34,7 @@ jobs: - epel-8-aarch64 - epel-8-x86_64 - fedora-all-aarch64 - #- fedora-all-s390x # go binary segfaults in the emulated environment + - fedora-all-s390x - fedora-all-ppc64le - fedora-all - job: copr_build @@ -51,6 +51,6 @@ jobs: - epel-8-aarch64 - epel-8-x86_64 - fedora-all-aarch64 - #- fedora-all-s390x # go binary segfaults in the emulated environment + - fedora-all-s390x - fedora-all-ppc64le - fedora-all diff --git a/README.packit b/README.packit index cf40327..78bc2de 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.44.1.dev4+g5ec2bd1. +The file was generated using packit 0.45.0. diff --git a/osbuild-composer.spec b/osbuild-composer.spec index 23817a0..723f166 100644 --- a/osbuild-composer.spec +++ b/osbuild-composer.spec @@ -2,9 +2,14 @@ # Pass --with tests to rpmbuild to override %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 + %global goipath github.com/osbuild/osbuild-composer -Version: 43 +Version: 44 %gometa @@ -61,6 +66,7 @@ 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 @@ -219,6 +225,7 @@ 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/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/ @@ -369,7 +376,11 @@ The dnf-json binary used by osbuild-composer and the workers. %package tests Summary: Integration tests +%if %{with relax_requires} +Requires: %{name} +%else Requires: %{name} = %{version}-%{release} +%endif Requires: composer-cli Requires: createrepo_c Requires: xorriso @@ -397,6 +408,7 @@ Requires: libvirt-daemon-driver-storage-disk Requires: libvirt-daemon-kvm Requires: qemu-img Requires: qemu-kvm +Requires: rpmdevtools Requires: virt-install Requires: expect Requires: python3-lxml @@ -432,6 +444,62 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c %endif %changelog +* Fri Feb 11 2022 Packit Service - 44-1 +CHANGES WITH 44: +---------------- + * Relax TCP timeouts for koji connections (#2282) + * cloudapi/v2: add support for aws-*-rhui image types (#2281) + * Add oracle-oci.md under image-types/rhel8 (#2283) + * Appsre packer 85 (#2274) + * Add missing F34 and F35 image test cases (#2276) + * templates/dashboard: worker metric queries (#2277) + * distro: add an alias for RHEL 8.7 (#2270) + * metrics: change job metrics namespace (#2272) + * Revert "templates: Add dnf-json template" (#2273) + * Sonarqube fix + Schutzfile repo rename (#2261) + * Drop F33 support and add F34/F35 image tests (#2264) + * github: fix gitlab trigger (#2271) + * Skip CI for draft PRs or WIP label (#2238) + * service-maintenance: Skip db cleanup (#2252) + * templates/dashboards: worker error metrics (#2267) + * build(deps): bump cloud.google.com/go/cloudbuild from 0.2.0 to 1.0.0 (#2153) + * update testing doc with cloud cleaner info (#2256) + * RHEL-90: Remove deprecated `crashkernel=auto` option (#2262) + * templates: Add dnf-json template (#2259) + * Worker error validation (#2260) + * Prepare CI to build -tests RPM for downstream testing from source (#2093) + * worker: fix error status codes (#2258) + * Workers error metrics (#2247) + * gitlab-ci: make every stage interruptible (#2248) + * internal/cloud/gcp: use `pkg.go.dev/cloud.google.com/go` for Compute Engine (#2162) + * EC2: Disable password based authentication (#2235) + * Dnf json (#2194) + * worker/api: align error handler with cloudapi (#2152) + * cloupapi/v2: add koji support (#2214) + * RHEL 9.0: Drop IA32 (#2219) + * jwt: support multiple key providers (#2239) + * Mock OpenID: add token type, expires in and scope fields (#2240) + * distro/rhel86: fix ec2 boot partition for arm64 (#2228) + * Extend scheduled cloud cleaner to vmware (#2200) + * Kojiapi: fix error check in koji job (#2236) + * osbuild-worker: change error handling for OCI upload (#2234) + * distro/rhel90: special case root user for ssh keys (#2220) + * OCI support (#2031) + * distro/rhel90: no uuids in dos partition table (#2233) + * Worker errors backwards compatibility (#2192) + * repo runner (#2216) + * test/koji: remove the koji-cli patch (#2223) + * packit: re-enable builds for s390x architecture (#2246) + +Contributions from: Achilleas Koutsou, Alexander Todorov, Antonio + Murdaca, Christian Kellner, Diaa Sami, Gianluca + Zuccarelli, Jakub Rusz, Juan Abia, Ondřej Budai, + Pavel Raiskup, Roy Golan, Sanne Raymaekers, + Tom Gundersen, Tomas Hozza, Thomas Lavocat + +— Grenoble, 2022-02-11 + + * Wed Jan 26 2022 Packit Service - 43-1 CHANGES WITH 43: ---------------- diff --git a/sources b/sources index 922a009..0ab5e73 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (osbuild-composer-43.tar.gz) = b83df92e13effed7a914dd9e917f6e5ec5626286771e65aec9156fbc636c105bb98cf868ec97fd7599eaab58d05652f23a77f5394f00bf51f1d9578f01395a8f +SHA512 (osbuild-composer-44.tar.gz) = 7c9a66ae2415ad754851c2af7a2064ac870bb91cccdab42f27d07dc3ee18d2602e8f33f5ddd27ca686d784f83853ba96330b2834469a73c4e307469ed8798168