Use xargs fix for all vanilla images, not just Sequoia

.ci/cirrus.base.yml

@@ -9,6 +9,8 @@ task:
   <<: *defaults
   pull_vanilla_script:
     - tart pull ghcr.io/cirruslabs/macos-$MACOS_VERSION-vanilla:latest
+  install_sshpass_script:
+    - brew install sshpass
   build_base_script:
     - packer init templates/base.pkr.hcl
     - packer build -var macos_version="$MACOS_VERSION" templates/base.pkr.hcl

.ci/cirrus.runner.yml

@@ -7,8 +7,8 @@ task:
         XCODE_VERSIONS: "16.1,16,15.4,15.3,15.2,15.1,\"15.0.1\""
         DISK_SIZE: 375
       - MACOS_VERSION: sequoia
-        XCODE_VERSIONS: "16.2,\"16.3-beta-2\",16.1,16,15.4"
-        DISK_SIZE: 375
+        XCODE_VERSIONS: "16.2,16.1,16,15.4"
+        DISK_SIZE: 320
   <<: *defaults
   pull_base_script:
     - tart pull ghcr.io/cirruslabs/macos-$MACOS_VERSION-base:latest

.ci/cirrus.vanilla.yml

@@ -1,4 +1,5 @@
 env:
+  RESOLVE_VM_BASE_NAME: "ghcr.io/cirruslabs/macos-${MACOS_VERSION}-vanilla:latest"
   RESOLVE_VM_NAME: "resolve-macos-number-task-id-${CIRRUS_TASK_ID}"
   RESOLVE_FILE: "${RESOLVE_VM_NAME}.txt"
 
@@ -18,7 +19,7 @@ task:
   disable_sip_script:
     - packer build -var vm_name=$MACOS_VERSION-vanilla templates/disable-sip.pkr.hcl
   resolve_macos_number_script:
-    - packer build -var vm_base_name=$MACOS_VERSION-vanilla -var vm_name=$RESOLVE_VM_NAME -var resolve_file=$RESOLVE_FILE templates/resolve-macos-number.pkr.hcl
+    - packer build -var vm_base_name=$RESOLVE_VM_BASE_NAME -var vm_name=$RESOLVE_VM_NAME -var resolve_file=$RESOLVE_FILE templates/resolve-macos-number.pkr.hcl
     - echo "MACOS_NUMBER=$(cat $RESOLVE_FILE)" >> $CIRRUS_ENV
     - rm $RESOLVE_FILE
     - tart delete $RESOLVE_VM_NAME

README.md

@@ -26,7 +26,7 @@ monthly on the first Saturday of the month:
 
 * `ghcr.io/cirruslabs/macos-{sequoia,sonoma}-base`
 * `ghcr.io/cirruslabs/macos-runner:sonoma` which is a superset of `ghcr.io/cirruslabs/macos-sonoma-xcode:{latest,16.1,16,15.4,15.3,15.2,15.1,15.0.1}`
-* `ghcr.io/cirruslabs/macos-runner:sequoia` which is a superset of `ghcr.io/cirruslabs/macos-sequoia-xcode:{latest,16.2,16.3-beta-2,16.1,16,15.4}`
+* `ghcr.io/cirruslabs/macos-runner:sequoia` which is a superset of `ghcr.io/cirruslabs/macos-sequoia-xcode:{latest,16.2,16.1,16,15.4}`
 
 Note that `ghcr.io/cirruslabs/macos-runner:{sequoia,sonoma}` are updated every Sunday and these images are [optimised for startup](https://cirrus-runners.app/blog/2024/04/11/optimizing-startup-time-of-cirrus-runners/)
 on Cirrus Runners and Cirrus CI services.

ansible/roles/system-updater/tasks/main.yml

@@ -17,21 +17,11 @@
     recurse: yes
   become: yes
 
-- name: "ensure that there are no more software updates available: check for available updates"
-  command:
-    cmd: "softwareupdate --all --list"
-  register: software_updates_result
+- name: Ensure that there are no more software updates available (1/2)
+  command: "softwareupdate --all --list"
+  register: check_updates_result
 
-- name: "ensure that there are no more software updates available: parse available updates"
-  set_fact:
-    software_updates: "{{ software_updates_result.stdout | regex_findall('\\* Label: (.*)\\n\\tTitle: (.*), Version: (.*), Size: (.*), Recommended: (.*), Action: (.*), .*') | map('zip', ['label', 'title', 'version', 'size', 'recommended', 'action']) | map('map', 'reverse') | map('community.general.dict') }}"
-
-- name: "ensure that there are no more software updates available: print available updates"
-  debug:
-    var: software_updates
-
-- name: "ensure that there are no more software updates available: fail if some updates were not installed"
-  fail:
-    msg: "Found unapplied update: {{ item.label }}"
-  loop: "{{ software_updates }}"
-  when: "not item.label.startswith('macOS') or item.version.split('.')[0] == ansible_facts['distribution_version'].split('.')[0]"
+- name: Ensure that there are no more software updates available (2/2)
+  assert:
+    that:
+      - "'No new software available' in check_updates_result.stderr"

ansible/roles/system-updater/tasks/softwareupdate.yml

@@ -1,21 +1,8 @@
-- name: check for available updates
-  command:
-    cmd: "softwareupdate --all --list"
-  register: software_updates_result
-
-- name: parse available updates
-  set_fact:
-    software_updates: "{{ software_updates_result.stdout | regex_findall('\\* Label: (.*)\\n\\tTitle: (.*), Version: (.*), Size: (.*), Recommended: (.*), Action: (.*), .*') | map('zip', ['label', 'title', 'version', 'size', 'recommended', 'action']) | map('map', 'reverse') | map('community.general.dict') }}"
-
-- name: print available updates
-  debug:
-    var: software_updates
-
 # It seems that we must always pass "--restart" command-line argument to "softwareupdate",
 # otherwise on the OS update the "softwareupdate" will be stuck at "Downloaded: macOS [...]"
-- name: install available update
+- name: install all macOS updates
   command:
-    cmd: "softwareupdate --install --agree-to-license --force --restart --user admin --stdinpass {{ stdinpass | default('') }} '{{ item.label }}'"
+    cmd: "softwareupdate --all --install --agree-to-license --force --restart --user admin --stdinpass"
     stdin: "{{ ansible_password }}"
   register: update_result
   # Work around the following:
@@ -24,13 +11,9 @@
   # > ssh: connect to host [...] port 22: Connection refused.
   ignore_unreachable: yes
   # Ignore SIGTERM/SIGKILL sent "softwareupdate" process
-  # when the system reboots due to --restart and any other errors,
-  # since we'll check whether the update was installed in main.yml
-  # anyway.
-  ignore_errors: yes
+  # when the system reboots due to --restart
+  failed_when: update_result.rc not in [0, 9, -9, 15, -15]
   become: yes
-  loop: "{{ software_updates }}"
-  when: "not item.label.startswith('macOS') or item.version.split('.')[0] == ansible_facts['distribution_version'].split('.')[0]"
 
 # Wait for the connection since the previous command could restart the host
 - name: wait for connection
@@ -40,4 +23,4 @@
     # the commands below on a non-restarted system.
     delay: 60
     timeout: 1800
-  when: update_result is defined and not update_result.skipped | default(false)
+  when: "'No updates are available' not in (update_result.stderr_lines | join('\n'))"

data/setup-info-template.json

@@ -1,40 +0,0 @@
-[
-  {
-    "group": "Runner Detail",
-    "detail": [
-      {
-        "name": "OS Information",
-        "script": "echo \"macOS $(sw_vers -productVersion) ($(sw_vers -buildVersion))\""
-      },
-      {
-        "name": "Build Date",
-        "script": "date +\"%Y-%m-%d\""
-      }
-    ]
-  },
-  {
-    "group": "Software Detail",
-    "detail": [
-      {
-        "name": "Python Version",
-        "script": "python3 --version"
-      },
-      {
-        "name": "Node Version",
-        "script": "node --version"
-      },
-      {
-        "name": "Ruby Version",
-        "script": "ruby --version"
-      },
-      {
-        "name": "CocoaPods Version",
-        "script": "pod --version"
-      },
-      {
-        "name": "Fastlane Version",
-        "script": "fastlane --version"
-      }
-    ]
-  }
-]

templates/resolve-macos-number.pkr.hcl

@@ -34,9 +34,7 @@ build {
 
   provisioner "shell" {
     inline = [
-      # Use "-productVersion" instead of "--productVersion"
-      # to support old-style syntax used on macOS Monterey
-      "sw_vers -productVersion > /tmp/sw-vers-product-version.txt",
+      "sw_vers --productVersion > /tmp/sw-vers-product-version.txt",
     ]
   }
 

templates/vanilla-monterey.pkr.hcl

@@ -17,7 +17,7 @@ source "tart-cli" "tart" {
   vm_name      = "monterey-vanilla"
   cpu_count    = 4
   memory_gb    = 8
-  disk_size_gb = 50
+  disk_size_gb = 40
   ssh_password = "admin"
   ssh_username = "admin"
   ssh_timeout  = "120s"
@@ -135,14 +135,5 @@ build {
 
   provisioner "ansible" {
     playbook_file = "ansible/playbook-system-updater.yml"
-    extra_arguments = [
-      "-vvv",
-      "--extra-vars", "stdinpass=admin",
-    ]
-    ansible_env_vars = [
-      "ANSIBLE_TRANSPORT=paramiko",
-      "ANSIBLE_HOST_KEY_CHECKING=False",
-    ]
-    use_proxy = false
   }
 }

templates/vanilla-sequoia.pkr.hcl

@@ -16,7 +16,7 @@ source "tart-cli" "tart" {
   vm_name      = "sequoia-vanilla"
   cpu_count    = 4
   memory_gb    = 8
-  disk_size_gb = 50
+  disk_size_gb = 40
   ssh_password = "admin"
   ssh_username = "admin"
   ssh_timeout  = "300s"
@@ -137,13 +137,5 @@ build {
 
   provisioner "ansible" {
     playbook_file = "ansible/playbook-system-updater.yml"
-    extra_arguments = [
-      "-vvv",
-    ]
-    ansible_env_vars = [
-      "ANSIBLE_TRANSPORT=paramiko",
-      "ANSIBLE_HOST_KEY_CHECKING=False",
-    ]
-    use_proxy = false
   }
 }

templates/vanilla-sonoma.pkr.hcl

@@ -16,7 +16,7 @@ source "tart-cli" "tart" {
   vm_name      = "sonoma-vanilla"
   cpu_count    = 4
   memory_gb    = 8
-  disk_size_gb = 50
+  disk_size_gb = 40
   ssh_password = "admin"
   ssh_username = "admin"
   ssh_timeout  = "120s"
@@ -134,13 +134,5 @@ build {
 
   provisioner "ansible" {
     playbook_file = "ansible/playbook-system-updater.yml"
-    extra_arguments = [
-      "-vvv",
-    ]
-    ansible_env_vars = [
-      "ANSIBLE_TRANSPORT=paramiko",
-      "ANSIBLE_HOST_KEY_CHECKING=False",
-    ]
-    use_proxy = false
   }
 }

templates/vanilla-ventura.pkr.hcl

@@ -18,7 +18,7 @@ source "tart-cli" "tart" {
   vm_name      = "ventura-vanilla"
   cpu_count    = 4
   memory_gb    = 8
-  disk_size_gb = 50
+  disk_size_gb = 40
   ssh_password = "admin"
   ssh_username = "admin"
   ssh_timeout  = "120s"
@@ -143,13 +143,5 @@ build {
 
   provisioner "ansible" {
     playbook_file = "ansible/playbook-system-updater.yml"
-    extra_arguments = [
-      "-vvv",
-    ]
-    ansible_env_vars = [
-      "ANSIBLE_TRANSPORT=paramiko",
-      "ANSIBLE_HOST_KEY_CHECKING=False",
-    ]
-    use_proxy = false
   }
 }

templates/xcode.pkr.hcl

@@ -261,27 +261,4 @@ build {
       "sleep 1800"
     ]
   }
-
-  // Install setup-info-generator
-  provisioner "shell" {
-    inline = [
-      "source ~/.zprofile",
-      "brew install cirruslabs/cli/setup-info-generator"
-    ]
-  }
-
-  // Copy setup info template
-  provisioner "file" {
-    source      = "data/setup-info-template.json"
-    destination = "~/setup-info-template.json"
-  }
-
-  // Generate setup info
-  provisioner "shell" {
-    inline = [
-      "source ~/.zprofile",
-      "cat ~/setup-info-template.json | setup-info-generator > ~/actions-runner/.setup_info",
-      "rm ~/setup-info-template.json"
-    ]
-  }
 }