github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-17 14:58:16 +00:00
Code Issues Projects Releases Wiki Activity

ci.ocp: Allow to override the kata-deploy image

Browse Source 
sometimes we want to test a different than the latest image (eg. when
verifying a PR via ghcr images or when bisecting a failure over older
builds). Let's add a KATA_DEPLOY_IMAGE variable for that while keeping
the latest image by default.

Fixes: #9228

Signed-off-by: Lukáš Doktor <ldoktor@redhat.com>
This commit is contained in:
Lukáš Doktor
2024-03-06 11:20:44 +01:00
parent 2936503b24
commit b811ee0650
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ci/openshift-ci/cluster/install_kata.sh
View File

@@ -27,6 +27,11 @@ KATA_WITH_SYSTEM_QEMU=${KATA_WITH_SYSTEM_QEMU:-no}
# #
KATA_WITH_HOST_KERNEL=${KATA_WITH_HOST_KERNEL:-no} KATA_WITH_HOST_KERNEL=${KATA_WITH_HOST_KERNEL:-no}
# kata-deploy image to be used to deploy the kata (by default use CI image
# that is built for each pull request)
#
KATA_DEPLOY_IMAGE=${KATA_DEPLOY_IMAGE:-quay.io/kata-containers/kata-deploy-ci:kata-containers-latest}
# Enable workaround for OCP 4.13 https://github.com/kata-containers/kata-containers/pull/9206 # Enable workaround for OCP 4.13 https://github.com/kata-containers/kata-containers/pull/9206
# #
WORKAROUND_9206_CRIO=${WORKAROUND_9206_CRIO:-no} WORKAROUND_9206_CRIO=${WORKAROUND_9206_CRIO:-no}
@@ -35,11 +40,8 @@ WORKAROUND_9206_CRIO=${WORKAROUND_9206_CRIO:-no}
# #
apply_kata_deploy() { apply_kata_deploy() {
local deploy_file="tools/packaging/kata-deploy/kata-deploy/base/kata-deploy.yaml" local deploy_file="tools/packaging/kata-deploy/kata-deploy/base/kata-deploy.yaml"
# Use the kata-deploy CI image which is built for each pull request merged
local new_img="quay.io/kata-containers/kata-deploy-ci:kata-containers-latest"
pushd "$katacontainers_repo_dir" pushd "$katacontainers_repo_dir"
sed -ri "s#(\s+image:) .*#\1 ${new_img}#" "$deploy_file" sed -ri "s#(\s+image:) .*#\1 ${KATA_DEPLOY_IMAGE}#" "$deploy_file"
info "Applying kata-deploy" info "Applying kata-deploy"
oc apply -f tools/packaging/kata-deploy/kata-rbac/base/kata-rbac.yaml oc apply -f tools/packaging/kata-deploy/kata-rbac/base/kata-rbac.yaml