diff options
| -rw-r--r-- | shippable.yml | 6 | ||||
| -rwxr-xr-x | test/utils/shippable/other.sh | 8 | ||||
| -rwxr-xr-x | test/utils/shippable/units.sh | 12 |
3 files changed, 3 insertions, 23 deletions
diff --git a/shippable.yml b/shippable.yml index 54162da02e..dbf1b5c7fb 100644 --- a/shippable.yml +++ b/shippable.yml @@ -55,10 +55,10 @@ matrix: - env: TEST=linux/ubuntu1604py3/3 build: pre_ci: - - docker images | grep u14pyt + - docker images drydock/u16pytall pre_ci_boot: - image_name: drydock/u14pyt - image_tag: prod + image_name: drydock/u16pytall + image_tag: master pull: false options: "--privileged=false --net=bridge" ci: diff --git a/test/utils/shippable/other.sh b/test/utils/shippable/other.sh index ee959f55c4..3af0811913 100755 --- a/test/utils/shippable/other.sh +++ b/test/utils/shippable/other.sh @@ -2,17 +2,9 @@ set -o pipefail -retry.py add-apt-repository 'deb http://archive.ubuntu.com/ubuntu trusty-backports universe' -retry.py add-apt-repository 'ppa:ubuntu-toolchain-r/test' -retry.py add-apt-repository 'ppa:fkrull/deadsnakes' - retry.py apt-get update -qq retry.py apt-get install -qq \ shellcheck \ - g++-4.9 \ - python3.6-dev \ - -ln -sf x86_64-linux-gnu-gcc-4.9 /usr/bin/x86_64-linux-gnu-gcc retry.py pip install tox --disable-pip-version-check diff --git a/test/utils/shippable/units.sh b/test/utils/shippable/units.sh index b6f53712e2..1e57ba1a97 100755 --- a/test/utils/shippable/units.sh +++ b/test/utils/shippable/units.sh @@ -7,18 +7,6 @@ IFS='/:' read -ra args <<< "${TEST}" version="${args[1]}" -if [ "${version}" = "3.6" ]; then - retry.py add-apt-repository 'ppa:ubuntu-toolchain-r/test' - retry.py add-apt-repository 'ppa:fkrull/deadsnakes' - - retry.py apt-get update -qq - retry.py apt-get install -qq \ - g++-4.9 \ - python3.6-dev \ - - ln -sf x86_64-linux-gnu-gcc-4.9 /usr/bin/x86_64-linux-gnu-gcc -fi - retry.py pip install tox --disable-pip-version-check ansible-test units --color -v --tox --coverage --python "${version}" |