[packit] 41 upstream release

Upstream tag: v41
Upstream commit: f7bf23fa

Signed-off-by: Packit Service <user-cont-team+packit-service@redhat.com>

.gitignore

@@ -17,3 +17,24 @@
 /osbuild-17.tar.gz
 /osbuild-18.tar.gz
 /osbuild-19.tar.gz
+/osbuild-20.tar.gz
+/osbuild-21.tar.gz
+/osbuild-22.tar.gz
+/osbuild-23.tar.gz
+/osbuild-24.tar.gz
+/osbuild-25.tar.gz
+/osbuild-26.tar.gz
+/osbuild-27.tar.gz
+/osbuild-28.tar.gz
+/osbuild-29.tar.gz
+/osbuild-30.tar.gz
+/osbuild-31.tar.gz
+/osbuild-32.tar.gz
+/osbuild-33.tar.gz
+/osbuild-35.tar.gz
+/osbuild-36.tar.gz
+/osbuild-37.tar.gz
+/osbuild-38.tar.gz
+/osbuild-39.tar.gz
+/osbuild-40.tar.gz
+/osbuild-41.tar.gz

.packit.yaml

@@ -1,37 +1,50 @@
-# we have the specfile in the root of our repository
+# https://packit.dev/docs/configuration/
+
 specfile_path: osbuild.spec
-# when doing an update in Fedora, we want to copy the spec file and the config file
+
 synced_files:
-  - osbuild.spec
-  - .packit.yaml
-upstream_project_name: osbuild
+    - osbuild.spec
+    - .packit.yaml
+
+upstream_package_name: osbuild
 downstream_package_name: osbuild
+
+upstream_tag_template: v{version}
+
+actions:
+  get-current-version: bash -c "git describe --tags --abbrev=0 | sed 's|v||'"
+
+create_pr: false
 jobs:
-  # trigger a COPR build for push events in open PRs
-  - job: copr_build
-    trigger: pull_request
-    metadata:
-      targets:
-      - fedora-30-x86_64
-      - fedora-31-x86_64
-      - fedora-rawhide-x86_64
-  # this is triggered by a commit on src.fedoraproject.org, not Github!
-  # e.g. in case of mass rebuild or automated changes of spec file (e.g. Python packagers)
-  # it will create a PR on Github with changes in synchronized files
-  - job: sync_from_downstream
-    trigger: commit
-  # create a PR on src.fedoraproject.org containing updated spec file and new sources (tarball)
-  # triggered by Github release
-  - job: propose_downstream
-    trigger: release
-    metadata:
-      dist-git-branch: master
-  # The same as above only for f31
-  - job: propose_downstream
-    trigger: release
-    metadata:
-      dist-git-branch: f31
-  - job: propose_downstream
-    trigger: release
-    metadata:
-      dist-git-branch: f30
+- job: copr_build
+  trigger: pull_request
+  metadata:
+    targets:
+    - centos-stream-8-aarch64
+    - centos-stream-8-x86_64
+    - epel-8-aarch64
+    - epel-8-x86_64
+    - fedora-all-aarch64
+    - fedora-all-s390x
+    - fedora-all-ppc64le
+    - fedora-all
+- job: copr_build
+  trigger: commit
+  metadata:
+    branch: main
+    owner: "@osbuild" # copr repo namespace
+    project: osbuild  # copr repo name so you can consume the builds
+    targets:
+    - centos-stream-8-aarch64
+    - centos-stream-8-x86_64
+    - epel-8-aarch64
+    - epel-8-x86_64
+    - fedora-all-aarch64
+    - fedora-all-s390x
+    - fedora-all-ppc64le
+    - fedora-all
+- job: propose_downstream
+  trigger: release
+  metadata:
+    dist_git_branches:
+      - fedora-all

README.packit

@@ -1,3 +1,3 @@
 This repository is maintained by packit.
 https://packit.dev/
-The file was generated using packit 0.7.2.dev96+g8ed72cd.
+The file was generated using packit 0.40.1.dev8+g3197820.

osbuild.spec

@@ -1,7 +1,7 @@
 %global         forgeurl https://github.com/osbuild/osbuild
 %global         selinuxtype targeted
 
-Version:        19
+Version:        41
 
 %forgemeta
 
@@ -37,11 +37,24 @@ Requires:       util-linux
 Requires:       python3-%{pypi_name} = %{version}-%{release}
 Requires:       (%{name}-selinux if selinux-policy-%{selinuxtype})
 
-# Turn off dependency generators for assemblers, runners and stages.
-# They run in a container, so there's no reason to generate dependencies
-# from them. As of 2020-03-25 this filters out python3.6 dependency generated
-# by rhel runner.
-%global __requires_exclude_from ^%{pkgdir}/(assemblers|runners|stages)/.*$
+# Turn off dependency generators for runners. The reason is that runners are
+# tailored to the platform, e.g. on RHEL they are using platform-python. We
+# don't want to pick up those dependencies on other platform.
+%global __requires_exclude_from ^%{pkgdir}/(runners)/.*$
+
+# Turn off shebang mangling on RHEL. brp-mangle-shebangs (from package
+# redhat-rpm-config) is run on all executables in a package after the `install`
+# section runs. The below macro turns this behavior off for:
+#   - runners, because they already have the correct shebang for the platform
+#     they're meant for, and
+#   - stages and assemblers, because they are run within osbuild build roots,
+#     which are not required to contain the same OS as the host and might thus
+#     have a different notion of "platform-python".
+# RHEL NB: Since assemblers and stages are not excluded from the dependency
+# generator, this also means that an additional dependency on /usr/bin/python3
+# will be added. This is intended and needed, so that in the host build root
+# /usr/bin/python3 is present so stages and assemblers can be run.
+%global __brp_mangle_shebangs_exclude_from ^%{pkgdir}/(assemblers|runners|stages)/.*$
 
 %{?python_enable_dependency_generator}
 
@@ -77,6 +90,14 @@ Contains the necessary SELinux policies that allows
 osbuild to use labels unknown to the host inside the
 containers it uses to build OS artifacts.
 
+%package        tools
+Summary:        Extra tools and utilities
+Requires:       %{name} = %{version}-%{release}
+
+%description    tools
+Contains additional tools and utilities for development of
+manifests and osbuild.
+
 %prep
 %forgesetup
 
@@ -106,12 +127,21 @@ install -p -m 0755 $(find runners -type f -or -type l) %{buildroot}%{pkgdir}/run
 mkdir -p %{buildroot}%{pkgdir}/sources
 install -p -m 0755 $(find sources -type f) %{buildroot}%{pkgdir}/sources
 
+mkdir -p %{buildroot}%{pkgdir}/devices
+install -p -m 0755 $(find devices -type f) %{buildroot}%{pkgdir}/devices
+
+mkdir -p %{buildroot}%{pkgdir}/inputs
+install -p -m 0755 $(find inputs -type f) %{buildroot}%{pkgdir}/inputs
+
+mkdir -p %{buildroot}%{pkgdir}/mounts
+install -p -m 0755 $(find mounts -type f) %{buildroot}%{pkgdir}/mounts
+
 # mount point for bind mounting the osbuild library
 mkdir -p %{buildroot}%{pkgdir}/osbuild
 
 # schemata
 mkdir -p %{buildroot}%{_datadir}/osbuild/schemas
-install -p -m 0755 $(find schemas/*.json) %{buildroot}%{_datadir}/osbuild/schemas
+install -p -m 0644 $(find schemas/*.json) %{buildroot}%{_datadir}/osbuild/schemas
 ln -s %{_datadir}/osbuild/schemas %{buildroot}%{pkgdir}/schemas
 
 # documentation
@@ -121,8 +151,8 @@ install -p -m 0644 -t %{buildroot}%{_mandir}/man1/ docs/*.1
 install -p -m 0644 -t %{buildroot}%{_mandir}/man5/ docs/*.5
 
 # SELinux
-install -D -m 644 -t %{buildroot}%{_datadir}/selinux/packages/%{selinuxtype} %{name}.pp.bz2
-install -D -m 644 -t %{buildroot}%{_mandir}/man8 selinux/%{name}_selinux.8
+install -D -m 0644 -t %{buildroot}%{_datadir}/selinux/packages/%{selinuxtype} %{name}.pp.bz2
+install -D -m 0644 -t %{buildroot}%{_mandir}/man8 selinux/%{name}_selinux.8
 
 %check
 exit 0
@@ -137,21 +167,23 @@ exit 0
 %{_datadir}/osbuild/schemas
 %{pkgdir}
 # the following files are in the ostree sub-package
-%exclude %{pkgdir}/assemblers/org.osbuild.ostree.commit
-%exclude %{pkgdir}/sources/org.osbuild.ostree
-%exclude %{pkgdir}/stages/org.osbuild.ostree
+%exclude %{pkgdir}/assemblers/org.osbuild.ostree*
+%exclude %{pkgdir}/inputs/org.osbuild.ostree*
+%exclude %{pkgdir}/sources/org.osbuild.ostree*
+%exclude %{pkgdir}/stages/org.osbuild.ostree*
 %exclude %{pkgdir}/stages/org.osbuild.rpm-ostree
 
 %files -n       python3-%{pypi_name}
 %license LICENSE
-%doc README.md NEWS.md
+%doc README.md
 %{python3_sitelib}/%{pypi_name}-*.egg-info/
 %{python3_sitelib}/%{pypi_name}/
 
 %files ostree
-%{pkgdir}/assemblers/org.osbuild.ostree.commit
-%{pkgdir}/sources/org.osbuild.ostree
-%{pkgdir}/stages/org.osbuild.ostree
+%{pkgdir}/assemblers/org.osbuild.ostree*
+%{pkgdir}/inputs/org.osbuild.ostree*
+%{pkgdir}/sources/org.osbuild.ostree*
+%{pkgdir}/stages/org.osbuild.ostree*
 %{pkgdir}/stages/org.osbuild.rpm-ostree
 
 %files selinux
@@ -170,99 +202,128 @@ fi
 %posttrans selinux
 %selinux_relabel_post -s %{selinuxtype}
 
+%files tools
+%{_bindir}/osbuild-mpp
+
+
 %changelog
-* Fri Aug  7 2020 Christian Kellner <ckellner@redhat.com> - 19-1
-- Upstream release 19
-- Drop no-floats-in-sources.patch included in release 19
-- bubblewrap replaced systemd-nspawn for sandboxing; change the
-  requirements accordingly.
+* Mon Nov 08 2021 Packit Service <user-cont-team+packit-service@redhat.com> - 41-1
+- stages/authconfig: run authconfig (Tom Gundersen)
+- stages/yum.config: add an option to configure langpacks plugin (Ondřej Budai)
+- formats/v2: fix describe for mount without source (Christian Kellner)
+- stages/selinux: ability to force an auto-relabel (Christian Kellner)
+- stages/pwquality.conf: set pwquality configuration (Tom Gundersen)
+- stages/rhsm: add support to configure yum plugins (Christian Kellner)
+- stages/rhsm: extract plugins defintion (Christian Kellner)
+- Add new `org.osbuild.yum.config` stage (Tomas Hozza)
+- test/cloud-init: add new options to stage test (Achilleas Koutsou)
+- stages/cloud-init: disable default_flow_style when writing configs (Achilleas Koutsou)
+- stages/cloud-init: add support for configuring output logging (Achilleas Koutsou)
+- stages/cloud-init: add support for configuring reporting handlers (Achilleas Koutsou)
+- stages/cloud-init: add support for configuring Azure datasource (Achilleas Koutsou)
+- stages: add new org.osbuild.cron.script stage (Christian Kellner)
+- stages/grub2: add support for terminal, serial and timeout config (Ondřej Budai)
+- stages/waagent.conf: set WALinuxAgent configuration (Tom Gundersen)
+- stages/sshd.config: set sshd configuration (Tom Gundersen)
+- Support 'install' command in org.osbuild.modprobe stage (Tomas Hozza)
+- Post release version bump (msehnout)
 
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 18-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+* Wed Nov 03 2021 Packit Service <user-cont-team+packit-service@redhat.com> - 40-1
+- stages/lvm2.create: fix 'size' and add 'extents' (Christian Kellner)
+- Let schutzbot do the post-release version bump (Simon Steinbeiss)
+- test/data: use ostree.deployment in fedora image (Christian Kellner)
+- mounts: add new ostree.deployment service (Christian Kellner)
+- mounts: include tree directory in arguments (Christian Kellner)
+- mounts: allow empty returns from service (Christian Kellner)
+- mounts: separate file system mount service (Christian Kellner)
+- meta: allow mounts for all stages (Christian Kellner)
+- schema/v2: make mount source and target optional (Christian Kellner)
+- mounts: change schema meta information (Christian Kellner)
+- mounts: introduce new mount manager class (Christian Kellner)
+- devices: add device path helper functions (Christian Kellner)
+- devices: introduce new device manager class (Christian Kellner)
+- test/data: add RHEL 7 manifests (Christian Kellner)
+- test/stages: add check for `parted` stage (Christian Kellner)
+- runners: add rhel7 runner (Christian Kellner)
+- stages/grub2.legacy: new stage for non-bls config (Christian Kellner)
+- stages/parted: new stage to partition a device (Christian Kellner)
+- pipeline: don't bind-mount /boot from the host (Christian Kellner)
+- buildroot: make mounting /boot optional (Christian Kellner)
+- setup.cfg: increase max-statements to 75 (Christian Kellner)
+- runners: add new centos9 runner (Christian Kellner)
+- ci: remove 8.5 nightly testing (Ondřej Budai)
+- mpp: fix long options (Christian Kellner)
+- osbuild-mpp: Set the "arch" variable to the current rpm arch (Alexander Larsson)
+- osbuild-mpp: Better handling of variable defaults and propagation (Alexander Larsson)
+- osbuild-mpp: Better handling of -D overrides (Alexander Larsson)
+- osbuild-mpp: Allow using formating in depsolver node (Alexander Larsson)
+- osbuild-mpp: Add mpp-join (Alexander Larsson)
+- osbuild-mpp: Add mpp-eval (Alexander Larsson)
+- Fix GitHub Action tag pattern (Simon Steinbeiss)
+- mockbuild: reuse mock repos from the system ones (Ondřej Budai)
+- mockbuild: rotate a variable name (Ondřej Budai)
+- gitlab: don't save journal (Ondřej Budai)
+- deploy: update to the latest composer commit (Ondřej Budai)
+- ci: don't register the runners (Ondřej Budai)
+- trigger-gitlab: do not interpret the fetch_pulls outputs (Ondřej Budai)
+- Bump version numbers ahead of release (Simon Steinbeiss)
+- Switch to simple upstream releases (Simon Steinbeiss)
+- stages/grub2.inst: ensure /var/tmp exists (Christian Kellner)
+- devices/loopback: remove extra "'" from print (Christian Kellner)
+- tests/ci: Switch to testing on 8.4 GA (Jakub Rusz)
+- tests: enable testing on RHEl-8.5 and RHEL-9.0 (Jakub Rusz)
+- .github: Write PR data to a file first in trigger-gitlab (Sanne Raymaekers)
+- README: Add a link to our developer guide (Simon Steinbeiss)
 
-* Fri Jun 26 2020 Christian Kellner <ckellner@redhat.com> - 18-2
-- Add patch to not pass floats to curl in the files source
-  https://github.com/osbuild/osbuild/pull/459
+* Wed Oct 06 2021 Packit Service <user-cont-team+packit-service@redhat.com> - 39-1
+- 39 (Thomas Lavocat)
+- packit: enable builds on ppc64le (Tomas Hozza)
+- CI: rename rhel-8.5 runners to rhel-8.5-nightly (Achilleas Koutsou)
+- mockbuild: add RHEL 8.6 (Achilleas Koutsou)
+- docs: document osbuild and selinux integration (Christian Kellner)
+- ci: trigger gitlab from checks not tests (Christian Kellner)
+- ci: split out checks from tests (Christian Kellner)
+- .github: Get PR number from sha (Sanne Raymaekers)
+- .github: Use the workflow_run event data in trigger-gitlab (Sanne Raymaekers)
+- ci: trigger gitlab ci via workflow run event (Christian Kellner)
 
-* Tue Jun 23 2020 Christian Kellner <ckellner@redhat.com> - 18-1
-- Upstream release 18
-- All RHEL runners now use platform-python.
+* Mon Sep 27 2021 Packit Service <user-cont-team+packit-service@redhat.com> - 38-1
+- 38 (Simon Steinbeiss)
+- Copy the local_vars dictionary to avoid eval modifying it (Pierre-Yves Chibon)
+- Add support for defining variables from other variables or basic expression (Pierre-Yves Chibon)
+- test/host: checks for invalid fd handling (Christian Kellner)
+- host: check reply_fds before sending them (Christian Kellner)
+- host: raise a protocol error for empty messages (Christian Kellner)
+- sources: pass items via temporary file (Christian Kellner)
+- test/host: add check for call with fds (Christian Kellner)
+- host: properly clean up passed fds (Christian Kellner)
+- stages/qemu: fix 'compat' option (Christian Kellner)
 
-* Wed Jun 10 2020 Christian Kellner <ckellner@redhat.com> - 17-1
-- new upstream relaese 17
-- Add custom SELinux policy that lets osbuild set labels inside
-  the build root that are unknown to the host.
+* Wed Sep 22 2021 Packit Service <user-cont-team+packit-service@redhat.com> - 37-1
+- 37 (Martin Sehnoutka)
+- sources: port to host services (Christian Kellner)
+- org.osbuild.curl: Don't load secrets if not needed (Alexander Larsson)
+- pipeline: split out downloading from building (Christian Kellner)
+- Fix the assert as `.sort()`  returns None (Pierre-Yves Chibon)
+- schutzbot: Update terraform sha (Sanne Raymaekers)
+- packit: Propose PRs to all Fedoras (Simon Steinbeiss)
+- stages: pam_limits.conf → pam.limits.conf (Christian Kellner)
+- Add a new stage for configuring `pam_limits` module (Tomas Hozza)
+- ostree.config: add `bootloader` config option (Christian Kellner)
+- Add a new stage for setting kernel parameters via sysctl.d (Tomas Hozza)
 
-* Thu Jun  4 2020 Christian Kellner <ckellner@redhat.com> - 16-1
-- new upstream release 16
-- Drop sources-fix-break-when-secrets-is-None.patch included in
-  the new upstream reelase.
+* Wed Sep 08 2021 Packit Service <user-cont-team+packit-service@redhat.com> - 36-1
+- 36 (Diaa Sami)
+- Add a new stage `org.osbuild.tmpfilesd` for configuring tmpfiles.d (Tomas Hozza)
+- Add a new stage for configuring SELinux state on the system (Tomas Hozza)
+- Add a new `org.osbuild.dnf.config` stage for configuring DNF (Tomas Hozza)
+- Add new `org.osbuild.tuned` stage for setting active TuneD profile (Tomas Hozza)
+- util/rhsm: Check if repositories is None before iterating (Sanne Raymaekers)
+- stages/kickstart: set passwords with --iscrypted (Achilleas Koutsou)
 
-* Wed May 27 2020 Miro Hrončok <mhroncok@redhat.com> - 15-4
-- Rebuilt for Python 3.9
-
-* Tue May 26 2020 Christian Kellner <ckellner@redhat.com> - 15-3
-- Add a patch to allow org.osbuild.files source in the new format
-  but without actually containing the secrets key.
-  Taken from merged PR: https://github.com/osbuild/osbuild/pull/416
-
-* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 15-2
-- Rebuilt for Python 3.9
-
-* Thu May 21 2020 Christian Kellner <ckellner@redhat.com> - 15-1
-- new upstream release 15
-
-* Wed May  6 2020 Christian Kellner <christian@kellner.me> - 14-2
-- Install schemata to <datadir>/osbuild/schemas and include a
-  symlink to it in /usr/lib/osbuild/schemas
-
-* Wed May  6 2020 Christian Kellner <christian@kellner.me> - 14-1
-- new upstream release 14
-- The directories /usr/lib/osbuild/{assemblers, stages}/osbuild
-  got removed. Changes to osbuild made them obsolete.
-
-* Wed Apr 15 2020 Christian Kellner <ckellner@redhat.com> - 12-1
-- new upstream release 12
-- Specify the exact version in the 'python3-osbuild' requirement
-  to avoid the library and the main binary being out of sync.
-- osbuild-ostree sub-package with the necessary bits to create
-  OSTree based images
-
-* Thu Apr  2 2020 Christian Kellner <ckellner@redhat.com> - 11-1
-- new upstream release 11
-- Turn of dependency generator for internal components
-
-* Thu Mar 19 2020 Christian Kellner <ckellner@redhat.com> - 10-1
-- new upstream release 10
-- build and include man pages, this adds 'make' and 'python3-docutils'
-  to the build requirements
-- add NEWS.md file with the release notes
-
-* Thu Mar  5 2020 Christian Kellner <ckellner@redhat.com> - 9-1
-- new upstream release: 9
-- Remove host runner link, it now is being auto-detected
-- Cleanup use of mixed use of spaces/tabs
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Mon Dec 16 2019 Packit Service <user-cont-team+packit-service@redhat.com> - 7-1
-- new upstream release: 7
-
-* Sat Nov 30 2019 Tom Gundersen <teg@jklm.no> - 6-1
-- new upstream release: 6
-
-* Wed Oct 30 2019 Lars Karlitski <lars@karlitski.net> - 5-1
-- new upstream release: 5
-
-* Wed Oct 16 2019 Tom Gundersen <tgunders@redhat.com> - 4-1
-- new upstream release: 4
-
-* Fri Oct 04 2019 Lars Karlitski <lars@karlitski.net> - 3-1
-- new upstream release: 3
-
-* Wed Sep 18 2019 Martin Sehnoutka <msehnout@redhat.com> - 2-1
-- new upstream release: 2
+* Sun Aug 29 2021 Packit Service <user-cont-team+packit-service@redhat.com> - 35-1
+- 35 (Tom Gundersen)
+- stages/kickstart: quote ssh-key (Christian Kellner)
 
 * Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 1-3
 - Rebuilt for Python 3.8

sources

@@ -1 +1 @@
-SHA512 (osbuild-19.tar.gz) = 88d3851b4034930a73dddd175521be58cba5be6bb9a66ebb7264b1f4df1dc1fac3dba480c136e689abf25c651f81ec9241078a90a84fe047e5e78de6165d1b23
+SHA512 (osbuild-41.tar.gz) = 415c5d9c5bb9b60459c917f283b54e5d19dd8d9fb59d1a9364c55ae953ce888e15d3bc9ca008a1cbdb7e804fe2bf1c2aecf920c4b0c7cf3c18d4430a9eba4096

tests/tests.yml

@@ -6,14 +6,20 @@
     - always
   - role: standard-test-basic
     tags:
-    - atomic
     - classic
     required_packages:
     - osbuild
+    - git
+    - make
+    - python3-mako
+    - python3-pytest
     tests:
     - smoke:
         dir: smoke
         run: osbuild --help
+    - unit:
+        dir: source
+        run: python3 -m pytest test/mod
     - image:
-        dir: .
-        run: osbuild source/samples/base-qcow2.json
+        dir: tests
+        run: osbuild fedora-boot.json --store=/var/tmp/osbuild/store --output-directory=/var/tmp/osbuild/out