From 76400efc7092fbc546fbb8d26648872e42021e94 Mon Sep 17 00:00:00 2001 From: Packit Service Date: Wed, 13 Oct 2021 15:34:59 +0000 Subject: [PATCH] [packit] 36 upstream release Upstream tag: v36 Upstream commit: 4e5ce288 Signed-off-by: Packit Service --- .gitignore | 1 + .packit.yaml | 1 + README.packit | 2 +- osbuild-composer.spec | 95 ++++++++++++++++++++++++++++++++++++++++--- sources | 2 +- 5 files changed, 94 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 006e3d3..f1b259f 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ /osbuild-composer-30.tar.gz /osbuild-composer-31.tar.gz /osbuild-composer-35.tar.gz +/osbuild-composer-36.tar.gz diff --git a/.packit.yaml b/.packit.yaml index aedea9d..2fe0a1c 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -14,6 +14,7 @@ upstream_tag_template: v{version} actions: get-current-version: bash -c "git describe --tags --abbrev=0 | sed 's|v||'" +create_pr: false jobs: - job: propose_downstream trigger: release diff --git a/README.packit b/README.packit index c4a256c..0f693ec 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.37.1.dev6+g093e8e1. +The file was generated using packit 0.38.1.dev15+ga49247d. diff --git a/osbuild-composer.spec b/osbuild-composer.spec index 1dac340..37cc174 100644 --- a/osbuild-composer.spec +++ b/osbuild-composer.spec @@ -4,7 +4,7 @@ %global goipath github.com/osbuild/osbuild-composer -Version: 35 +Version: 36 %gometa @@ -20,9 +20,8 @@ Name: osbuild-composer Release: 1%{?dist} Summary: An image building service based on osbuild -# osbuild-composer doesn't have support for building i686 images -# and also RHEL and Fedora has now only limited support for this arch. -ExcludeArch: i686 +# osbuild-composer doesn't have support for building i686 and armv7hl images +ExcludeArch: i686 armv7hl # Upstream license specification: Apache-2.0 License: ASL 2.0 @@ -314,13 +313,13 @@ cd $PWD/_build/src/%{goipath} %package core Summary: The core osbuild-composer binary +Requires: %{name}-dnf-json = %{version}-%{release} %description core The core osbuild-composer binary. This is suitable both for spawning in containers and by systemd. %files core %{_libexecdir}/osbuild-composer/osbuild-composer -%{_libexecdir}/osbuild-composer/dnf-json %{_datadir}/osbuild-composer/ %package worker @@ -329,6 +328,7 @@ Requires: systemd Requires: qemu-img Requires: osbuild >= 37 Requires: osbuild-ostree >= 37 +Requires: %{name}-dnf-json = %{version}-%{release} # remove in F34 Obsoletes: golang-github-osbuild-composer-worker < %{version}-%{release} @@ -358,6 +358,15 @@ systemctl stop "osbuild-worker@*.service" "osbuild-remote-worker@*.service" # restart all the worker services %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 + +%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} %package tests @@ -425,6 +434,82 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c %endif %changelog +* Wed Oct 13 2021 Packit Service - 36-1 +- 36 (Achilleas Koutsou) +- Revert "cloudapi/v1: Move depsolving to workers" (Sanne Raymaekers) +- worker: Prefix https always (sanne) +- cloudapi/v1: Move depsolving to workers (sanne) +- cloudapi/v2: fix newV2Server() call in test (Achilleas Koutsou) +- templates: Name service ports (sanne) +- SPEC: Exclude `armv7hl` architecture (Tomas Hozza) +- distro/rhel90 -> distro/rhel90beta: rename package (Achilleas Koutsou) +- distro/rhel90: rename to rhel-90-beta and alias base name (Achilleas Koutsou) +- spec: Split dnf-json into a subpackage (sanne) +- cloudapi/v2: Use worker to depsolve (Ondřej Budai) +- worker: Add a depsolve job type (Tom Gundersen) +- packit: Push downstream instead of creating PR (Simon Steinbeiss) +- templates: Name services after endpoints (sanne) +- worker: Make BasePath configurable (sanne) +- cloudapi/v2: Listen on /api/image-builder-composer/v2 (sanne) +- test/ostree: remove --ip-range from podman network (Achilleas Koutsou) +- RHEL-8.6: add support for official EC2 SAP image (Tomas Hozza) +- tools/provision: set up nightly repos for RHEL 8.6 (Achilleas Koutsou) +- test/cases: add support for RHEL 8.6 to test scripts (Achilleas Koutsou) +- schutzbot: pin osbuild to current main for 8.6 (Achilleas Koutsou) +- schutzbot: update terraform sha (Achilleas Koutsou) +- news: add entry about RHEL 8.6 (Achilleas Koutsou) +- test: add RHEL 8.6 test manifests (Achilleas Koutsou) +- test: add rpmrepo snapshots for RHEL 8.6 (Achilleas Koutsou) +- ci: run all tests on RHEL 8.6 (Achilleas Koutsou) +- test/data/repositories: add test repos for rhel-86 (Achilleas Koutsou) +- distro/rhel85: remove rhel86 alias (Achilleas Koutsou) +- distro/rhel86: copy all definitions from rhel85 (Achilleas Koutsou) +- cloudapi/v2: Configurable aws bucket (sanne) +- cloudapi/v2: Replace upload types with image types (sanne) +- Tests/RHEL-9.0: add EC2 SAP image test (Tomas Hozza) +- Tests/RHEL-9.0: add repos needed for EC2 SAP image tests (Tomas Hozza) +- RHEL-9.0: add EC2 SAP image definition. (Tomas Hozza) +- Tests/RHEL-9.0: add EC2 and EC2 HA image tests (Tomas Hozza) +- Tests/RHEL-9.0: add repos needed for EC2 and EC2 HA image tests (Tomas Hozza) +- Image tests: skip rpm-ostree-1-autovar.conf tmpfiles.d config on Fedora (Tomas Hozza) +- composer: Don't dump sensitive fields from config (sanne) +- tests: Update image_tests (Jakub Rusz) +- templates: Duplicate value in composer config (sanne) +- templates: Port names should be less than 15 characters (sanne) +- templates: Make sure ports are unquoted (sanne) +- cloudapi/v1: Return status created in compose handler (sanne) +- worker: Use Recover middleware to handle panics (Diaa Sami) +- worker: Improve logging (Diaa Sami) +- Regenerate affected image test cases (Tomas Hozza) +- generate-all-test-cases: allow specifying additional DNF repos (Tomas Hozza) +- image-info: ensure that directory is analysed as read-only (Tomas Hozza) +- tests: enable koji.sh test on RHEL-9 (Jakub Rusz) +- tests/ci: enable vmware.sh and cross-distro.sh on rhel-9 (Jakub Rusz) +- README: Add a link to our developer guide (Simon Steinbeiss) +- templates: Composer OSD template (sanne) +- internal/rpmmd: log repository files loaded during composer startup (Martin Sehnoutka) +- dnf-json: expire metadata by default (Tom Gundersen) +- schutzbot: Clean up non-default storage accounts (sanne) +- main: IsNotExist() is no longer a valid check (Achilleas Koutsou) +- config: update NonExisting test to check for default (Achilleas Koutsou) +- config: don't fail LoadConfig if file doesn't exist (Achilleas Koutsou) +- Test: regenerate all image test cases (Tomas Hozza) +- Image tests: use RPMRepo with released RHEL-8.4 content (Tomas Hozza) +- image-info: fix undefined variable in analyse_directory() (Tomas Hozza) +- image-info: sort partitions list in the report. (Tomas Hozza) +- image-info: use subprocess_check_output() in read_selinux_ctx_mismatch() (Tomas Hozza) +- image-info: check not installed documentation (Tomas Hozza) +- image-info: read content of /etc/resolv.conf (Tomas Hozza) +- image-info: read sysctl.d config files from multiple paths (Tomas Hozza) +- image-info: read security limits config files from multiple paths (Tomas Hozza) +- image-info: read tmpfiles.d config files from multiple paths (Tomas Hozza) +- image-info: read systemd service unit drop-ins from multiple paths (Tomas Hozza) +- image-info: read cloud-init configs from multiple paths (Tomas Hozza) +- image-info: read systemd-logind configs from multiple paths (Tomas Hozza) +- image-info: read dracut configs from multiple paths (Tomas Hozza) +- image-info: read modprobe configs from multiple paths (Tomas Hozza) +- composer: More configuration of how composer is served (sanne) + * Sat Oct 02 2021 Packit Service - 35-1 - 35 (Simon Steinbeiss) - gitleaks: add allow list for test passwords and keys (Achilleas Koutsou) diff --git a/sources b/sources index 93adf1d..32ccab7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (osbuild-composer-35.tar.gz) = cdfb8b8bb38221db263a77892a5640c0adee11cec7444b5cea6d2227e55d8185d2b7662cfb8ed64519fe6978b7b111fdc9311c67b1ade98a547cf8f4fde6ab08 +SHA512 (osbuild-composer-36.tar.gz) = ce3e8c3f9cbb074712fc48c35860bff5e6ec8740597aa29d016ad8de2beae7046987d4a74148c7419a05334358518ba13d43d6259569659f57baefb3bb611814