Merge pull request #14912 from edsantiago/ci_confirm_runtime
[CI:DOCS] CI: sanity check for desired runtime
This commit is contained in:
		
						commit
						587807b8aa
					
				|  | @ -167,14 +167,18 @@ build_task: | ||||||
|               VM_IMAGE_NAME: ${FEDORA_CACHE_IMAGE_NAME} |               VM_IMAGE_NAME: ${FEDORA_CACHE_IMAGE_NAME} | ||||||
|               CTR_FQIN: ${FEDORA_CONTAINER_FQIN} |               CTR_FQIN: ${FEDORA_CONTAINER_FQIN} | ||||||
|               # ID for re-use of build output |               # ID for re-use of build output | ||||||
|  |               CI_DESIRED_RUNTIME: crun | ||||||
|         - env: &priorfedora_envvars |         - env: &priorfedora_envvars | ||||||
|               DISTRO_NV: ${PRIOR_FEDORA_NAME} |               DISTRO_NV: ${PRIOR_FEDORA_NAME} | ||||||
|               VM_IMAGE_NAME: ${PRIOR_FEDORA_CACHE_IMAGE_NAME} |               VM_IMAGE_NAME: ${PRIOR_FEDORA_CACHE_IMAGE_NAME} | ||||||
|               CTR_FQIN: ${PRIOR_FEDORA_CONTAINER_FQIN} |               CTR_FQIN: ${PRIOR_FEDORA_CONTAINER_FQIN} | ||||||
|  |               CI_DESIRED_RUNTIME: crun | ||||||
|         - env: &ubuntu_envvars |         - env: &ubuntu_envvars | ||||||
|               DISTRO_NV: ${UBUNTU_NAME} |               DISTRO_NV: ${UBUNTU_NAME} | ||||||
|               VM_IMAGE_NAME: ${UBUNTU_CACHE_IMAGE_NAME} |               VM_IMAGE_NAME: ${UBUNTU_CACHE_IMAGE_NAME} | ||||||
|               CTR_FQIN: ${UBUNTU_CONTAINER_FQIN} |               CTR_FQIN: ${UBUNTU_CONTAINER_FQIN} | ||||||
|  |               # FIXME 2022-07-12: change to runc once #14833 is fixed! | ||||||
|  |               CI_DESIRED_RUNTIME: crun | ||||||
|     env: |     env: | ||||||
|         TEST_FLAVOR: build |         TEST_FLAVOR: build | ||||||
|     clone_script: *full_clone |     clone_script: *full_clone | ||||||
|  |  | ||||||
|  | @ -236,6 +236,16 @@ function _run_build() { | ||||||
|     make clean |     make clean | ||||||
|     make vendor |     make vendor | ||||||
|     make podman-release  # includes podman, podman-remote, and docs |     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() { | function _run_altbuild() { | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue