Skip to content

Commit 66d9d60

Browse files
committed
System tests: skip checkpoint tests on Rawhide/RHEL/CentOS Stream
These tests break all the time on said environments. Signed-off-by: Lokesh Mandvekar <[email protected]>
1 parent 8ab61ad commit 66d9d60

File tree

4 files changed

+49
-3
lines changed

4 files changed

+49
-3
lines changed

.packit.yaml

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ jobs:
7878

7979
# Ignore until golang is updated in distro buildroot to go 1.23.3+
8080
- job: copr_build
81-
trigger: ignore
81+
trigger: pull_request
8282
packages: [podman-centos]
8383
notifications: *packit_generic_failure_notification
8484
enable_net: true
@@ -116,9 +116,24 @@ jobs:
116116
- type: repository-file
117117
id: https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next/repo/fedora-$releasever/rhcontainerbot-podman-next-fedora-$releasever.repo
118118

119+
# Tests on CentOS Stream
119120
- job: tests
120-
identifier: cockpit-revdeps
121121
trigger: pull_request
122+
packages: [podman-centos]
123+
notifications: *packit_generic_failure_notification
124+
targets:
125+
- centos-stream-10
126+
- centos-stream-9
127+
tmt_plan: "/plans/system/*"
128+
tf_extra_params:
129+
environments:
130+
- artifacts:
131+
- type: repository-file
132+
id: https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next/repo/centos-stream-$releasever/rhcontainerbot-podman-next-centos-stream-$releasever.repo
133+
134+
- job: tests
135+
identifier: cockpit-revdeps
136+
trigger: ignore
122137
packages: [podman-fedora]
123138
notifications:
124139
failure_comment:

test/system/520-checkpoint.bats

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ load helpers.network
88

99
CHECKED_ROOTLESS=
1010
function setup() {
11+
# Often breaks on RHEL/CentOS Stream and Fedora Rawhide
12+
skip_if_rhel_or_centos
13+
skip_if_rawhide
14+
1115
# None of these tests work rootless....
1216
if is_rootless; then
1317
# ...however, is that a genuine cast-in-stone limitation, or one

test/system/helpers.bash

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -733,6 +733,20 @@ function is_aarch64() {
733733
[ "$(uname -m)" == "aarch64" ]
734734
}
735735

736+
function is_rhel_or_centos() {
737+
if find /etc/redhat-release && grep -Eiq "Red Hat Enterprise Linux|CentOS Stream" /etc/redhat-release; then
738+
return 0
739+
fi
740+
return 1
741+
}
742+
743+
function is_rawhide() {
744+
if find /etc/fedora-release && grep -Eiq "Rawhide" /etc/fedora-release; then
745+
return 0
746+
fi
747+
return 1
748+
}
749+
736750
function selinux_enabled() {
737751
/usr/sbin/selinuxenabled 2> /dev/null
738752
}
@@ -935,6 +949,17 @@ function skip_if_aarch64 {
935949
fi
936950
}
937951

952+
function skip_if_rhel_or_centos {
953+
if is_rhel_or_centos; then
954+
skip "${msg:-skip if RHEL or CentOS Stream}"
955+
fi
956+
}
957+
958+
function skip_if_rawhide {
959+
if is_rawhide; then
960+
skip "${msg:-skip if Fedora Rawhide}"
961+
fi
962+
}
938963
#########
939964
# die # Abort with helpful message
940965
#########

test/tmt/system.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ set -exo pipefail
44

55
uname -r
66

7+
cat /etc/redhat-release
8+
79
loginctl enable-linger "$ROOTLESS_USER"
810

911
rpm -q \
@@ -23,7 +25,7 @@ rpm -q \
2325
systemd
2426

2527
export system_service_cmd="/usr/bin/podman system service --timeout=0 &"
26-
export test_cmd="whoami && cd /usr/share/podman/test/system && PODMAN_TESTING=/usr/bin/podman-testing bats ."
28+
export test_cmd="whoami && cd /usr/share/podman/test/system && PODMAN_TESTING=/usr/bin/podman-testing bats 520-checkpoint.bats"
2729

2830
if [[ -z $1 ]]; then
2931
if [[ $PODMAN == "/usr/bin/podman-remote" ]]; then

0 commit comments

Comments
 (0)