From 1d9642ed3d477d635ef02f24b42d61a006b5145d Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Wed, 21 Nov 2018 12:49:52 -0600 Subject: [PATCH] Issue #1760: Workaround for easy_install missing in Ubuntu 18.04. --- .travis.yml | 2 ++ tests/run-tests.sh | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 33b234b54..8e5d93128 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 diff --git a/tests/run-tests.sh b/tests/run-tests.sh index a0e0ccd0d..5d1b148a4 100755 --- a/tests/run-tests.sh +++ b/tests/run-tests.sh @@ -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 @@ -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.