diff options
| author | openshift-ci[bot] <75433959+openshift-ci[bot]@users.noreply.github.com> | 2022-07-12 19:26:53 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-12 19:26:53 +0000 |
| commit | 587807b8aa17aef0d1672f34883d5e1e41b55b07 (patch) | |
| tree | 788c763da31f0e129dbfae9d9ece0d6ab6c50ee3 | |
| parent | edbfbfcda18f57c89a9657ba453c51977a7796a9 (diff) | |
| parent | da8c6a8eaf6d5cd4f3f9d41c1612a2baad02d28f (diff) | |
| download | podman-587807b8aa17aef0d1672f34883d5e1e41b55b07.tar.gz podman-587807b8aa17aef0d1672f34883d5e1e41b55b07.tar.bz2 podman-587807b8aa17aef0d1672f34883d5e1e41b55b07.zip | |
Merge pull request #14912 from edsantiago/ci_confirm_runtime
[CI:DOCS] CI: sanity check for desired runtime
| -rw-r--r-- | .cirrus.yml | 4 | ||||
| -rwxr-xr-x | contrib/cirrus/runner.sh | 10 |
2 files changed, 14 insertions, 0 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 81bbe7c8f..14d3540c1 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -167,14 +167,18 @@ build_task: VM_IMAGE_NAME: ${FEDORA_CACHE_IMAGE_NAME} CTR_FQIN: ${FEDORA_CONTAINER_FQIN} # ID for re-use of build output + CI_DESIRED_RUNTIME: crun - env: &priorfedora_envvars DISTRO_NV: ${PRIOR_FEDORA_NAME} VM_IMAGE_NAME: ${PRIOR_FEDORA_CACHE_IMAGE_NAME} CTR_FQIN: ${PRIOR_FEDORA_CONTAINER_FQIN} + CI_DESIRED_RUNTIME: crun - env: &ubuntu_envvars DISTRO_NV: ${UBUNTU_NAME} VM_IMAGE_NAME: ${UBUNTU_CACHE_IMAGE_NAME} CTR_FQIN: ${UBUNTU_CONTAINER_FQIN} + # FIXME 2022-07-12: change to runc once #14833 is fixed! + CI_DESIRED_RUNTIME: crun env: TEST_FLAVOR: build clone_script: *full_clone diff --git a/contrib/cirrus/runner.sh b/contrib/cirrus/runner.sh index 762a3b501..32f66bac2 100755 --- a/contrib/cirrus/runner.sh +++ b/contrib/cirrus/runner.sh @@ -236,6 +236,16 @@ function _run_build() { make clean make vendor make podman-release # includes podman, podman-remote, and docs + + # Last-minute confirmation that we're testing the desired runtime. + # This Can't Possibly Fail™ in regular CI; only when updating VMs. + # $CI_DESIRED_RUNTIME must be defined in .cirrus.yml. + req_env_vars CI_DESIRED_RUNTIME + runtime=$(bin/podman info --format '{{.Host.OCIRuntime.Name}}') + # shellcheck disable=SC2154 + if [[ "$runtime" != "$CI_DESIRED_RUNTIME" ]]; then + die "Built podman is using '$runtime'; this CI environment requires $CI_DESIRED_RUNTIME" + fi } function _run_altbuild() { |