From 62c4edf2294d063f70eb68c81e7dfa09651f5df7 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Tue, 18 Feb 2025 07:24:29 -0600 Subject: [PATCH] test failure runners2 --- .github/workflows/10min-iiab-test-install.yml | 4 ++-- .../workflows/30min-iiab-test-install-deb12-on-rpi3.yml | 4 ++-- .../30min-iiab-test-install-raspios-on-zero2w.yml | 4 ++-- scripts/ansible | 7 +++---- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.github/workflows/10min-iiab-test-install.yml b/.github/workflows/10min-iiab-test-install.yml index bf7a0b83e..55b3f9c5b 100644 --- a/.github/workflows/10min-iiab-test-install.yml +++ b/.github/workflows/10min-iiab-test-install.yml @@ -51,8 +51,8 @@ jobs: sudo mkdir /etc/iiab # touch /etc/iiab/local_vars.yml sudo cp /opt/iiab/iiab/vars/local_vars_none.yml /etc/iiab/local_vars.yml - sudo mkdir /usr/local/bin/ansible - sudo cp /opt/iiab/iiab/collections.yml /usr/local/bin/ansible/ + sudo mkdir /usr/local/ansible + sudo cp /opt/iiab/iiab/collections.yml /usr/local/ansible/collections.yml - run: sudo /opt/iiab/iiab/scripts/ansible - run: sudo ./iiab-install working-directory: /opt/iiab/iiab diff --git a/.github/workflows/30min-iiab-test-install-deb12-on-rpi3.yml b/.github/workflows/30min-iiab-test-install-deb12-on-rpi3.yml index dff53c1e0..cf042837a 100644 --- a/.github/workflows/30min-iiab-test-install-deb12-on-rpi3.yml +++ b/.github/workflows/30min-iiab-test-install-deb12-on-rpi3.yml @@ -58,8 +58,8 @@ jobs: ls /opt/iiab/iiab mkdir /etc/iiab cp /opt/iiab/iiab/vars/local_vars_none.yml /etc/iiab/local_vars.yml - mkdir /usr/local/bin/ansible - cp /opt/iiab/iiab/collections.yml /usr/local/bin/ansible/ + mkdir /usr/local/ansible + cp /opt/iiab/iiab/collections.yml /usr/local/ansible/collections.yml /opt/iiab/iiab/scripts/ansible ./iiab-install cd /opt/iiab/iiab diff --git a/.github/workflows/30min-iiab-test-install-raspios-on-zero2w.yml b/.github/workflows/30min-iiab-test-install-raspios-on-zero2w.yml index 9c4c7f1af..3b4502dde 100644 --- a/.github/workflows/30min-iiab-test-install-raspios-on-zero2w.yml +++ b/.github/workflows/30min-iiab-test-install-raspios-on-zero2w.yml @@ -70,8 +70,8 @@ jobs: ls /opt/iiab/iiab mkdir /etc/iiab cp /opt/iiab/iiab/vars/local_vars_none.yml /etc/iiab/local_vars.yml - mkdir /usr/local/bin/ansible - cp /opt/iiab/iiab/collections.yml /usr/local/bin/ansible/ + mkdir /usr/local/ansible + cp /opt/iiab/iiab/collections.yml /usr/local/ansible/collections.yml /opt/iiab/iiab/scripts/ansible ./iiab-install cd /opt/iiab/iiab diff --git a/scripts/ansible b/scripts/ansible index 54962723a..03a446b5b 100755 --- a/scripts/ansible +++ b/scripts/ansible @@ -290,8 +290,6 @@ EOF # - 'apt -y install libffi-dev python3-dev' # - painstaking pinning of cryptography or cffi (etc) to older version #s /usr/local/ansible/bin/python3 -m pip install --prefer-binary --upgrade ansible-core - # test github runners fail without true - cp $CWD/collections.yml /usr/local/ansible/ || true echo -e "\nCreate symlinks /usr/local/bin/ansible* -> /usr/local/ansible/bin/ansible*" cd /usr/local/ansible/bin for bin in ansible*; do @@ -303,10 +301,11 @@ EOF # explicit upgrading of collections (--upgrade / -U flag) in version "2.11" # with PR ansible/ansible#73336. See also IIAB PRs #2647 #2652 #2653 #2655. echo -e "\n\nIIAB requires these ~4 Ansible Collections: (we upgrade them here if possible!)\n" + # test github runners fail without '|| true' + cp $CWD/collections.yml /usr/local/ansible/ || true cd /usr/local/ansible/ . bin/activate - bin/ansible-galaxy collection install --force-with-deps -r collections.yml -p collections - deactivate + bin/ansible-galaxy collection install --force-with-deps -r collections.yml -p collections deactivate fi # But going forward they'll be stored herein: [~24MB for 4 Collections as of 2025-02-18] # /usr/local/ansible/collections/ansible_collections