Skip to content

Commit

Permalink
Merge pull request #8515 from Agoric/mfig-install-ansible-workaround
Browse files Browse the repository at this point in the history
ci(install-deps): work around Ansible PPA breakage
  • Loading branch information
mergify[bot] authored Nov 9, 2023
2 parents 9b4745a + 0997ca5 commit 27f1b37
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 11 deletions.
10 changes: 0 additions & 10 deletions .github/workflows/test-all-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 8 additions & 1 deletion packages/deployment/scripts/install-deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 27f1b37

Please sign in to comment.