Merge pull request #70 from cevich/fix_osx_again

Fix bug caused by prior commit
containers · Apr 16, 2021 · ba57b00 · ba57b00
2 parents 86033d4 + b006123
commit ba57b00
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 3 deletions.
diff --git a/cirrus-ci_env/cirrus-ci_env.py b/cirrus-ci_env/cirrus-ci_env.py
@@ -191,7 +191,8 @@ def get_type_image(self, item: dict,
         if "gce_instance" in item:
             return "gcevm", item["gce_instance"].get("image_name", default_image)
         elif "osx_instance" in item or "macos_instance" in item:
-            return "osx", item["osx_instance"].get("image", default_image)
+            _ = item.get("osx_instance", item.get("macos_instance"))
+            return "osx", _.get("image", default_image)
         elif "image" in item.get("container", ""):
             return "container", item["container"].get("image", default_image)
         elif "dockerfile" in item.get("container", ""):

diff --git a/cirrus-ci_env/test/actual_cirrus.yml b/cirrus-ci_env/test/actual_cirrus.yml
@@ -352,7 +352,7 @@ static_alt_build_task:
 
 
 # Confirm building the remote client, natively on a Mac OS-X VM.
-osx_alt_build_task:
+osx_alt_build_task: &blahblah
     name: "OSX Cross"
     alias: osx_alt_build
     depends_on:
@@ -371,6 +371,12 @@ osx_alt_build_task:
         - make install-podman-remote-darwin-docs
     always: *binary_artifacts
 
+macos_alt_build_task:
+    <<: *blahblah
+    name: "MacOS Cross"
+    alias: macos_alt_build
+    macos_instance:
+        image: 'catalina-base'
 
 # This task is a stub: In the future it will be used to verify
 # podman is compatible with the docker python-module.

diff --git a/cirrus-ci_env/test/expected_cirrus.yml b/cirrus-ci_env/test/expected_cirrus.yml
@@ -121,6 +121,15 @@ tasks:
       TEST_FLAVOR: altbuild
       VM_IMAGE_NAME: fedora-c6524344056676352
       _BUILD_CACHE_HANDLE: fedora-33-build-${CIRRUS_BUILD_ID}
+  MacOS Cross:
+    alias: macos_alt_build
+    env:
+      ALT_NAME: MacOS Cross
+      CTR_FQIN: quay.io/libpod/fedora_podman:c6524344056676352
+      DISTRO_NV: fedora-33
+      TEST_FLAVOR: altbuild
+      VM_IMAGE_NAME: fedora-c6524344056676352
+      _BUILD_CACHE_HANDLE: fedora-33-build-${CIRRUS_BUILD_ID}
   Optional Release Test:
     alias: release_test
     env:

diff --git a/cirrus-ci_env/test/expected_ti.yml b/cirrus-ci_env/test/expected_ti.yml
@@ -28,9 +28,10 @@ Docker-py Compat.:
 Ext. services:
 - container
 - quay.io/libpod/fedora_podman:c6524344056676352
-OSX Cross:
+OSX Cross: &blahblah
 - osx
 - catalina-base
+MacOS Cross: *blahblah
 Optional Release Test:
 - gcevm
 - fedora-c6524344056676352