Use Shippable image: drydock/u16pytall:master (#23997)
* Use Shippable image: drydock/u16pytall:master * Do not install python 3.6 on Shippable.
This commit is contained in:
parent
be6ca006a2
commit
0587d59266
3 changed files with 3 additions and 23 deletions
|
@ -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:
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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}"
|
||||
|
|
Loading…
Reference in a new issue