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

Re-enable mac testing

Browse Source 
we were fighting a flake earlier, so the mac test was removed again and
the suspected commit was removed.  this turns the test back on so we can
see if we pass cleanly.

[NO NEW TESTS NEEDED]

Signed-off-by: Brent Baude <bbaude@redhat.com>
This commit is contained in:
Brent Baude
2024-02-07 14:27:13 -06:00
parent 4ff00f46b2
commit 325d7f4890
1 changed files with 126 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

252
.cirrus.yml
View File

@ -779,7 +779,7 @@ podman_machine_aarch64_task:
# alias: podman_machine_windows # alias: podman_machine_windows
# # Only run for non-docs/copr PRs and non-release branch builds # # Only run for non-docs/copr PRs and non-release branch builds
# # and never for tags. Docs: ./contrib/cirrus/CIModes.md # # and never for tags. Docs: ./contrib/cirrus/CIModes.md
# only_if: *not_tag_branch_build_docs # only_if: *not_tag_branch_build_docs_machine
# depends_on: # depends_on:
# - alt_build # - alt_build
# - build # - build
@ -794,57 +794,57 @@ podman_machine_aarch64_task:
# platform: windows # platform: windows
# env: *winenv # env: *winenv
# matrix: # matrix:
# - env: # #- env:
# TEST_FLAVOR: "machine-wsl" # # TEST_FLAVOR: "machine-wsl"
# - env: # - env:
# TEST_FLAVOR: "machine-hyperv" # TEST_FLAVOR: "machine-hyperv"
# clone_script: *winclone # clone_script: *winclone
# main_script: ".\\repo\\contrib\\cirrus\\win-podman-machine-main.ps1" # main_script: ".\\repo\\contrib\\cirrus\\win-podman-machine-main.ps1"
#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: *not_tag_branch_build_docs only_if: *not_tag_branch_build_docs_machine
# 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,9 +1088,9 @@ 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. # 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
- remote_system_test - remote_system_test
@ -1122,84 +1122,84 @@ success_task:
# WARNING: Most of the artifacts captured here are also have their # WARNING: Most of the artifacts captured here are also have their
# permalinks present in the `DOWNLOADS.md` file. Any changes made # permalinks present in the `DOWNLOADS.md` file. Any changes made
# here, should probably be reflected in that document. # here, should probably be reflected in that document.
#artifacts_task: artifacts_task:
# name: "Artifacts" name: "Artifacts"
# alias: artifacts alias: artifacts
# # Docs: ./contrib/cirrus/CIModes.md # Docs: ./contrib/cirrus/CIModes.md
# only_if: >- only_if: >-
# $CIRRUS_CHANGE_TITLE !=~ '.*CI:DOCS.*' && $CIRRUS_CHANGE_TITLE !=~ '.*CI:DOCS.*' &&
# $CIRRUS_BRANCH !=~ 'v[0-9\.]+-rhel' && $CIRRUS_BRANCH !=~ 'v[0-9\.]+-rhel' &&
# $CIRRUS_BASE_BRANCH !=~ 'v[0-9\.]+-rhel' $CIRRUS_BASE_BRANCH !=~ 'v[0-9\.]+-rhel'
# depends_on: depends_on:
# - success - success
# # This task is a secondary/convenience for downstream consumers, don't # This task is a secondary/convenience for downstream consumers, don't
# # block development progress if there is a failure in a PR, only break # block development progress if there is a failure in a PR, only break
# # when running on branches or tags. # when running on branches or tags.
# allow_failures: $CIRRUS_PR != '' allow_failures: $CIRRUS_PR != ''
# container: *smallcontainer container: *smallcontainer
# env: env:
# CTR_FQIN: ${FEDORA_CONTAINER_FQIN} CTR_FQIN: ${FEDORA_CONTAINER_FQIN}
# TEST_ENVIRON: container TEST_ENVIRON: container
# # In order to keep the download URL and Cirrus-CI artifact.zip contents # In order to keep the download URL and Cirrus-CI artifact.zip contents
# # simple, nothing should exist in $CIRRUS_WORKING_DIR except for artifacts. # simple, nothing should exist in $CIRRUS_WORKING_DIR except for artifacts.
# clone_script: *noop clone_script: *noop
# fedora_binaries_script: fedora_binaries_script:
# - mkdir -p /tmp/fed - mkdir -p /tmp/fed
# - cd /tmp/fed - cd /tmp/fed
# - $ARTCURL/Build%20for%20${FEDORA_NAME}/repo/repo.tbz - $ARTCURL/Build%20for%20${FEDORA_NAME}/repo/repo.tbz
# - tar xjf repo.tbz - tar xjf repo.tbz
# - cp ./bin/* $CIRRUS_WORKING_DIR/ - cp ./bin/* $CIRRUS_WORKING_DIR/
# alt_binaries_intel_script: alt_binaries_intel_script:
# - mkdir -p /tmp/alt - mkdir -p /tmp/alt
# - cd /tmp/alt - cd /tmp/alt
# - $ARTCURL/Alt%20Arch.%20x86%20Cross/repo/repo.tbz - $ARTCURL/Alt%20Arch.%20x86%20Cross/repo/repo.tbz
# - tar xjf repo.tbz - tar xjf repo.tbz
# - mv ./*.tar.gz $CIRRUS_WORKING_DIR/ - mv ./*.tar.gz $CIRRUS_WORKING_DIR/
# alt_binaries_arm_script: alt_binaries_arm_script:
# - mkdir -p /tmp/alt - mkdir -p /tmp/alt
# - cd /tmp/alt - cd /tmp/alt
# - $ARTCURL/Alt%20Arch.%20ARM%20Cross/repo/repo.tbz - $ARTCURL/Alt%20Arch.%20ARM%20Cross/repo/repo.tbz
# - tar xjf repo.tbz - tar xjf repo.tbz
# - mv ./*.tar.gz $CIRRUS_WORKING_DIR/ - mv ./*.tar.gz $CIRRUS_WORKING_DIR/
# alt_binaries_mips_script: alt_binaries_mips_script:
# - mkdir -p /tmp/alt - mkdir -p /tmp/alt
# - cd /tmp/alt - cd /tmp/alt
# - $ARTCURL/Alt%20Arch.%20MIPS%20Cross/repo/repo.tbz - $ARTCURL/Alt%20Arch.%20MIPS%20Cross/repo/repo.tbz
# - tar xjf repo.tbz - tar xjf repo.tbz
# - mv ./*.tar.gz $CIRRUS_WORKING_DIR/ - mv ./*.tar.gz $CIRRUS_WORKING_DIR/
# alt_binaries_mips64_script: alt_binaries_mips64_script:
# - mkdir -p /tmp/alt - mkdir -p /tmp/alt
# - cd /tmp/alt - cd /tmp/alt
# - $ARTCURL/Alt%20Arch.%20MIPS64%20Cross/repo/repo.tbz - $ARTCURL/Alt%20Arch.%20MIPS64%20Cross/repo/repo.tbz
# - tar xjf repo.tbz - tar xjf repo.tbz
# - mv ./*.tar.gz $CIRRUS_WORKING_DIR/ - mv ./*.tar.gz $CIRRUS_WORKING_DIR/
# alt_binaries_other_script: alt_binaries_other_script:
# - mkdir -p /tmp/alt - mkdir -p /tmp/alt
# - cd /tmp/alt - cd /tmp/alt
# - $ARTCURL/Alt%20Arch.%20Other%20Cross/repo/repo.tbz - $ARTCURL/Alt%20Arch.%20Other%20Cross/repo/repo.tbz
# - tar xjf repo.tbz - tar xjf repo.tbz
# - mv ./*.tar.gz $CIRRUS_WORKING_DIR/ - mv ./*.tar.gz $CIRRUS_WORKING_DIR/
# win_binaries_script: win_binaries_script:
# - mkdir -p /tmp/win - mkdir -p /tmp/win
# - cd /tmp/win - cd /tmp/win
# - $ARTCURL/Windows%20Cross/repo/repo.tbz - $ARTCURL/Windows%20Cross/repo/repo.tbz
# - tar xjf repo.tbz - tar xjf repo.tbz
# - mv ./podman-remote*.zip $CIRRUS_WORKING_DIR/ - mv ./podman-remote*.zip $CIRRUS_WORKING_DIR/
# osx_binaries_script: osx_binaries_script:
# - mkdir -p /tmp/osx - mkdir -p /tmp/osx
# - cd /tmp/osx - cd /tmp/osx
# - $ARTCURL/OSX%20Cross/repo/repo.tbz - $ARTCURL/OSX%20Cross/repo/repo.tbz
# - tar xjf repo.tbz - tar xjf repo.tbz
# - mv ./podman-remote-release-darwin_*.zip $CIRRUS_WORKING_DIR/ - mv ./podman-remote-release-darwin_*.zip $CIRRUS_WORKING_DIR/
# - mv ./contrib/pkginstaller/out/podman-installer-macos-*.pkg $CIRRUS_WORKING_DIR/ - mv ./contrib/pkginstaller/out/podman-installer-macos-*.pkg $CIRRUS_WORKING_DIR/
# always: always:
# contents_script: ls -la $CIRRUS_WORKING_DIR contents_script: ls -la $CIRRUS_WORKING_DIR
# # Produce downloadable files and an automatic zip-file accessible # Produce downloadable files and an automatic zip-file accessible
# # by a consistent URL, based on contents of $CIRRUS_WORKING_DIR # by a consistent URL, based on contents of $CIRRUS_WORKING_DIR
# # Ref: https://cirrus-ci.org/guide/writing-tasks/#latest-build-artifacts # Ref: https://cirrus-ci.org/guide/writing-tasks/#latest-build-artifacts
# binary_artifacts: binary_artifacts:
# path: ./* path: ./*
# type: application/octet-stream type: application/octet-stream
# When a new tag is pushed, confirm that the code and commits # When a new tag is pushed, confirm that the code and commits