Skip to content

Commit 71b9036

Browse files
committed
Fix CRI-O related runtime binary path
The binaries are now under `/usr/libexec/crio` instead of `crio-*` prefixed. We now fix those paths to make the CI work again. Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
1 parent bb3a48e commit 71b9036

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

hack/ci/Vagrantfile-fedora

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ gpgkey=https://pkgs.k8s.io/addons:/cri-o:/prerelease:/main/rpm/repodata/repomd.x
5757
EOF
5858
5959
dnf install -y \
60-
cri-o \
6160
conntrack \
6261
container-selinux \
6362
gcc \
@@ -72,6 +71,11 @@ EOF
7271
openssl \
7372
podman
7473
74+
# conmon installs to /usr/libexec/crio/conmon
75+
# https://github.com/containers/conmon/issues/517
76+
dnf download --repo cri-o --arch x86_64 cri-o
77+
rpm -i --nodeps --force cri-o-*.rpm
78+
7579
# Load the prebuilt container image
7680
podman load -i /vagrant/image.tar
7781

hack/ci/e2e-seccomp.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ record_seccomp_profiles() {
2727
k apply -f examples/profilerecording-seccomp-bpf.yaml
2828

2929
RUNTIMES=(runc crun)
30+
# Default location for CRI-O specific runtime binaries
31+
export PATH="/usr/libexec/crio:$PATH"
32+
3033
for RUNTIME in "${RUNTIMES[@]}"; do
3134
echo "For runtime $RUNTIME"
3235
BASEPROFILE=examples/baseprofile-$RUNTIME.yaml
@@ -88,7 +91,7 @@ EOT
8891
)" "$BASEPROFILE"
8992

9093
echo "Getting runtime version"
91-
VERSION=$(crio-"$RUNTIME" --version | grep "$RUNTIME version" | grep -oP '\d+.*')
94+
VERSION=$("$RUNTIME" --version | grep "$RUNTIME version" | grep -oP '\d+.*')
9295
yq -i '.metadata.name = "'"$RUNTIME"'-v'"$VERSION"'"' "$BASEPROFILE"
9396

9497
echo "Deleting seccomp profile"
@@ -100,7 +103,7 @@ EOT
100103

101104
for RUNTIME in "${RUNTIMES[@]}"; do
102105
echo "Verifying that the profile for runtime $RUNTIME is available in the GitHub container registry"
103-
VERSION=$(crio-"$RUNTIME" --version | grep "$RUNTIME version" | grep -oP '\d+.*')
106+
VERSION=$("$RUNTIME" --version | grep "$RUNTIME version" | grep -oP '\d+.*')
104107
cosign verify --certificate-identity-regexp '.*' --certificate-oidc-issuer-regexp '.*' \
105108
"ghcr.io/security-profiles/$RUNTIME:v$VERSION"
106109
done

0 commit comments

Comments
 (0)