Merge pull request #4870 from lsm5/packit-downstream

[CI:BUILD] Packit: add jobs for downstream Fedora package builds

.packit.yaml

@@ -4,8 +4,11 @@
 
 # Build targets can be found at:
 # https://copr.fedorainfracloud.org/coprs/rhcontainerbot/packit-builds/
+# and
+# https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next/
 
-specfile_path: buildah.spec
+specfile_path: rpm/buildah.spec
+upstream_tag_template: v{version}
 
 jobs:
   - &copr
@@ -16,15 +19,28 @@ jobs:
     enable_net: true
     srpm_build_deps:
       - make
-      - rpkg
-    actions:
-      post-upstream-clone:
-        - "rpkg spec --outdir ./"
-      fix-spec-file:
-        - "bash .packit.sh"
 
   - <<: *copr
     # Run on commit to main branch
     trigger: commit
     branch: main
     project: podman-next
+
+  - job: propose_downstream
+    trigger: release
+    update_release: false
+    dist_git_branches:
+      - fedora-all
+    actions:
+        pre-sync:
+          - "bash rpm/update-spec-provides.sh"
+
+  - job: koji_build
+    trigger: commit
+    dist_git_branches:
+      - fedora-all
+
+  - job: bodhi_update
+    trigger: commit
+    dist_git_branches:
+      - fedora-branched # rawhide updates are created automatically

buildah.spec.rpkg → rpm/buildah.spec

@@ -1,70 +1,76 @@
-# For automatic rebuilds in COPR
-
-# The following tag is to get correct syntax highlighting for this file in vim text editor
-# vim: syntax=spec
-
-# Any additinoal comments should go below this line or else syntax highlighting
-# may not work.
-
-# CAUTION: This is not a replacement for RPMs provided by your distro.
-# Only intended to build and test the latest unreleased changes.
-
 %global with_debug 1
 
-# RHEL 8's default %%gobuild macro doesn't account for the BUILDTAGS variable, so we
-# set it separately here and do not depend on RHEL 8's go-srpm-macros package.
-%if !0%{?fedora} && 0%{?rhel} <= 8
-%define gobuild(o:) GO111MODULE=off go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl ${BUILDTAGS:-}" -ldflags "-linkmode=external -compressdwarf=false ${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'" -a -v -x %{?**};
-%endif
-
 %if 0%{?with_debug}
 %global _find_debuginfo_dwz_opts %{nil}
 %global _dwz_low_mem_die_limit 0
 %else
-%global debug_package %{nil}
+%global debug_package   %{nil}
+%endif
+
+%if %{defined rhel} && 0%{?rhel} == 8
+# RHEL 8's default %%gobuild macro doesn't account for the BUILDTAGS variable, so we
+# set it separately here and do not depend on RHEL 8's go-srpm-macros package.
+%define gobuild(o:) go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl ${BUILDTAGS:-}" -ldflags "-linkmode=external -compressdwarf=false ${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'" -a -v -x %{?**};
 %endif
 
-%global provider github
-%global provider_tld com
-%global project containers
-%global repo %{name}
-# https://github.com/containers/%%{name}
-%global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
-%global git0 https://%{import_path}
-
-Name: {{{ git_dir_name }}}
-Epoch: 101
-Version: {{{ git_dir_version }}}
-Release: 1%{?dist}
-Summary: Manage Pods, Containers and Container Images
-License:   ASL 2.0
-URL:        https://github.com/containers/buildah
-VCS:        {{{ git_dir_vcs }}}
-Source:     {{{ git_dir_pack }}}
+%global gomodulesmode GO111MODULE=on
+
+%if 0%{defined fedora}
+%define build_with_btrfs 1
+%endif
+
+%global git0 https://github.com/containers/%{name}
+
+Name: buildah
+# Set different Epoch for copr
+%if %{defined copr_username}
+Epoch: 102
+%endif
+# DO NOT TOUCH the Version string!
+# The TRUE source of this specfile is:
+# https://github.com/containers/skopeo/blob/main/rpm/skopeo.spec
+# If that's what you're reading, Version must be 0, and will be updated by Packit for
+# copr and koji builds.
+# If you're reading this on dist-git, the version is automatically filled in by Packit.
+Version: 0
+License: Apache-2.0 and BSD-2-Clause and BSD-3-Clause and ISC and MIT and MPL-2.0
+Release: %autorelease
+%if %{defined golang_arches_future}
+ExclusiveArch: %{golang_arches_future}
+%else
+ExclusiveArch: aarch64 ppc64le s390x x86_64
+%endif
+Summary: A command line tool used for creating OCI Images
+URL: https://%{name}.io
+# Tarball fetched from upstream
+Source: %{git0}/archive/v%{version}.tar.gz
+BuildRequires: go-md2man
+BuildRequires: device-mapper-devel
 BuildRequires: git-core
-BuildRequires: golang
+BuildRequires: golang >= 1.16.6
 BuildRequires: glib2-devel
 BuildRequires: glibc-static
-BuildRequires: go-md2man
-%if 0%{?fedora} || 0%{?rhel} >= 9
+%if !%{defined gobuild}
 BuildRequires: go-rpm-macros
 %endif
 BuildRequires: gpgme-devel
 BuildRequires: libassuan-devel
 BuildRequires: make
 BuildRequires: ostree-devel
-BuildRequires: shadow-utils-subid-devel
-%if 0%{?fedora} && ! 0%{?rhel}
+%if %{defined build_with_btrfs}
 BuildRequires: btrfs-progs-devel
 %endif
-Requires: containers-common-extra >= 4:1-78
-%if 0%{?rhel}
-BuildRequires: libseccomp-devel
-%else
+BuildRequires: shadow-utils-subid-devel
+Requires: containers-common-extra
+%if %{defined fedora}
 BuildRequires: libseccomp-static
+%else
+BuildRequires: libseccomp-devel
 %endif
-Requires: libseccomp
+Requires: libseccomp >= 2.4.1-0
 Suggests: cpp
+# DO NOT DELETE BELOW LINE - used for updating downstream goimports
+# vendored libraries
 
 %description
 The %{name} package provides a command line tool which can be used to
@@ -73,10 +79,11 @@ or
 * create a working container from an image as a starting point
 * mount/umount a working container's root file system for manipulation
 * save container's root file system layer to create a new image
-* delete a working container or an image.
+* delete a working container or an image
 
 %package tests
 Summary: Tests for %{name}
+
 Requires: %{name} = %{version}-%{release}
 Requires: bats
 Requires: bzip2
@@ -94,12 +101,12 @@ Requires: git-daemon
 This package contains system tests for %{name}
 
 %prep
-{{{ git_dir_setup_macro }}}
+%autosetup -Sgit -n %{name}-%{version}
 
 %build
 %set_build_flags
-export GOPATH=$(pwd)/_build:$(pwd)
 export CGO_CFLAGS=$CFLAGS
+
 # These extra flags present in $CFLAGS have been skipped for now as they break the build
 CGO_CFLAGS=$(echo $CGO_CFLAGS | sed 's/-flto=auto//g')
 CGO_CFLAGS=$(echo $CGO_CFLAGS | sed 's/-Wp,D_GLIBCXX_ASSERTIONS//g')
@@ -109,41 +116,33 @@ CGO_CFLAGS=$(echo $CGO_CFLAGS | sed 's/-specs=\/usr\/lib\/rpm\/redhat\/redhat-an
 export CGO_CFLAGS+=" -m64 -mtune=generic -fcf-protection=full"
 %endif
 
-mkdir _build
-pushd _build
-mkdir -p src/%{provider}.%{provider_tld}/%{project}
-ln -s $(dirs +1 -l) src/%{import_path}
-popd
-
-mv vendor src
-
 export CNI_VERSION=`grep '^# github.com/containernetworking/cni ' src/modules.txt | sed 's,.* ,,'`
 export LDFLAGS="-X main.buildInfo=`date +%s` -X main.cniVersion=${CNI_VERSION}"
 
-export BUILDTAGS="$(hack/libsubid_tag.sh) seccomp selinux $(hack/systemd_tag.sh) exclude_graphdriver_devicemapper"
-%if 0%{?rhel}
-export BUILDTAGS="$BUILDTAGS exclude_graphdriver_btrfs btrfs_noversion"
+export BUILDTAGS='seccomp exclude_graphdriver_devicemapper $(hack/systemd_tag.sh) $hack/libsubid_tag.sh)'
+%if !%{defined build_with_btrfs}
+export BUILDTAGS+=' btrfs_noversion exclude_graphdriver_btrfs'
 %endif
 
-%gobuild -o bin/%{name} %{import_path}/cmd/%{name}
-%gobuild -o bin/imgtype %{import_path}/tests/imgtype
-%gobuild -o bin/copy    %{import_path}/tests/copy
+%gobuild -o bin/%{name} ./cmd/%{name}
+%gobuild -o bin/imgtype ./tests/imgtype
+%gobuild -o bin/copy ./tests/copy
+%gobuild -o bin/tutorial ./tests/tutorial
 GOMD2MAN=go-md2man %{__make} -C docs
 
-# This will copy the files generated by the `make` command above into
-# the installable rpm package.
 %install
-export GOPATH=$(pwd)/_build:$(pwd):%{gopath}
+export GOPATH=$(pwd)/_build:$(pwd)
 make DESTDIR=%{buildroot} PREFIX=%{_prefix} install install.completions
 make DESTDIR=%{buildroot} PREFIX=%{_prefix} -C docs install
 
 install -d -p %{buildroot}/%{_datadir}/%{name}/test/system
 cp -pav tests/. %{buildroot}/%{_datadir}/%{name}/test/system
 cp bin/imgtype %{buildroot}/%{_bindir}/%{name}-imgtype
 cp bin/copy    %{buildroot}/%{_bindir}/%{name}-copy
+cp bin/tutorial %{buildroot}/%{_bindir}/%{name}-tutorial
 
-rm -f %{buildroot}%{_mandir}/man5/{Containerfile.5*,containerignore.5*}
-
+#define license tag if not already defined
+%{!?_licensedir:%global license %doc}
 
 %files
 %license LICENSE
@@ -158,7 +157,16 @@ rm -f %{buildroot}%{_mandir}/man5/{Containerfile.5*,containerignore.5*}
 %license LICENSE
 %{_bindir}/%{name}-imgtype
 %{_bindir}/%{name}-copy
+%{_bindir}/%{name}-tutorial
 %{_datadir}/%{name}/test
 
 %changelog
-{{{ git_dir_changelog }}}
+%if %{defined autochangelog}
+%autochangelog
+%else
+# NOTE: This changelog will be visible on CentOS 8 Stream builds
+# Other envs are capable of handling autochangelog
+* Fri Jun 16 2023 RH Container Bot <rhcontainerbot@fedoraproject.org>
+- Placeholder changelog for envs that are not autochangelog-ready.
+- Contact upstream if you need to report an issue with the build.
+%endif

rpm/update-spec-provides.sh

@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+# This script will update the goimports in the rpm spec for downstream fedora
+# packaging, via the `propose-downstream` packit action.
+# The goimports don't need to be present upstream.
+
+set -eo pipefail
+
+PACKAGE=buildah
+# script is run from git root directory
+SPEC_FILE=rpm/$PACKAGE.spec
+
+sed -i '/Provides: bundled(golang.*/d' $SPEC_FILE
+
+GO_IMPORTS=$(golist --imported --package-path github.com/containers/$PACKAGE --skip-self | sort -u | xargs -I{} echo "Provides: bundled(golang({}))")
+
+awk -v r="$GO_IMPORTS" '/^# vendored libraries/ {print; print r; next} 1' $SPEC_FILE > temp && mv temp $SPEC_FILE