From 47b67cbbfb74fde41d568fbe1d10d8e59888ec0c Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Thu, 28 Mar 2024 12:38:22 +0100 Subject: [PATCH] skopeo-1.15.0-1.el10 - Sync with RHEL9 - Resolves: RHEL-30637 Signed-off-by: Jindrich Novy --- .gitignore | 317 +--------------------- .packit.yaml | 59 ---- README.packit | 3 - gating.yaml | 15 +- skopeo.spec | 163 ++++------- sources | 2 +- tests/roles/bats_installed/tasks/main.yml | 12 + tests/test_skopeo.yml | 3 +- 8 files changed, 79 insertions(+), 495 deletions(-) delete mode 100644 .packit.yaml delete mode 100644 README.packit create mode 100644 tests/roles/bats_installed/tasks/main.yml diff --git a/.gitignore b/.gitignore index 36e520c..f6a3a77 100644 --- a/.gitignore +++ b/.gitignore @@ -1,316 +1 @@ -/skopeo-98aca9c.tar.gz -/skopeo-3eefe21.tar.gz -/skopeo-30db2ad.tar.gz -/skopeo-82b121c.tar.gz -/skopeo-8094910.tar.gz -/skopeo-015f1c8.tar.gz -/skopeo-9e971b4.tar.gz -/skopeo-ffe92ed.tar.gz -/skopeo-362bfc5.tar.gz -/skopeo-d830391.tar.gz -/skopeo-550a480.tar.gz -/skopeo-2b3af4a.tar.gz -/skopeo-0224d8c.tar.gz -/skopeo-e802625.tar.gz -/skopeo-0b73154.tar.gz -/skopeo-d5e34c1.tar.gz -/skopeo-5d24b67.tar.gz -/skopeo-1bbd87f.tar.gz -/skopeo-a41cd0a.tar.gz -/skopeo-875dd2e.tar.gz -/skopeo-28d4e08.tar.gz -/skopeo-dd2c3e3.tar.gz -/skopeo-7fd6f66.tar.gz -/skopeo-2e8377a.tar.gz -/skopeo-93876ac.tar.gz -/skopeo-0270e56.tar.gz -/skopeo-7add6fc.tar.gz -/skopeo-28080c8.tar.gz -/skopeo-ab2bc6e.tar.gz -/skopeo-1f11b8b.tar.gz -/skopeo-c4808f0.tar.gz -/skopeo-79225f2.tar.gz -/skopeo-2d04db9.tar.gz -/skopeo-7e9a664.tar.gz -/skopeo-ca3bff6.tar.gz -/skopeo-5c61108.tar.gz -/skopeo-f9baaa6.tar.gz -/skopeo-0144aa8.tar.gz -/skopeo-6e23a32.tar.gz -/skopeo-196bc48.tar.gz -/skopeo-ae64ff7.tar.gz -/skopeo-e3034e1.tar.gz -/skopeo-e814f96.tar.gz -/skopeo-5aa217f.tar.gz -/skopeo-761a681.tar.gz -/skopeo-fbc2e4f.tar.gz -/skopeo-41d8dd8.tar.gz -/skopeo-a51e38e.tar.gz -/skopeo-ecd675e.tar.gz -/skopeo-05212df.tar.gz -/skopeo-3e98377.tar.gz -/skopeo-17bea86.tar.gz -/skopeo-f7c608e.tar.gz -/skopeo-42b01df.tar.gz -/skopeo-bba2874.tar.gz -/skopeo-b329dd0.tar.gz -/skopeo-b8b9913.tar.gz -/skopeo-fee5981.tar.gz -/skopeo-932b037.tar.gz -/skopeo-2134209.tar.gz -/skopeo-2031e17.tar.gz -/skopeo-0490018.tar.gz -/skopeo-94728fb.tar.gz -/skopeo-d93a581.tar.gz -/skopeo-0975497.tar.gz -/skopeo-854f766.tar.gz -/skopeo-c73bcba.tar.gz -/skopeo-81c5e94.tar.gz -/skopeo-18ee5f8.tar.gz -/skopeo-e255ccc.tar.gz -/skopeo-2af7114.tar.gz -/skopeo-0fa335c.tar.gz -/skopeo-565dbf3.tar.gz -/skopeo-5f45112.tar.gz -/skopeo-b58088a.tar.gz -/skopeo-8a9641c.tar.gz -/skopeo-2ad9ae5.tar.gz -/skopeo-19025f5.tar.gz -/skopeo-65b3aa9.tar.gz -/skopeo-bf8089c.tar.gz -/skopeo-202c1ea.tar.gz -/skopeo-c040b28.tar.gz -/skopeo-44bc4a9.tar.gz -/skopeo-ee9e9df.tar.gz -/skopeo-481bb94.tar.gz -/skopeo-1e2d6f6.tar.gz -/skopeo-c4b0c7c.tar.gz -/skopeo-9019e27.tar.gz -/skopeo-18f0e1e.tar.gz -/skopeo-5ae6b16.tar.gz -/skopeo-7eb5f39.tar.gz -/skopeo-fa6e580.tar.gz -/skopeo-881edbf.tar.gz -/skopeo-f72e39f.tar.gz -/skopeo-5b0a789.tar.gz -/skopeo-5f9a6ea.tar.gz -/skopeo-4b6a5da.tar.gz -/skopeo-8057da7.tar.gz -/skopeo-a263b35.tar.gz -/skopeo-153520e.tar.gz -/skopeo-02432cf.tar.gz -/skopeo-10d0ebb.tar.gz -/skopeo-75b7d1e.tar.gz -/skopeo-1094c7d.tar.gz -/skopeo-307d9c2.tar.gz -/skopeo-332bb45.tar.gz -/skopeo-24f4f82.tar.gz -/skopeo-39540db.tar.gz -/skopeo-34ab4c4.tar.gz -/skopeo-912b7e1.tar.gz -/skopeo-ce6ec77.tar.gz -/skopeo-2bfa895.tar.gz -/skopeo-73248bd.tar.gz -/skopeo-3ed6e83.tar.gz -/skopeo-9c402f3.tar.gz -/skopeo-e8d49d6.tar.gz -/skopeo-407f2e9.tar.gz -/skopeo-5291aac.tar.gz -/skopeo-c3e6b4f.tar.gz -/skopeo-8652b65.tar.gz -/skopeo-e955849.tar.gz -/skopeo-763e488.tar.gz -/skopeo-4489ddd.tar.gz -/skopeo-7cbb8ad.tar.gz -/skopeo-7a0a8c2.tar.gz -/skopeo-b541fef.tar.gz -/skopeo-7170702.tar.gz -/skopeo-12865fd.tar.gz -/skopeo-7fee7d5.tar.gz -/skopeo-e31d5a0.tar.gz -/skopeo-501452a.tar.gz -/skopeo-a6f5ef1.tar.gz -/skopeo-018a010.tar.gz -/skopeo-eb199dc.tar.gz -/skopeo-6db5626.tar.gz -/skopeo-bd20786.tar.gz -/skopeo-3e9d8ae.tar.gz -/skopeo-5d512e2.tar.gz -/skopeo-8fa3326.tar.gz -/skopeo-71a8ff0.tar.gz -/skopeo-6ac3dce.tar.gz -/skopeo-9d63c7c.tar.gz -/skopeo-9d21b48.tar.gz -/skopeo-101901a.tar.gz -/skopeo-2d91b93.tar.gz -/skopeo-2415f3f.tar.gz -/skopeo-b230a50.tar.gz -/skopeo-e7a7f01.tar.gz -/skopeo-1ddb736.tar.gz -/skopeo-42f68c1.tar.gz -/skopeo-a6ab229.tar.gz -/skopeo-8936e76.tar.gz -/skopeo-71a14d7.tar.gz -/skopeo-4ca9b13.tar.gz -/skopeo-2af1726.tar.gz -/skopeo-fbf0612.tar.gz -/skopeo-0d9939d.tar.gz -/skopeo-a214a30.tar.gz -/skopeo-dcaee94.tar.gz -/skopeo-91a88de.tar.gz -/skopeo-96353f2.tar.gz -/skopeo-3a94432.tar.gz -/skopeo-8b4b954.tar.gz -/skopeo-a2c1d46.tar.gz -/skopeo-c6b488a.tar.gz -/skopeo-f9b0d93.tar.gz -/skopeo-161ef5a.tar.gz -/skopeo-827293a.tar.gz -/skopeo-0bd78a0.tar.gz -/skopeo-b70dfae.tar.gz -/skopeo-091f924.tar.gz -/skopeo-6b78619.tar.gz -/skopeo-96bd4a0.tar.gz -/skopeo-233e61c.tar.gz -/skopeo-7815c8a.tar.gz -/skopeo-ba8cbf5.tar.gz -/skopeo-ac6b871.tar.gz -/skopeo-6182aa3.tar.gz -/skopeo-ee72e80.tar.gz -/skopeo-840c487.tar.gz -/skopeo-dc5f68f.tar.gz -/skopeo-f63685f.tar.gz -/skopeo-6e295a2.tar.gz -/skopeo-6284ceb.tar.gz -/skopeo-2fa7b99.tar.gz -/skopeo-29eec32.tar.gz -/skopeo-89fb89a.tar.gz -/skopeo-494d237.tar.gz -/skopeo-153f18d.tar.gz -/skopeo-6252c22.tar.gz -/skopeo-62fd5a7.tar.gz -/skopeo-5e88eb5.tar.gz -/skopeo-c052ed7.tar.gz -/skopeo-78d2f67.tar.gz -/skopeo-baeaad6.tar.gz -/skopeo-0f94dbc.tar.gz -/skopeo-0c2c7f4.tar.gz -/skopeo-ea10e61.tar.gz -/skopeo-88c8c47.tar.gz -/skopeo-5d5756c.tar.gz -/skopeo-87484a1.tar.gz -/skopeo-a13b581.tar.gz -/skopeo-c4998eb.tar.gz -/skopeo-ae26454.tar.gz -/skopeo-662f9ac.tar.gz -/skopeo-23cb1b7.tar.gz -/skopeo-5dd09d7.tar.gz -/skopeo-45a9efb.tar.gz -/skopeo-12ab19f.tar.gz -/skopeo-bbd800f.tar.gz -/skopeo-77293ff.tar.gz -/skopeo-8151b89.tar.gz -/skopeo-44beab6.tar.gz -/skopeo-6dabefa.tar.gz -/skopeo-d8bc8b6.tar.gz -/skopeo-027d7e4.tar.gz -/skopeo-4cc72b9.tar.gz -/skopeo-10da9f7.tar.gz -/skopeo-362f70b.tar.gz -/skopeo-ceaee44.tar.gz -/skopeo-32e2425.tar.gz -/skopeo-1a3ae14.tar.gz -/skopeo-11b4fd3.tar.gz -/skopeo-4ad2c75.tar.gz -/skopeo-2342171.tar.gz -/skopeo-7fee912.tar.gz -/skopeo-0f4dc80.tar.gz -/skopeo-c88576b.tar.gz -/skopeo-42e9121.tar.gz -/skopeo-1b813f8.tar.gz -/skopeo-5b8fe7f.tar.gz -/skopeo-ed32180.tar.gz -/skopeo-4aaa9b4.tar.gz -/skopeo-4769dd0.tar.gz -/skopeo-6294875.tar.gz -/skopeo-342b839.tar.gz -/skopeo-84232cf.tar.gz -/skopeo-81535c5.tar.gz -/skopeo-c4fb936.tar.gz -/skopeo-b0da056.tar.gz -/skopeo-ac07bf2.tar.gz -/skopeo-beadcbb.tar.gz -/skopeo-2e90a8a.tar.gz -/skopeo-3156212.tar.gz -/skopeo-ef6f46a.tar.gz -/skopeo-0d0a97e.tar.gz -/skopeo-efc0170.tar.gz -/skopeo-a3c21f2.tar.gz -/skopeo-77a2e08.tar.gz -/skopeo-a9e9bdc.tar.gz -/skopeo-f3c8d26.tar.gz -/skopeo-3375a90.tar.gz -/skopeo-55b9782.tar.gz -/skopeo-e0ba05a.tar.gz -/skopeo-aff1b62.tar.gz -/skopeo-1c4b0fc.tar.gz -/skopeo-e224b78.tar.gz -/skopeo-6fa6342.tar.gz -/skopeo-15f0d5c.tar.gz -/skopeo-be60097.tar.gz -/skopeo-2c8655e.tar.gz -/skopeo-61b62f9.tar.gz -/skopeo-b7bf15b.tar.gz -/skopeo-663fe44.tar.gz -/skopeo-6cbb0c4.tar.gz -/skopeo-035eb33.tar.gz -/skopeo-3d1d297.tar.gz -/skopeo-f5a028e.tar.gz -/skopeo-6b41287.tar.gz -/skopeo-0717014.tar.gz -/skopeo-060fe4b.tar.gz -/skopeo-c84fc7d.tar.gz -/skopeo-ad9f1d7.tar.gz -/skopeo-ce4304a.tar.gz -/skopeo-a1a8692.tar.gz -/skopeo-5e13a55.tar.gz -/skopeo-b10d3e4.tar.gz -/skopeo-0faf160.tar.gz -/skopeo-4e57679.tar.gz -/skopeo-5af5f8a.tar.gz -/skopeo-8efffce.tar.gz -/skopeo-714ffe1.tar.gz -/skopeo-b9661b2.tar.gz -/skopeo-a07f1e0.tar.gz -/skopeo-ec13aa6.tar.gz -/skopeo-dde3e75.tar.gz -/skopeo-513a524.tar.gz -/skopeo-5f8ec87.tar.gz -/skopeo-2fee990.tar.gz -/skopeo-ccdaf6e.tar.gz -/skopeo-8a1214a.tar.gz -/v1.3.1.tar.gz -/v1.4.0.tar.gz -/v1.4.1.tar.gz -/v1.5.0.tar.gz -/v1.5.1.tar.gz -/v1.5.2.tar.gz -/v1.6.0.tar.gz -/v1.6.1.tar.gz -/v1.7.0.tar.gz -/v1.8.0.tar.gz -/v1.9.0.tar.gz -/v1.9.1.tar.gz -/v1.9.2.tar.gz -/v1.10.0.tar.gz -/v1.11.0.tar.gz -/v1.11.1.tar.gz -/v1.11.2.tar.gz -/v1.12.0.tar.gz -/v1.13.0.tar.gz -/v1.13.1.tar.gz -/v1.13.2.tar.gz -/v1.13.3.tar.gz -/v1.14.0.tar.gz -/v1.14.1.tar.gz -/v1.14.2.tar.gz +/*.tar.gz diff --git a/.packit.yaml b/.packit.yaml deleted file mode 100644 index 6947473..0000000 --- a/.packit.yaml +++ /dev/null @@ -1,59 +0,0 @@ ---- -# See the documentation for more information: -# https://packit.dev/docs/configuration/ - -# NOTE: The Packit copr_build tasks help to check if every commit builds on -# supported Fedora and CentOS Stream arches. -# They do not block the current Cirrus-based workflow. - -specfile_path: rpm/skopeo.spec -upstream_tag_template: v{version} - -srpm_build_deps: - - make - -jobs: - - job: copr_build - trigger: pull_request - notifications: - failure_comment: - message: "Ephemeral COPR build failed. @containers/packit-build please check." - enable_net: true - targets: - - fedora-all-x86_64 - - fedora-all-aarch64 - - fedora-eln-x86_64 - - fedora-eln-aarch64 - - centos-stream+epel-next-8-x86_64 - - centos-stream+epel-next-8-aarch64 - - centos-stream+epel-next-9-x86_64 - - centos-stream+epel-next-9-aarch64 - additional_repos: - - "copr://rhcontainerbot/podman-next" - - # Run on commit to main branch - - job: copr_build - trigger: commit - notifications: - failure_comment: - message: "podman-next COPR build failed. @containers/packit-build please check." - branch: main - owner: rhcontainerbot - project: podman-next - enable_net: true - - - job: propose_downstream - trigger: release - update_release: false - dist_git_branches: - - fedora-all - - - 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 diff --git a/README.packit b/README.packit deleted file mode 100644 index 9a6e969..0000000 --- a/README.packit +++ /dev/null @@ -1,3 +0,0 @@ -This repository is maintained by packit. -https://packit.dev/ -The file was generated using packit 0.90.0.post1.dev3+g3d9551d2. diff --git a/gating.yaml b/gating.yaml index c8a218f..e49fcf1 100644 --- a/gating.yaml +++ b/gating.yaml @@ -1,14 +1,7 @@ +# recipients: jnovy, lsm5, santiago --- !Policy product_versions: - - fedora-* -decision_context: bodhi_update_push_stable -subject_type: koji_build + - rhel-9 +decision_context: osci_compose_gate rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} ---- !Policy -product_versions: - - fedora-* -decision_context: bodhi_update_push_testing -subject_type: koji_build -rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} + - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional} diff --git a/skopeo.spec b/skopeo.spec index 80e6871..e00d490 100644 --- a/skopeo.spec +++ b/skopeo.spec @@ -1,78 +1,41 @@ -%global with_debug 1 +%global with_check 0 -%if 0%{?with_debug} -%global _find_debuginfo_dwz_opts %{nil} -%global _dwz_low_mem_die_limit 0 +%if 0%{?rhel} > 7 && ! 0%{?fedora} +%define gobuild(o:) \ +go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -compressdwarf=false -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'" -a -v %{?**}; %else -%global debug_package %{nil} +%define gobuild(o:) GO111MODULE=off go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '-Wl,-z,relro -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld '" -a -v %{?**}; %endif -# RHEL's default %%gobuild macro doesn't account for the BUILDTAGS variable, so we -# set it separately here and do not depend on RHEL's go-[s]rpm-macros package -# until that's fixed. -# c9s bz: https://bugzilla.redhat.com/show_bug.cgi?id=2227328 -# c8s bz: https://bugzilla.redhat.com/show_bug.cgi?id=2227331 -%if %{defined rhel} -%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 gomodulesmode GO111MODULE=on - -# No btrfs on RHEL -%if %{defined fedora} -%define build_with_btrfs 1 -%endif - -# Only used in official koji builds -# Copr builds set a separate epoch for all environments -%if %{defined fedora} -%define conditional_epoch 1 -%else -%define conditional_epoch 2 -%endif +%global import_path github.com/containers/%{name} +#%%global branch release-1.14 +%global commit0 99e3c44865d4200bb93f38365622ef1e857c3a61 +%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) +Epoch: 2 Name: skopeo -%if %{defined copr_username} -Epoch: 102 -%else -Epoch: %{conditional_epoch} -%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: 1.14.2 -# The `AND` needs to be uppercase in the License for SPDX compatibility -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 +Version: 1.15.0 +Release: 1%{?dist} Summary: Inspect container images and repositories on registries -URL: https://github.com/containers/%{name} -# Tarball fetched from upstream -Source0: %{url}/archive/v%{version}.tar.gz -BuildRequires: %{_bindir}/go-md2man -%if %{defined build_with_btrfs} -BuildRequires: btrfs-progs-devel +License: ASL 2.0 +URL: https://%{import_path} +# https://fedoraproject.org/wiki/PackagingDrafts/Go#Go_Language_Architectures +ExclusiveArch: %{go_arches} +%if 0%{?branch:1} +Source0: https://%{import_path}/tarball/%{commit0}/%{branch}-%{shortcommit0}.tar.gz +%else +Source0: https://%{import_path}/archive/%{commit0}/%{name}-%{version}-%{shortcommit0}.tar.gz %endif BuildRequires: git-core -BuildRequires: golang -%if !%{defined gobuild} -BuildRequires: go-rpm-macros -%endif +BuildRequires: golang >= 1.20.10 +BuildRequires: /usr/bin/go-md2man BuildRequires: gpgme-devel BuildRequires: libassuan-devel BuildRequires: pkgconfig(devmapper) -BuildRequires: ostree-devel BuildRequires: glib2-devel BuildRequires: make -BuildRequires: shadow-utils-subid-devel -Requires: containers-common >= 4:1-21 +Requires: containers-common >= 2:1-2 +Requires: system-release %description Command line utility to inspect images and repositories directly on Docker @@ -80,17 +43,15 @@ registries without the need to pull them %package tests Summary: Tests for %{name} - Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: bats +#Requires: bats (which RHEL8 doesn't have. If it ever does, un-comment this) Requires: gnupg Requires: jq -Requires: golang +Requires: golang >= 1.20.10 Requires: podman Requires: crun Requires: httpd-tools Requires: openssl -Requires: fakeroot Requires: squashfs-tools %description tests @@ -99,49 +60,49 @@ Requires: squashfs-tools This package contains system tests for %{name} %prep -%autosetup -Sgit %{name}-%{version} -# The %%install stage should not rebuild anything but only install what's -# built in the %%build stage. So, remove any dependency on build targets. -sed -i 's/^install-binary: bin\/%{name}.*/install-binary:/' Makefile -sed -i 's/^completions: bin\/%{name}.*/completions:/' Makefile -sed -i 's/^install-docs: docs.*/install-docs:/' Makefile +%if 0%{?branch:1} +%autosetup -Sgit -n containers-%{name}-%{shortcommit0} +%else +%autosetup -Sgit -n %{name}-%{commit0} +%endif +sed -i 's/install-binary: bin\/%{name}/install-binary:/' Makefile +sed -i 's/completions: bin\/%{name}/completions:/' Makefile +sed -i 's/install-docs: docs/install-docs:/' Makefile %build -%set_build_flags -export CGO_CFLAGS=$CFLAGS +mkdir -p src/github.com/containers +ln -s ../../../ src/%{import_path} -# 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') -CGO_CFLAGS=$(echo $CGO_CFLAGS | sed 's/-specs=\/usr\/lib\/rpm\/redhat\/redhat-annobin-cc1//g') - -%ifarch x86_64 -export CGO_CFLAGS="$CGO_CFLAGS -m64 -mtune=generic -fcf-protection=full" -%endif - -BASEBUILDTAGS="$(hack/libdm_tag.sh) $(hack/libsubid_tag.sh)" -%if %{defined build_with_btrfs} -export BUILDTAGS="$BASEBUILDTAGS $(hack/btrfs_tag.sh) $(hack/btrfs_installed_tag.sh)" -%else -export BUILDTAGS="$BASEBUILDTAGS btrfs_noversion exclude_graphdriver_btrfs" -%endif - -# unset LDFLAGS earlier set from set_build_flags -LDFLAGS='' +mkdir -p vendor/src +for v in vendor/*; do + if test ${v} = vendor/src; then continue; fi + if test -d ${v}; then + mv ${v} vendor/src/ + fi +done +export GOPATH=$(pwd):$(pwd)/vendor +export GO111MODULE=off +export CGO_CFLAGS="%{optflags} -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" +export BUILDTAGS="exclude_graphdriver_btrfs btrfs_noversion $(hack/libdm_tag.sh)" +mkdir -p bin %gobuild -o bin/%{name} ./cmd/%{name} %{__make} docs %install -make \ - DESTDIR=%{buildroot} \ - PREFIX=%{_prefix} \ - install-binary install-docs install-completions +make install-binary install-docs install-completions DESTDIR=%{buildroot} PREFIX=%{_prefix} # system tests install -d -p %{buildroot}/%{_datadir}/%{name}/test/system cp -pav systemtest/* %{buildroot}/%{_datadir}/%{name}/test/system/ +%check +%if 0%{?with_check} +export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} + +%gotest %{import_path}/integration +%endif + #define license tag if not already defined %{!?_licensedir:%global license %doc} @@ -163,12 +124,6 @@ cp -pav systemtest/* %{buildroot}/%{_datadir}/%{name}/test/system/ %{_datadir}/%{name}/test %changelog -%if %{defined autochangelog} -%autochangelog -%else -# NOTE: This changelog will be visible on CentOS 8 Stream builds -# Other envs are capable of handling autochangelog -* Tue Jun 13 2023 RH Container Bot -- Placeholder changelog for envs that are not autochangelog-ready. -- Contact upstream if you need to report an issue with the build. -%endif +* Thu Mar 28 2024 Jindrich Novy - 2:1.15.0-2.14.2 +- Sync with RHEL9 +- Resolves: RHEL-30637 diff --git a/sources b/sources index 0e89084..e47cf08 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.14.2.tar.gz) = ffb3c00cdde05f7a916bd3980c9cec1bb82b3f3bf90058bfff1837d3a9902087ac011828e6164baec18210d4aeee1a5258b75405411fd15ea2470a2522a6da73 +SHA512 (skopeo-1.15.0-99e3c44.tar.gz) = 38f2dae4ddf1b758f53460d7a0f4c82766d7ee556639c8bf0ac50a79ea16af98a9b398f5466077ed39dafe448c69bfb70d2668e98440c34a7372ee1dde408bf3 diff --git a/tests/roles/bats_installed/tasks/main.yml b/tests/roles/bats_installed/tasks/main.yml new file mode 100644 index 0000000..20a73f3 --- /dev/null +++ b/tests/roles/bats_installed/tasks/main.yml @@ -0,0 +1,12 @@ +--- +# Sigh; RHEL8 doesn't have BATS +- name: bats | fetch and unpack tarball + unarchive: + src: https://github.com/bats-core/bats-core/archive/v1.9.0.tar.gz + dest: /root + remote_src: true + +- name: bats | install + command: ./install.sh /usr/local + args: + chdir: /root/bats-core-1.9.0 diff --git a/tests/test_skopeo.yml b/tests/test_skopeo.yml index 0c73d85..065f31f 100644 --- a/tests/test_skopeo.yml +++ b/tests/test_skopeo.yml @@ -1,12 +1,13 @@ --- - hosts: localhost + tags: classic roles: + - role: bats_installed - role: standard-test-basic tags: - classic - container required_packages: - - bats - skopeo - skopeo-tests tests: