Skip to content

Commit 943b7ae

Browse files
committed
Fix transition test to work with latest selinux policy
Signed-off-by: Daniel J Walsh <[email protected]>
1 parent 6589be3 commit 943b7ae

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

.cirrus.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ env:
2727
####
2828
# GCE project where images live
2929
IMAGE_PROJECT: "libpod-218412"
30-
FEDORA_NAME: "fedora-37"
31-
PRIOR_FEDORA_NAME: "fedora-36"
30+
FEDORA_NAME: "fedora-38"
31+
PRIOR_FEDORA_NAME: "fedora-37"
3232
DEBIAN_NAME: "debian-12"
3333

3434
# Image identifiers
35-
IMAGE_SUFFIX: "c20230405t152256z-f37f36d12"
35+
IMAGE_SUFFIX: "c20230614t132754z-f38f37d13"
3636
FEDORA_CACHE_IMAGE_NAME: "fedora-${IMAGE_SUFFIX}"
3737
PRIOR_FEDORA_CACHE_IMAGE_NAME: "prior-fedora-${IMAGE_SUFFIX}"
3838
DEBIAN_CACHE_IMAGE_NAME: "debian-${IMAGE_SUFFIX}"

tests/selinux.bats

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,11 @@ load helpers
4646
cid=$output
4747
run_buildah run $cid sh -c 'tr \\0 \\n < /proc/self/attr/current'
4848
context=$output
49-
49+
run id -Z
50+
crole=$(secon -r $output)
5051
# Role and Type should always be constant. (We don't check user)
5152
role=$(awk -F: '{print $2}' <<<$context)
52-
expect_output --from="$role" "system_r" "SELinux role"
53+
expect_output --from="$role" "${crole}" "SELinux role"
5354

5455
type=$(awk -F: '{print $3}' <<<$context)
5556
expect_output --from="$type" "spc_t" "SELinux type"

0 commit comments

Comments
 (0)