| commit | 3324de295921fa7a4b14606c49b017c7c2388ed2 | [log] [tgz] |
|---|---|---|
| author | Erik Rose <erikrose@google.com> | Wed Aug 03 10:06:30 2022 -0400 |
| committer | SkCQ <skcq-be@skia-corp.google.com.iam.gserviceaccount.com> | Wed Aug 03 14:19:53 2022 +0000 |
| tree | 95d42fd801a32d20d3363fd53d8412fa26cc5feb | |
| parent | e47e8553779715c91b068fe0f2d8738ea87849e3 [diff] |
[skolo] Avoid curl's --output-dir option, which macOS 10.15 lacks. Also stop warning on our necessarily intense use of curl in get_ansible_binaries. Change-Id: I68c660aec063555f558f705320f9a11fbd56a8f4 Reviewed-on: https://skia-review.googlesource.com/c/buildbot/+/564872 Auto-Submit: Erik Rose <erikrose@google.com> Commit-Queue: Joe Gregorio <jcgregorio@google.com> Reviewed-by: Joe Gregorio <jcgregorio@google.com>
diff --git a/skolo/ansible/switchboard/prepare-mac-for-ansible.yml b/skolo/ansible/switchboard/prepare-mac-for-ansible.yml index 764ba53..65ca81f 100644 --- a/skolo/ansible/switchboard/prepare-mac-for-ansible.yml +++ b/skolo/ansible/switchboard/prepare-mac-for-ansible.yml
@@ -41,7 +41,7 @@ block: - name: Download Python installer. # Works even if the file is already there: - raw: curl -O 'https://www.python.org/ftp/python/3.9.6/{{ python_pkg }}' --output-dir ~{{ skolo_account }}/Downloads + raw: curl 'https://www.python.org/ftp/python/3.9.6/{{ python_pkg }}' -o ~{{ skolo_account }}/Downloads/{{ python_pkg }} - name: Run installer. become: true
diff --git a/skolo/ansible/switchboard/roles/get_ansible_binaries/tasks/main.yml b/skolo/ansible/switchboard/roles/get_ansible_binaries/tasks/main.yml index 4b1acf4..c56753c 100644 --- a/skolo/ansible/switchboard/roles/get_ansible_binaries/tasks/main.yml +++ b/skolo/ansible/switchboard/roles/get_ansible_binaries/tasks/main.yml
@@ -15,6 +15,7 @@ 'curl --silent --cookie ~/.gitcookies https://skia.googlesource.com/a/k8s-config/+/refs/heads/main/ansible-tags/{{ get_ansible_binaries_application }}/version.txt?format=TEXT | base64 -d' + warn: false - name: Download to the temp dir the specified version of the binaries. run_once: true