From ca4630ede6d50e3417502a7d31ef60576f371b8c Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Tue, 12 Jul 2022 08:28:21 -0600 Subject: 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 --- .cirrus.yml | 4 ++++ 1 file changed, 4 insertions(+) (limited to '.cirrus.yml') 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 -- cgit v1.2.3-54-g00ecf From f07d2bac4bf09bedeace1e7ed939176e502b41ca Mon Sep 17 00:00:00 2001 From: Chris Evich Date: Thu, 14 Jul 2022 12:17:48 -0400 Subject: Cirrus: Trigger podman-machine task by label Instead of requiring developers to search for a magic button, make the task trigger at the time a special PR label is added. Update comments accordingly. Signed-off-by: Chris Evich --- .cirrus.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to '.cirrus.yml') diff --git a/.cirrus.yml b/.cirrus.yml index 14d3540c1..b9c284002 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -588,11 +588,14 @@ rootless_integration_test_task: podman_machine_task: name: *std_name_fmt alias: podman_machine + # Required_pr_labels does not apply to non-PRs. + # Do not run on tags, branches, [CI:BUILD], or [CI:DOCS]. only_if: *not_tag_branch_build_docs - # Manually-triggered task: This is "expensive" to run. + # This task costs about $4 per attempt to execute. + # Only run it if a magic PR label is present. # DO NOT ADD THIS TASK AS DEPENDENCY FOR `success_task` - # it will cause 'success' to block. - trigger_type: manual + # it will cause an infinate-block / never completing build. + required_pr_labels: test_podman_machine depends_on: - build - local_integration_test @@ -879,8 +882,8 @@ success_task: - remote_integration_test - container_integration_test - rootless_integration_test - # Manually triggered task. If made automatic, remove bypass - # in contrib/cirrus/cirrus_yaml_test.py for this task. + # Label triggered task. If made automatic, remove line below + # AND bypass in contrib/cirrus/cirrus_yaml_test.py for this name. # - podman_machine - local_system_test - remote_system_test -- cgit v1.2.3-54-g00ecf