diff options
| author | Ed Santiago <santiago@redhat.com> | 2022-07-12 08:28:21 -0600 |
|---|---|---|
| committer | Ed Santiago <santiago@redhat.com> | 2022-07-12 08:47:09 -0600 |
| commit | da8c6a8eaf6d5cd4f3f9d41c1612a2baad02d28f (patch) | |
| tree | 4c12e0071eda6f3fbb08b47d3f6ae573f8105812 | |
| parent | a51a63023c773afae601628fbb89461249c5a043 (diff) | |
| download | podman-da8c6a8eaf6d5cd4f3f9d41c1612a2baad02d28f.tar.gz podman-da8c6a8eaf6d5cd4f3f9d41c1612a2baad02d28f.tar.bz2 podman-da8c6a8eaf6d5cd4f3f9d41c1612a2baad02d28f.zip | |
CI: sanity check for desired runtime
We're still not testing runc in CI (#14833), and it may be weeks
or months before we can, due to criu/glibc nightmare, but one day
we'll be back on track, then later on we'll update VMs again,
and screw it up, and lose runc, and not notice, and RHEL will
break, and oh noes headless chicken again, repeat repeat.
We can do better. Use .cirrus.yml to explicitly define which
VMs should use which runtimes, and enforce it early in the
CI build step. This should never fail (uh huh) in a PR,
only in one of the update-VM PRs.
Signed-off-by: Ed Santiago <santiago@redhat.com>
| -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() { |