From 9367c824733a67f13f6fc406e4da5c59d7b5aa68 Mon Sep 17 00:00:00 2001 From: Michael FIG Date: Wed, 8 Nov 2023 19:05:57 -0600 Subject: [PATCH 1/2] ci(install-deps): work around Ansible Launchpad PPA breakage --- packages/deployment/scripts/install-deps.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/deployment/scripts/install-deps.sh b/packages/deployment/scripts/install-deps.sh index c7ad522cf38..3cdca3cbbad 100755 --- a/packages/deployment/scripts/install-deps.sh +++ b/packages/deployment/scripts/install-deps.sh @@ -57,7 +57,14 @@ if test -d /etc/apt; then echo "deb http://ppa.launchpad.net/ansible/ansible/ubuntu $VERSION_CODENAME main" > /etc/apt/sources.list.d/ansible.list apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 93C4A3FD7BB9C367 apt-get update --allow-releaseinfo-change -y - apt-get install -y ansible rsync curl sudo gnupg2 jq libbsd-dev + apt-get install -y rsync curl sudo gnupg2 jq libbsd-dev + if apt-get install -y ansible; then : # success + else + # Failed to install Ansible, try workaround based on + # https://github.com/ansible-community/ppa/issues/77#issuecomment-1802847056 + sed -i -e '1s/^[^#]*//' /usr/lib/python3/dist-packages/ansible_collections/netapp/ontap/plugins/modules/na_ontap_s3_users.py + apt-get install -y --fix-broken + fi apt-get clean -y } elif test "$uname_s" == darwin; then From 0997ca5c1b52d1eb8d8a20780e3476905e80bf55 Mon Sep 17 00:00:00 2001 From: Michael FIG Date: Wed, 8 Nov 2023 20:32:37 -0600 Subject: [PATCH 2/2] ci(test-vats): remove unnecessary empty test --- .github/workflows/test-all-packages.yml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.github/workflows/test-all-packages.yml b/.github/workflows/test-all-packages.yml index 33558a16e9a..ecbfdd5ab6f 100644 --- a/.github/workflows/test-all-packages.yml +++ b/.github/workflows/test-all-packages.yml @@ -636,16 +636,6 @@ jobs: datadog-token: ${{ secrets.DATADOG_API_KEY }} codecov-token: ${{ secrets.CODECOV_TOKEN }} - test-vats: - # XXX remove once this is no longer a required check (and test-boot is) - runs-on: ubuntu-latest - strategy: - matrix: - engine: ['16.x', '18.x', 'xs'] - steps: - - name: yarn test (vats) - run: exit 0 - test-zoe-unit: # BEGIN-TEST-BOILERPLATE timeout-minutes: 30