opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-21 09:28:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Enforce podman-machine mac CI results

Browse Source 
Followup to https://github.com/containers/podman/pull/21551

Note: Fixed indentation of podman-machine mac task.

Signed-off-by: Chris Evich <cevich@redhat.com>
This commit is contained in:
Chris Evich
2024-02-08 09:22:06 -05:00
parent 477cb90a30
commit 00180bd5b3
2 changed files with 44 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
.cirrus.yml
View File

@ -803,48 +803,48 @@ podman_machine_aarch64_task:
podman_machine_mac_task: podman_machine_mac_task:
name: *std_name_fmt name: *std_name_fmt
alias: podman_machine_mac alias: podman_machine_mac
only_if: *machine_cron_not_tag_build_docs only_if: *machine_cron_not_tag_build_docs
depends_on: depends_on:
- osx_alt_build - osx_alt_build
- local_integration_test - local_integration_test
- remote_integration_test - remote_integration_test
- container_integration_test - container_integration_test
- rootless_integration_test - rootless_integration_test
persistent_worker: *mac_pw persistent_worker: *mac_pw
env: env:
<<: *mac_env <<: *mac_env
# Consumed by podman-machine ginkgo tests # Consumed by podman-machine ginkgo tests
CONTAINERS_MACHINE_PROVIDER: "applehv" CONTAINERS_MACHINE_PROVIDER: "applehv"
# TODO: Should not require a special image, for now it does. # TODO: Should not require a special image, for now it does.
# Simply remove the line below when a mac image is GA. # Simply remove the line below when a mac image is GA.
# MACHINE_IMAGE: "https://fedorapeople.org/groups/podman/testing/applehv/arm64/fedora-coreos-38.20230925.dev.0-applehv.aarch64.raw.gz" # MACHINE_IMAGE: "https://fedorapeople.org/groups/podman/testing/applehv/arm64/fedora-coreos-38.20230925.dev.0-applehv.aarch64.raw.gz"
# Values necessary to populate std_name_fmt alias # Values necessary to populate std_name_fmt alias
TEST_FLAVOR: "machine-mac" TEST_FLAVOR: "machine-mac"
DISTRO_NV: "darwin" DISTRO_NV: "darwin"
PRIV_NAME: "rootless" # intended use-case PRIV_NAME: "rootless" # intended use-case
clone_script: # artifacts from osx_alt_build_task clone_script: # artifacts from osx_alt_build_task
- mkdir -p $CIRRUS_WORKING_DIR - mkdir -p $CIRRUS_WORKING_DIR
- cd $CIRRUS_WORKING_DIR - cd $CIRRUS_WORKING_DIR
- $ARTCURL/OSX%20Cross/repo/repo.tbz - $ARTCURL/OSX%20Cross/repo/repo.tbz
- tar xjf repo.tbz - tar xjf repo.tbz
# This host is/was shared with potentially many other CI tasks. # This host is/was shared with potentially many other CI tasks.
# The previous task may have been canceled or aborted. # The previous task may have been canceled or aborted.
prep_script: *mac_cleanup prep_script: *mac_cleanup
setup_script: "contrib/cirrus/mac_setup.sh" setup_script: "contrib/cirrus/mac_setup.sh"
env_script: "contrib/cirrus/mac_env.sh" env_script: "contrib/cirrus/mac_env.sh"
# TODO: Timeout bumped b/c initial image download (~5min) and VM # TODO: Timeout bumped b/c initial image download (~5min) and VM
# resize (~2min) causes test-timeout (90s default). Should # resize (~2min) causes test-timeout (90s default). Should
# tests deal with this internally? # tests deal with this internally?
smoke_test_script: smoke_test_script:
- MACHINE_TEST_TIMEOUT=500 make localmachine FOCUS_FILE="basic_test.go" - MACHINE_TEST_TIMEOUT=500 make localmachine FOCUS_FILE="basic_test.go"
test_script: test_script:
- make localmachine - make localmachine
# This host is/was shared with potentially many other CI tasks. # This host is/was shared with potentially many other CI tasks.
# Ensure nothing is left running while waiting for the next task. # Ensure nothing is left running while waiting for the next task.
always: always:
task_cleanup_script: *mac_cleanup task_cleanup_script: *mac_cleanup
# Always run subsequent to integration tests. While parallelism is lost # Always run subsequent to integration tests. While parallelism is lost
# with runtime, debugging system-test failures can be more challenging # with runtime, debugging system-test failures can be more challenging
@ -1088,8 +1088,7 @@ success_task:
- rootless_integration_test - rootless_integration_test
- podman_machine - podman_machine
- podman_machine_aarch64 - podman_machine_aarch64
#- podman_machine_windows #- podman_machine_windows
# TODO: Issue #20853; Tests mostly fail then timeout after an hour.
- podman_machine_mac - podman_machine_mac
- local_system_test - local_system_test
- local_system_test_aarch64 - local_system_test_aarch64

2
contrib/cirrus/cirrus_yaml_test.py
View File

@ -27,7 +27,7 @@ class TestDependsOn(TestCaseBase):
ALL_TASK_NAMES = None ALL_TASK_NAMES = None
SUCCESS_DEPS_EXCLUDE = set(['success', 'bench_stuff', 'artifacts', SUCCESS_DEPS_EXCLUDE = set(['success', 'bench_stuff', 'artifacts',
'release', 'release_test', 'podman_machine_mac']) 'release', 'release_test'])
def setUp(self): def setUp(self):
super().setUp() super().setUp()