From f20af68e664d0760cfb992e675a7f65276605597 Mon Sep 17 00:00:00 2001 From: Packit Service Date: Thu, 9 Dec 2021 17:30:48 +0000 Subject: [PATCH] [packit] 40 upstream release Upstream tag: v40 Upstream commit: df5074f5 Signed-off-by: Packit Service --- .gitignore | 1 + .packit.yaml | 33 ++++++++++++++++++++++++++++- README.packit | 2 +- osbuild-composer.spec | 48 +++++++++++++++++++++++++++++++++++++++---- sources | 2 +- 5 files changed, 79 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index d63d9ce..aee01f4 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ /osbuild-composer-37.tar.gz /osbuild-composer-38.tar.gz /osbuild-composer-39.tar.gz +/osbuild-composer-40.tar.gz diff --git a/.packit.yaml b/.packit.yaml index 292d178..992416a 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -22,4 +22,35 @@ jobs: trigger: release metadata: dist_git_branches: - - fedora-all \ No newline at end of file + - fedora-all +- job: copr_build + trigger: pull_request + metadata: + targets: + - centos-stream-8-aarch64 + - centos-stream-8-x86_64 + - centos-stream-9-aarch64 + - centos-stream-9-x86_64 + - epel-8-aarch64 + - epel-8-x86_64 + - fedora-all-aarch64 + #- fedora-all-s390x # go binary segfaults in the emulated environment + - fedora-all-ppc64le + - fedora-all +- job: copr_build + trigger: commit + metadata: + branch: main + owner: "@osbuild" # copr repo namespace + project: osbuild-composer # copr repo name so you can consume the builds + targets: + - centos-stream-8-aarch64 + - centos-stream-8-x86_64 + - centos-stream-9-aarch64 + - centos-stream-9-x86_64 + - epel-8-aarch64 + - epel-8-x86_64 + - fedora-all-aarch64 + #- fedora-all-s390x # go binary segfaults in the emulated environment + - fedora-all-ppc64le + - fedora-all diff --git a/README.packit b/README.packit index 700d824..cf5d593 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.41.1.dev6+gbeb4fb0. +The file was generated using packit 0.42.1.dev18+g5374158. diff --git a/osbuild-composer.spec b/osbuild-composer.spec index 47c5950..896f4d8 100644 --- a/osbuild-composer.spec +++ b/osbuild-composer.spec @@ -4,7 +4,7 @@ %global goipath github.com/osbuild/osbuild-composer -Version: 39 +Version: 40 %gometa @@ -113,6 +113,7 @@ sed -i "s/openapi3.Swagger/openapi3.T/;s/openapi3.NewSwaggerLoader().LoadSwagger %endif %build +export GOFLAGS="-buildmode=pie" %if 0%{?rhel} GO_BUILD_PATH=$PWD/_build install -m 0755 -vd $(dirname $GO_BUILD_PATH/src/%{goipath}) @@ -121,7 +122,7 @@ cd $GO_BUILD_PATH/src/%{goipath} install -m 0755 -vd _bin export PATH=$PWD/_bin${PATH:+:$PATH} export GOPATH=$GO_BUILD_PATH:%{gopath} -export GOFLAGS=-mod=vendor +export GOFLAGS+=" -mod=vendor" %endif # Set the commit hash so that composer can report what source version @@ -130,7 +131,7 @@ export GOFLAGS=-mod=vendor %if %{?commit:1}0 export LDFLAGS="${LDFLAGS} -X 'github.com/osbuild/osbuild-composer/internal/common.GitRev=%{commit}'" %endif -export LDFLAGS="${LDFLAGS} -X 'github.com/osbuild/osbuild-composer/internal/common.RpmVersion=%{name}-%{epoch}:%{version}-%{release}.%{_arch}'" +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 @@ -283,8 +284,9 @@ install -m 0644 -vp internal/jobqueue/dbjobqueue/schemas/* %{buildroot}%{_d %endif %check +export GOFLAGS="-buildmode=pie" %if 0%{?rhel} -export GOFLAGS=-mod=vendor +export GOFLAGS+=" -mod=vendor" export GOPATH=$PWD/_build:%{gopath} # cd inside GOPATH, otherwise go with GO111MODULE=off ignores vendor directory cd $PWD/_build/src/%{goipath} @@ -441,6 +443,44 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c %endif %changelog +* Thu Dec 09 2021 Packit Service - 40-1 +CHANGES WITH 40: +---------------- + * Regression test fixes (#2109) + * store: set RHSM when initialising SourceConfig with a repo (#2105) + * spec: build all binaries with PIE (#2102) + * Job metrics (#2080) + * tests: Fix several permission and koji failures (#2099) + * templates: Max concurrent requests is required for the maintenance job (#2107) + * templates: CronJob is part of the batch/v1 api (#2104) + * generate-all-test-cases: add `--build-rpms` option (#2098) + * templates: Add maintenance cronjob (#2100) + * Use PackIt for building RPMs in COPR for PRs and commits to `main` (#2094) + * Image Builder Composer - Grafana dashboard Updates (#2089) + * Cloud API: Support more image types as S3 objects (#2081) + * osbuild-service-maintenance: Clean up expired images (#2074) + * cloudapi/v2: No ObjectReference in request bodies (#2042) + * distro/rhel90: enable edge-simplified-installer image type (#2015) + * ci: Install gssapi/gssapi.h for Coverity Scan (#2087) + * 8.5 runners (#2079) + * RHEL-9.0: Install TuneD by default and stop using `@core` package group (#2084) + * Build a worker AMI using Schutzbot (#2068) + * osbuild2: update cloud-init stage with new options (#2051) + * tests: Small updates to docs (#2011) + * api/koji: fix /compose/log route (#2078) + * ci: make some jobs interruptible (#2061) + * tests/nightly: Re-enable satellite regression test on nightly composes (#2052) + * test: cloud cleaner aws s3 (#2005) + * rpmmd: Reload subscriptions (#2067) + * Two minor logging improvements (#2063) + * terraform: update to use the new instance type (#2065) + * spec: add epoch to nevra only if it's set (#2060) + +Contributions from: Achilleas Koutsou, Alex Njaastad, Alexander Todorov, Chloe Kaubisch, Gianluca Zuccarelli, Jakub Rusz, Juan Abia, Martin Sehnoutka, Ondřej Budai, Sanne Raymaekers, Tomas Hozza + +— Liberec, 2021-12-09 + + * Wed Nov 24 2021 Packit Service - 39-1 CHANGES WITH 39: ---------------- diff --git a/sources b/sources index 3bede98..600b940 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (osbuild-composer-39.tar.gz) = dd515c457a3f49c70752f29ff4f098ca7060d9a969d0ff94d9bac5b4aab7961796a37b9779b710d07e689adc089398f74d792c550208159b15b8ea17f31c9a85 +SHA512 (osbuild-composer-40.tar.gz) = 7f469afcfda236dcf02db36792bac0ce27120aff6e0b7b9876c4faaca54af553f04b1b128e958dead9587df7a58c972cc8ece91e04d272caca787a2e64887647