diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-07-27 12:02:25 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-27 12:02:25 -0400 |
| commit | 87f892e5b56c2fab2f394f8cc79794ccce03f510 (patch) | |
| tree | 1ba831a9dddfb6927698bcb9e0c2bee913ad0dcb /.cirrus.yml | |
| parent | c57b5c9b831695f8c54d11b4f288d6037c096fea (diff) | |
| parent | 983cfb90e68d7b292b0f6ee8800c3f23383493cc (diff) | |
| download | podman-87f892e5b56c2fab2f394f8cc79794ccce03f510.tar.gz podman-87f892e5b56c2fab2f394f8cc79794ccce03f510.tar.bz2 podman-87f892e5b56c2fab2f394f8cc79794ccce03f510.zip | |
Merge pull request #15076 from mheon/bump_420_rc2
Bump to v4.2.0-RC2
Diffstat (limited to '.cirrus.yml')
| -rw-r--r-- | .cirrus.yml | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 81bbe7c8f..b9c284002 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 @@ -584,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 @@ -875,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 |