11 changed files with 337 additions and 77 deletions
--- a/.fmf/version
+++ b/.fmf/version
@ -0,0 +1 @@
+1
--- a/.gitignore
+++ b/.gitignore
@ -1 +1,77 @@
-SOURCES/osbuild-composer-75.tar.gz
+/osbuild-composer-8.tar.gz
+/osbuild-composer-9.tar.gz
+/osbuild-composer-10.tar.gz
+/osbuild-composer-11.tar.gz
+/osbuild-composer-12.tar.gz
+/osbuild-composer-13.tar.gz
+/osbuild-composer-14.tar.gz
+/osbuild-composer-15.tar.gz
+/osbuild-composer-16.tar.gz
+/osbuild-composer-17.tar.gz
+/osbuild-composer-18.tar.gz
+/osbuild-composer-19.tar.gz
+/osbuild-composer-20.tar.gz
+/osbuild-composer-22.tar.gz
+/osbuild-composer-23.tar.gz
+/osbuild-composer-24.tar.gz
+/osbuild-composer-25.tar.gz
+/osbuild-composer-26.tar.gz
+/osbuild-composer-27.tar.gz
+/osbuild-composer-28.tar.gz
+/osbuild-composer-29.tar.gz
+/osbuild-composer-30.tar.gz
+/osbuild-composer-31.tar.gz
+/osbuild-composer-32.tar.gz
+/osbuild-composer-33.tar.gz
+/osbuild-composer-36.tar.gz
+/osbuild-composer-37.tar.gz
+/osbuild-composer-38.tar.gz
+/osbuild-composer-39.tar.gz
+/osbuild-composer-40.tar.gz
+/osbuild-composer-41.tar.gz
+/osbuild-composer-42.tar.gz
+/osbuild-composer-43.tar.gz
+/osbuild-composer-44.tar.gz
+/osbuild-composer-45.tar.gz
+/osbuild-composer-46.tar.gz
+/osbuild-composer-51.tar.gz
+/osbuild-composer-53.tar.gz
+/osbuild-composer-54.tar.gz
+/osbuild-composer-55.tar.gz
+/osbuild-composer-57.tar.gz
+/osbuild-composer-58.tar.gz
+/osbuild-composer-59.tar.gz
+/osbuild-composer-60.tar.gz
+/osbuild-composer-62.tar.gz
+/osbuild-composer-67.tar.gz
+/osbuild-composer-68.tar.gz
+/osbuild-composer-69.tar.gz
+/osbuild-composer-70.tar.gz
+/osbuild-composer-71.tar.gz
+/osbuild-composer-72.tar.gz
+/osbuild-composer-73.tar.gz
+/osbuild-composer-74.tar.gz
+/osbuild-composer-75.tar.gz
+/osbuild-composer-76.tar.gz
+/osbuild-composer-77.tar.gz
+/osbuild-composer-79.tar.gz
+/osbuild-composer-80.tar.gz
+/osbuild-composer-82.tar.gz
+/osbuild-composer-84.tar.gz
+/osbuild-composer-85.tar.gz
+/osbuild-composer-86.tar.gz
+/osbuild-composer-87.tar.gz
+/osbuild-composer-88.tar.gz
+/osbuild-composer-89.tar.gz
+/osbuild-composer-91.tar.gz
+/osbuild-composer-92.tar.gz
+/osbuild-composer-93.tar.gz
+/osbuild-composer-94.tar.gz
+/osbuild-composer-95.tar.gz
+/osbuild-composer-96.tar.gz
+/osbuild-composer-98.tar.gz
+/osbuild-composer-99.tar.gz
+/osbuild-composer-100.tar.gz
+/osbuild-composer-101.tar.gz
+/osbuild-composer-102.tar.gz
+/osbuild-composer-104.tar.gz
--- a/.osbuild-composer.metadata
+++ b/.osbuild-composer.metadata
@ -1 +1 @@
-b03146ce367157bf2ea8028c1a9bdbf27e69de97 SOURCES/osbuild-composer-75.tar.gz
+722b763ff2272b996681f0f43ddb932e6de54bcb osbuild-composer-104.tar.gz
--- a/README.md
+++ b/README.md
@ -0,0 +1,3 @@
+# osbuild-composer
+
+The osbuild-composer package
--- a/gating.yaml
+++ b/gating.yaml
@ -0,0 +1,6 @@
+--- !Policy
+product_versions:
+  - rhel-9
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
--- a/SPECS/osbuild-composer.spec
+++ b/SPECS/osbuild-composer.spec
@ -7,9 +7,12 @@
 # This is used internally during nightly pipeline testing!
 %bcond_with relax_requires

+# The minimum required osbuild version
+%global min_osbuild_version 109
+
 %global goipath         github.com/osbuild/osbuild-composer

-Version:        75
+Version:        104

 %gometa

@ -42,9 +45,13 @@ BuildRequires:  make
 # Build requirements of 'theproglottis/gpgme' package
 BuildRequires:  gpgme-devel
 BuildRequires:  libassuan-devel
+# Build requirements of 'github.com/containers/storage' package
+BuildRequires:  device-mapper-devel
 %if 0%{?fedora}
 BuildRequires:  systemd-rpm-macros
 BuildRequires:  git
+# Build requirements of 'github.com/containers/storage' package
+BuildRequires:  btrfs-progs-devel
 # 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
@ -78,6 +85,16 @@ export PATH=$PWD/_bin${PATH:+:$PATH}
 export GOPATH=$GO_BUILD_PATH:%{gopath}
 export GOFLAGS+=" -mod=vendor"
 %endif
+%if 0%{?fedora}
+# Fedora disables Go modules by default, but we want to use them.
+# Undefine the macro which disables it to use the default behavior.
+%undefine gomodulesmode
+%endif
+
+# btrfs-progs-devel is not available on RHEL
+%if 0%{?rhel}
+GOTAGS="exclude_graphdriver_btrfs"
+%endif

 # Set the commit hash so that composer can report what source version
 # was used to build it. This has to be set explicitly when calling rpmbuild,
@ -87,8 +104,10 @@ export LDFLAGS="${LDFLAGS} -X 'github.com/osbuild/osbuild-composer/internal/comm
 %endif
 export LDFLAGS="${LDFLAGS} -X 'github.com/osbuild/osbuild-composer/internal/common.RpmVersion=%{name}-%{?epoch:%epoch:}%{version}-%{release}.%{_arch}'"

-%gobuild -o _bin/osbuild-composer %{goipath}/cmd/osbuild-composer
-%gobuild -o _bin/osbuild-worker %{goipath}/cmd/osbuild-worker
+%gobuild ${GOTAGS:+-tags=$GOTAGS} -o _bin/osbuild-composer %{goipath}/cmd/osbuild-composer
+%gobuild ${GOTAGS:+-tags=$GOTAGS} -o _bin/osbuild-worker %{goipath}/cmd/osbuild-worker
+%gobuild ${GOTAGS:+-tags=$GOTAGS} -o _bin/osbuild-jobsite-manager %{goipath}/cmd/osbuild-jobsite-manager
+%gobuild ${GOTAGS:+-tags=$GOTAGS} -o _bin/osbuild-jobsite-builder %{goipath}/cmd/osbuild-jobsite-builder

 make man

@ -107,16 +126,15 @@ export GOPATH=%{gobuilddir}:%{gopath}

 TEST_LDFLAGS="${LDFLAGS:-} -B 0x$(od -N 20 -An -tx1 -w100 /dev/urandom | tr -d ' ')"

-go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-composer-cli-tests %{goipath}/cmd/osbuild-composer-cli-tests
-go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-dnf-json-tests %{goipath}/cmd/osbuild-dnf-json-tests
-go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-weldr-tests %{goipath}/internal/client/
-go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-image-tests %{goipath}/cmd/osbuild-image-tests
-go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-auth-tests %{goipath}/cmd/osbuild-auth-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-manifest-tests %{goipath}/cmd/osbuild-composer-manifest-tests
-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 test -c -tags="integration${GOTAGS:+,$GOTAGS}" -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-composer-cli-tests %{goipath}/cmd/osbuild-composer-cli-tests
+go test -c -tags="integration${GOTAGS:+,$GOTAGS}" -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-dnf-json-tests %{goipath}/cmd/osbuild-dnf-json-tests
+go test -c -tags="integration${GOTAGS:+,$GOTAGS}" -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-weldr-tests %{goipath}/internal/client/
+go test -c -tags="integration${GOTAGS:+,$GOTAGS}" -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-image-tests %{goipath}/cmd/osbuild-image-tests
+go test -c -tags="integration${GOTAGS:+,$GOTAGS}" -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-auth-tests %{goipath}/cmd/osbuild-auth-tests
+go test -c -tags="integration${GOTAGS:+,$GOTAGS}" -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-koji-tests %{goipath}/cmd/osbuild-koji-tests
+go test -c -tags="integration${GOTAGS:+,$GOTAGS}" -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-composer-dbjobqueue-tests %{goipath}/cmd/osbuild-composer-dbjobqueue-tests
+go test -c -tags="integration${GOTAGS:+,$GOTAGS}" -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-service-maintenance-tests %{goipath}/cmd/osbuild-service-maintenance
+go build -tags="integration${GOTAGS:+,$GOTAGS}" -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-mock-openid-provider %{goipath}/cmd/osbuild-mock-openid-provider

 %endif

@ -124,7 +142,8 @@ go build -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-mock-openi
 install -m 0755 -vd                                                %{buildroot}%{_libexecdir}/osbuild-composer
 install -m 0755 -vp _bin/osbuild-composer                          %{buildroot}%{_libexecdir}/osbuild-composer/
 install -m 0755 -vp _bin/osbuild-worker                            %{buildroot}%{_libexecdir}/osbuild-composer/
-install -m 0755 -vp dnf-json                                       %{buildroot}%{_libexecdir}/osbuild-composer/
+install -m 0755 -vp _bin/osbuild-jobsite-manager                   %{buildroot}%{_libexecdir}/osbuild-composer/
+install -m 0755 -vp _bin/osbuild-jobsite-builder                   %{buildroot}%{_libexecdir}/osbuild-composer/

 # Only include repositories for the distribution and release
 install -m 0755 -vd                                                %{buildroot}%{_datadir}/osbuild-composer/repositories
@ -180,7 +199,6 @@ install -m 0755 -vp _bin/osbuild-image-tests                       %{buildroot}%
 install -m 0755 -vp _bin/osbuild-auth-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-manifest-tests           %{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/
@ -196,7 +214,6 @@ install -m 0755 -vp tools/generic_s3_test.sh                       %{buildroot}%
 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/*.sh                                %{buildroot}%{_libexecdir}/tests/osbuild-composer/

@ -251,7 +268,7 @@ install -m 0644 -vp test/data/upgrade8to9/*                       %{buildroot}%{
 %check
 export GOFLAGS="-buildmode=pie"
 %if 0%{?rhel}
-export GOFLAGS+=" -mod=vendor"
+export GOFLAGS+=" -mod=vendor -tags=exclude_graphdriver_btrfs"
 export GOPATH=$PWD/_build:%{gopath}
 # cd inside GOPATH, otherwise go with GO111MODULE=off ignores vendor directory
 cd $PWD/_build/src/%{goipath}
@ -261,13 +278,13 @@ cd $PWD/_build/src/%{goipath}
 %endif

 %post
-%systemd_post osbuild-composer.service osbuild-composer.socket osbuild-composer-api.socket osbuild-remote-worker.socket
+%systemd_post osbuild-composer.service osbuild-composer.socket osbuild-composer-api.socket osbuild-composer-prometheus.socket osbuild-remote-worker.socket

 %preun
-%systemd_preun osbuild-composer.service osbuild-composer.socket osbuild-composer-api.socket osbuild-remote-worker.socket
+%systemd_preun osbuild-composer.service osbuild-composer.socket osbuild-composer-api.socket osbuild-composer-prometheus.socket osbuild-remote-worker.socket

 %postun
-%systemd_postun_with_restart osbuild-composer.service osbuild-composer.socket osbuild-composer-api.socket osbuild-remote-worker.socket
+%systemd_postun_with_restart osbuild-composer.service osbuild-composer.socket osbuild-composer-api.socket osbuild-composer-prometheus.socket osbuild-remote-worker.socket

 %files
 %license LICENSE
@ -276,13 +293,16 @@ cd $PWD/_build/src/%{goipath}
 %{_unitdir}/osbuild-composer.service
 %{_unitdir}/osbuild-composer.socket
 %{_unitdir}/osbuild-composer-api.socket
+%{_unitdir}/osbuild-composer-prometheus.socket
 %{_unitdir}/osbuild-local-worker.socket
 %{_unitdir}/osbuild-remote-worker.socket
 %{_sysusersdir}/osbuild-composer.conf

 %package core
 Summary:    The core osbuild-composer binary
-Requires:   %{name}-dnf-json = %{version}-%{release}
+Requires:   osbuild-depsolve-dnf >= %{min_osbuild_version}
+Provides:   %{name}-dnf-json = %{version}-%{release}
+Obsoletes:  %{name}-dnf-json < %{version}-%{release}

 %description core
 The core osbuild-composer binary. This is suitable both for spawning in containers and by systemd.
@ -295,17 +315,21 @@ 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 >= 80
-Requires:   osbuild-ostree >= 80
-Requires:   osbuild-lvm2 >= 80
-Requires:   osbuild-luks2 >= 80
-Requires:   %{name}-dnf-json = %{version}-%{release}
+Requires:   osbuild >= %{min_osbuild_version}
+Requires:   osbuild-ostree >= %{min_osbuild_version}
+Requires:   osbuild-lvm2 >= %{min_osbuild_version}
+Requires:   osbuild-luks2 >= %{min_osbuild_version}
+Requires:   osbuild-depsolve-dnf >= %{min_osbuild_version}
+Provides:   %{name}-dnf-json = %{version}-%{release}
+Obsoletes:  %{name}-dnf-json < %{version}-%{release}

 %description worker
 The worker for osbuild-composer

 %files worker
 %{_libexecdir}/osbuild-composer/osbuild-worker
+%{_libexecdir}/osbuild-composer/osbuild-jobsite-manager
+%{_libexecdir}/osbuild-composer/osbuild-jobsite-builder
 %{_unitdir}/osbuild-worker@.service
 %{_unitdir}/osbuild-remote-worker@.service

@ -327,25 +351,6 @@ fi
 # 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
-
-# Conflicts with older versions of composer that provide the same files
-# this can be removed when RHEL 8 reaches EOL
-Conflicts: osbuild-composer <= 35
-
-%description dnf-json
-The dnf-json binary used by osbuild-composer and the workers.
-
-%files dnf-json
-%{_libexecdir}/osbuild-composer/dnf-json
-
-%post dnf-json
-# Fix ownership of the rpmmd cache files from previous versions where it was owned by root:root
-if [ -e /var/cache/osbuild-composer/rpmmd ]; then
-    chown -f -R --from root:root _osbuild-composer:_osbuild-composer /var/cache/osbuild-composer/rpmmd
-fi
-
 %if %{with tests} || 0%{?rhel}

 %package tests
@ -417,6 +422,75 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
 %endif

 %changelog
+* Wed Apr 03 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 104-1
+- New upstream release
+
+* Wed Mar 06 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 102-1
+- New upstream release
+
+* Mon Feb 26 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 101-1
+- New upstream release
+
+* Wed Feb 07 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 100-1
+- New upstream release
+
+* Wed Jan 24 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 99-1
+- New upstream release
+
+* Wed Jan 10 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 98-1
+- New upstream release
+
+* Wed Dec 13 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 96-1
+- New upstream release
+
+* Wed Nov 29 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 95-1
+- New upstream release
+
+* Wed Nov 15 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 94-1
+- New upstream release
+
+* Wed Nov 01 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 93-1
+- New upstream release
+
+* Wed Oct 18 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 92-1
+- New upstream release
+
+* Wed Oct 04 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 91-1
+- New upstream release
+
+* Wed Sep 06 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 89-1
+- New upstream release
+
+* Thu Aug 24 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 88-1
+- New upstream release
+
+* Wed Aug 09 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 87-1
+- New upstream release
+
+* Wed Jul 26 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 86-1
+- New upstream release
+
+* Fri Jul 14 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 85-1
+- New upstream release
+
+* Wed Jun 14 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 84-1
+- New upstream release
+
+* Wed May 17 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 82-1
+- New upstream release
+
+* Wed Apr 19 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 80-1
+- New upstream release
+
+* Wed Apr 05 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 79-1
+- New upstream release
+
+* Wed Mar 08 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 77-1
+- New upstream release
+
+* Wed Mar 01 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 76-1
+- New upstream release
+
 * Wed Feb 22 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 75-1
 - New upstream release

@ -441,6 +515,9 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
 * Wed Nov 16 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 68-1
 - New upstream release

+* Thu Nov 03 2022 Tomas Hozza <thozza@redhat.com> - 67-2
+- Fix functional tests to make them pass in RHEL-9.2 gating
+
 * Wed Nov 02 2022 imagebuilder-bots+imagebuilder-bot@redhat.com <imagebuilder-bot> - 67-1
 - New upstream release

@ -450,13 +527,13 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
 * 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
+* Wed Aug 10 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
+* Wed Jul 13 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
@ -465,81 +542,139 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
 * 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
+* Fri May 20 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

-* Tue Mar 01 2022 Ondřej Budai <ondrej@budai.cz> - 46-1
+* Mon Feb 28 2022 Simon Steinbeiss <simon.steinbeiss@redhat.com> - 46-1
 - New upstream release

-* Sat Feb 19 2022 Ondřej Budai <ondrej@budai.cz> - 45-1
+* Fri Feb 18 2022 Ondřej Budai <ondrej@budai.cz> - 45-1
 - New upstream release

-* Mon Feb 14 2022 Thomas Lavocat <tlavocat@redhat.com> - 44-1
+* Fri Feb 11 2022 Thomas Lavocat <tlavocat@redhat.com> - 44-1
 - New upstream release

-* Mon Feb 07 2022 Thomas Lavocat <tlavocat@redhat.com> - 43-1
+* Wed Jan 26 2022 Thomas Lavocat <tlavocat@redhat.com> - 43-1
 - New upstream release

-* Tue Jan 18 2022 Thomas Lavocat <tlavocat@redhat.com> - 42-1
+* Wed Jan 12 2022 Thomas Lavocat <tlavocat@redhat.com> - 42-1
+- New upstream release
+
+* Wed Dec 22 2021 Ondřej Budai <ondrej@budai.cz> - 41-1
 - New upstream release

 * Thu Dec 09 2021 Ondřej Budai <ondrej@budai.cz> - 40-1
 - New upstream release

-* Fri Oct 15 2021 Achilleas Koutsou <achilleas@redhat.com> - 37-1
+* Wed Nov 24 2021 Chloe Kaubisch <chloe.kaubisch@gmail.com> - 39-1
 - New upstream release

-* Fri Oct 15 2021 Achilleas Koutsou <achilleas@redhat.com> - 36-1
+* Fri Nov 12 2021 'Diaa Sami' <'<disami@redhat.com>'> - 38-1
+- New upstream release
+
+* Tue Nov 02 2021 lavocatt - 37-1
+- New upstream release
+
+* Thu Oct 14 2021 Achilleas Koutsou <achilleas@redhat.com> - 36-1
 - New upstream release

 * Mon Aug 30 2021 Tom Gundersen <teg@jklm.no> - 33-1
 - New upstream release

-* Sun Aug 29 2021 Tom Gundersen <teg@jklm.no> - 32-2
+* Sun Aug 29 2021 Tom Gundersen <teg@jklm.no> - 32-1
 - New upstream release

-* Thu Aug 12 2021 Ondřej Budai <ondrej@budai.cz> - 31-1
+* Sun Aug 15 2021 Ondřej Budai <ondrej@budai.cz> - 31-1
+- New upstream release
+
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 30-2
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Fri Jul 02 2021 Ondřej Budai <ondrej@budai.cz> - 30-1
+- New upstream release
+
+* Tue Jun 22 2021 Mohan Boddu <mboddu@redhat.com> - 29-3
+- Rebuilt for RHEL 9 BETA for openssl 3.0
+  Related: rhbz#1971065
+
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 29-2
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Fri Mar 05 2021 Martin Sehnoutka <msehnout@redhat.com> - 29-1
 - New upstream release

 * Sat Feb 20 2021 Martin Sehnoutka <msehnout@redhat.com> - 28-1
 - New upstream release

-* Fri Feb 05 2021 Ondrej Budai <obudai@redhat.com> - 27-1
+* Thu Feb 04 2021 Ondrej Budai <obudai@redhat.com> - 27-1
 - New upstream release

+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 26-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Thu Dec 17 2020 Ondrej Budai <obudai@redhat.com> - 26-2
+- Fix the compatibility with a new golang-github-azure-storage-blob 0.12
+
 * Thu Dec 17 2020 Ondrej Budai <obudai@redhat.com> - 26-1
 - New upstream release

-* Mon Nov 30 2020 Ondrej Budai <obudai@redhat.com> - 25-1
- New upstream release 25 (rhbz#1883481)
+* Thu Nov 19 2020 Ondrej Budai <obudai@redhat.com> - 25-1
+- New upstream release

-* Thu Sep 03 2020 Tom Gundersen <tgunders@redhat.com> - 20.1-1
- New upstream release 20.1 (rhbz#1872370)
+* Thu Nov 12 2020 Ondrej Budai <obudai@redhat.com> - 24-1
+- New upstream release

-* Sun Aug 23 2020 Tom Gundersen <tgunders@redhat.com> - 20-1
- New upstream release 20 (rhbz#1871184 and rhbz#1871179)
+* Fri Nov 06 2020 Ondrej Budai <obudai@redhat.com> - 23-1
+- New upstream release

-* Thu Aug 13 2020 Tom Gundersen <tgunders@redhat.com> - 19-1
- New upstream release 19 (rhbz#1866015 and rhbz#1866013)
+* Fri Oct 16 2020 Ondrej Budai <obudai@redhat.com> - 22-1
+- New upstream release

-* Thu Jul 09 2020 Ondrej Budai <obudai@redhat.com> - 17-1
- New upstream release 17 (rhbz#1831653)
- Obsolete lorax-composer in favor of osbuild-composer (rhbz#1836844)
+* Sun Aug 23 2020 Tom Gundersen <teg@jklm.no> - 20-1
+- New upstream release
+
+* Tue Aug 11 2020 Tom Gundersen <teg@jklm.no> - 19-1
+- New upstream release
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 18-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Wed Jul 22 2020 Ondrej Budai <obudai@redhat.com> - 18-1
+- New upstream release
+
+* Wed Jul 08 2020 Ondrej Budai <obudai@redhat.com> - 17-1
+- New upstream release

 * Mon Jun 29 2020 Ondrej Budai <obudai@redhat.com> - 16-1
- New upstream release 16 (rhbz#1831653)
+- New upstream release

 * Fri Jun 12 2020 Ondrej Budai <obudai@redhat.com> - 15-1
- New upstream release 15 (rhbz#1831653)
+- New upstream release

 * Thu Jun 04 2020 Ondrej Budai <obudai@redhat.com> - 14-1
- New upstream release 14 (rhbz#1831653)
+- New upstream release
+
+* Fri May 29 2020 Ondrej Budai <obudai@redhat.com> - 13-2
+- Add missing osbuild-ostree dependency

 * Thu May 28 2020 Ondrej Budai <obudai@redhat.com> - 13-1
- New upstream release 13 (rhbz#1831653)
+- New upstream release

-* Tue May 05 2020 Ondrej Budai <obudai@redhat.com> - 11-1
- Initial package (renamed from golang-github-osbuild-composer) (rhbz#1771887)
+* Thu May 14 2020 Ondrej Budai <obudai@redhat.com> - 12-1
+- New upstream release
+
+* Wed Apr 29 2020 Ondrej Budai <obudai@redhat.com> - 11-1
+- New upstream release
+
+* Wed Apr 15 2020 Ondrej Budai <obudai@redhat.com> - 10-1
+- New upstream release
+
+* Wed Apr 01 2020 Ondrej Budai <obudai@redhat.com> - 9-1
+- New upstream release
+
+* Mon Mar 23 2020 Ondrej Budai <obudai@redhat.com> - 8-1
+- Initial package (renamed from golang-github-osbuild-composer)
--- a/plans/integration-tests.fmf
+++ b/plans/integration-tests.fmf
@ -0,0 +1,8 @@
+summary: Run integration tests
+prepare:
+    how: install
+    package:
+    - osbuild-composer-tests
+execute:
+    script: ./tests/scripts/run_tests.sh ./tests/
+    duration: 24h
--- a/plans/unit-tests.fmf
+++ b/plans/unit-tests.fmf
@ -0,0 +1,6 @@
+summary: Run unit tests from source
+discover:
+    how: fmf
+    dist-git-source: true
+execute:
+    how: tmt
--- a/1
+++ b/1
@ -0,0 +1 @@
+SHA512 (osbuild-composer-104.tar.gz) = 4d57ed2ac4600fb68d833542d5435997243b888c717954b49a0064d0a4e762b74e802382b3024914ced778f4a6876ff54325c735fb2e61232fed822a308f1f30
--- a/tests/scripts/run_tests.sh
+++ b/tests/scripts/run_tests.sh
@ -0,0 +1,19 @@
+#!/bin/bash
+set -euxo pipefail
+
+TOPDIR=$1
+
+# Print some information about the machine
+df -h
+free -h
+rpm -qa
+find /etc/yum.repos.d -type f -print -exec cat {} \;
+
+# Run only basic smoke tests.
+# Our test-suite is currently very thorough and it builds a lot of images.
+# On some runs, TFT was able to build one image for 25 minutes. Our test
+# suite builds more than 25 images which means that the full test-suite
+# can run for more than 10 hours. That's just too slow and since we are also
+# able to run downstream tests on our much faster upstream infrastructure.
+# I think that it's enough to do just smoke tests here.
+/usr/libexec/tests/osbuild-composer/base_tests.sh
--- a/tests/unit.fmf
+++ b/tests/unit.fmf
@ -0,0 +1,5 @@
+summary: Run unit tests
+require:
+  - golang
+test: cd ../osbuild-composer-*/ && sudo dnf builddep -y osbuild-composer.spec && GOFLAGS="-mod=vendor -tags=exclude_graphdriver_btrfs" go test ./...
+duration: 1h
				`@ -0,0 +1 @@`
				`SHA512 (osbuild-composer-104.tar.gz) = 4d57ed2ac4600fb68d833542d5435997243b888c717954b49a0064d0a4e762b74e802382b3024914ced778f4a6876ff54325c735fb2e61232fed822a308f1f30`