e4c38fd245
Update the compiler and linker flags for RHEL 9 by keeping '-trimpath'.
Switch to using the GO_BUILDTAGS and GO_LDFLAGS environment variables,
because their unprefixed counterparts have been deprecated [1].
The 'rpminspect --tests=elf' test run by the downstream CI was silenced
because toolbox(1) is only built with the '-z relro' linker flag, but
not '-z now' [2]. Otherwise, it fails with:
/usr/bin/toolbox lost full GNU_RELRO security protection
Stop carrying the downstream patch for the compiler and linker flags for
PPC64. The architecture was already discontinued from Fedora 29 [3],
even before the patch was added [4]. It was added purely for the sake
of completeness, and in the last four years since it was introduced, it
hasn't been tested or used. At this point it's becoming too much of a
maintenance burden, and removing it silences the %ifarch-applied-patch
warning from rpmlint.
Fill in some of the missing Requires for the toolbox-tests sub-package.
[1] go-rpm-macros commit bc7e5cc55c4709e8
https://pagure.io/go-rpm-macros/c/bc7e5cc55c4709e8
[2] Upstream commit 83f28c52e47c2d44
https://github.com/containers/toolbox/commit/83f28c52e47c2d44
https://github.com/containers/toolbox/pull/1548
[3] https://fedoraproject.org/wiki/Changes/DiscontinuePPC64
[4] Fedora toolbox commit ba60453d21
https://src.fedoraproject.org/rpms/toolbox/c/ba60453d216a9226
https://src.fedoraproject.org/rpms/toolbox/pull-request/2
Resolves: RHEL-61578
82 lines
3.6 KiB
Diff
82 lines
3.6 KiB
Diff
From ed14cd483ae45c5f4cf5596b11c384f4b42bb53b Mon Sep 17 00:00:00 2001
|
|
From: Debarshi Ray <rishi@fedoraproject.org>
|
|
Date: Fri, 4 Oct 2024 22:09:03 +0200
|
|
Subject: [PATCH] Revert "playbooks, test/system: Work around bug in pasta(1)
|
|
networks"
|
|
|
|
The bug in pasta(1) that necessitated this workaround has since been
|
|
fixed in passt 2024_05_10.7288448 [1]. Some host operating systems like
|
|
CentOS Stream 10 no longer have slirp4netns(1), and it's generally
|
|
better to test the defaults.
|
|
|
|
This reverts commit b58f9a51088afbfc22edb0b25776cfa2c4d8cc40.
|
|
|
|
[1] https://github.com/containers/podman/issues/22575
|
|
https://archives.passt.top/passt-dev/20240508090338.2735208-1-sbrivio@redhat.com/
|
|
https://archives.passt.top/passt-user/20240510225714.6aa8e6c0@elisabeth/
|
|
|
|
https://github.com/containers/toolbox/pull/1562
|
|
---
|
|
playbooks/dependencies-centos-9-stream.yaml | 3 +--
|
|
playbooks/dependencies-fedora.yaml | 3 +--
|
|
test/system/libs/helpers.bash | 1 -
|
|
3 files changed, 2 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/playbooks/dependencies-centos-9-stream.yaml b/playbooks/dependencies-centos-9-stream.yaml
|
|
index 5c1194c03583..d058d314b7b3 100644
|
|
--- a/playbooks/dependencies-centos-9-stream.yaml
|
|
+++ b/playbooks/dependencies-centos-9-stream.yaml
|
|
@@ -13,7 +13,6 @@
|
|
- podman
|
|
- shadow-utils-subid-devel
|
|
- skopeo
|
|
- - slirp4netns
|
|
- systemd
|
|
- udisks2
|
|
|
|
@@ -55,7 +54,7 @@
|
|
chdir: '{{ zuul.project.src_dir }}'
|
|
|
|
- name: Check versions of crucial packages
|
|
- command: rpm -qa ShellCheck bats codespell *kernel* gcc *glibc* golang golang-github-cpuguy83-md2man shadow-utils-subid-devel podman conmon containernetworking-plugins containers-common container-selinux crun fuse-overlayfs flatpak-session-helper skopeo slirp4netns
|
|
+ command: rpm -qa ShellCheck bats codespell *kernel* gcc *glibc* golang golang-github-cpuguy83-md2man shadow-utils-subid-devel podman conmon containernetworking-plugins containers-common container-selinux crun fuse-overlayfs flatpak-session-helper skopeo
|
|
|
|
- name: Show podman versions
|
|
command: podman version
|
|
diff --git a/playbooks/dependencies-fedora.yaml b/playbooks/dependencies-fedora.yaml
|
|
index ea605135a4c2..8007ce958ddb 100644
|
|
--- a/playbooks/dependencies-fedora.yaml
|
|
+++ b/playbooks/dependencies-fedora.yaml
|
|
@@ -35,7 +35,6 @@
|
|
- podman
|
|
- shadow-utils-subid-devel
|
|
- skopeo
|
|
- - slirp4netns
|
|
- systemd
|
|
- udisks2
|
|
use: "{{ 'dnf' if zuul.attempts > 1 else 'auto' }}"
|
|
@@ -56,7 +55,7 @@
|
|
chdir: '{{ zuul.project.src_dir }}'
|
|
|
|
- name: Check versions of crucial packages
|
|
- command: rpm -qa ShellCheck bash bats codespell *kernel* gcc *glibc* shadow-utils-subid-devel golang golang-github-cpuguy83-md2man podman conmon containernetworking-plugins containers-common container-selinux crun fuse-overlayfs flatpak-session-helper skopeo slirp4netns
|
|
+ command: rpm -qa ShellCheck bash bats codespell *kernel* gcc *glibc* shadow-utils-subid-devel golang golang-github-cpuguy83-md2man podman conmon containernetworking-plugins containers-common container-selinux crun fuse-overlayfs flatpak-session-helper skopeo
|
|
|
|
- name: Show podman versions
|
|
command: podman version
|
|
diff --git a/test/system/libs/helpers.bash b/test/system/libs/helpers.bash
|
|
index dfd6236c2943..2d05641f5d0a 100644
|
|
--- a/test/system/libs/helpers.bash
|
|
+++ b/test/system/libs/helpers.bash
|
|
@@ -195,7 +195,6 @@ function _setup_docker_registry() {
|
|
--env REGISTRY_HTTP_TLS_CERTIFICATE=/certs/domain.crt \
|
|
--env REGISTRY_HTTP_TLS_KEY=/certs/domain.key \
|
|
--name "${DOCKER_REG_NAME}" \
|
|
- --network slirp4netns \
|
|
--privileged \
|
|
--publish 50000:5000 \
|
|
--rm \
|
|
--
|
|
2.46.1
|
|
|