Skip to content
This repository has been archived by the owner on Feb 13, 2023. It is now read-only.

Commit

Permalink
Issue #1760: Workaround for easy_install missing in Ubuntu 18.04.
Browse files Browse the repository at this point in the history
  • Loading branch information
geerlingguy committed Dec 28, 2018
1 parent 4ad9dfe commit 1d9642e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ env:
# Defaults - Ubuntu 18.04.
- type: defaults
distro: ubuntu1804
# https://bugs.launchpad.net/ubuntu/+source/python-setuptools/+bug/1774419
easy_install_cmd: python /usr/lib/python2.7/dist-packages/easy_install.py
# Defaults - Ubuntu 16.04.
- type: defaults
distro: ubuntu1604
Expand Down
3 changes: 2 additions & 1 deletion tests/run-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ CONTAINER_ID="${CONTAINER_ID:-dvm-test}"
type="${type:-tests/defaults}"
distro="${distro:-ubuntu1604}"
cleanup="${cleanup:-true}"
easy_install_cmd=${easy_install_cmd:-easy_install}

## Set up vars for Docker setup.
# CentOS 7
Expand Down Expand Up @@ -94,7 +95,7 @@ printf "\n"${green}"Checking playbook syntax..."${neutral}"\n"
docker exec --tty $CONTAINER_ID env TERM=xterm ansible-playbook $DRUPALVM_DIR/provisioning/playbook.yml --syntax-check

# Run Ansible Lint.
docker exec $CONTAINER_ID bash -c "easy_install ansible-lint"
docker exec $CONTAINER_ID bash -c "$easy_install_cmd ansible-lint"
docker exec $CONTAINER_ID bash -c "cd $DRUPALVM_DIR/provisioning && ansible-lint playbook.yml" || true

# Run the setup playbook.
Expand Down

0 comments on commit 1d9642e

Please sign in to comment.