diff options
| author | Paul Belanger <pabelanger@redhat.com> | 2018-05-02 15:26:43 -0400 |
|---|---|---|
| committer | Ian Wienand <iwienand@redhat.com> | 2018-05-07 15:07:40 +1000 |
| commit | 9d6c0a9307a55bda5679b897c99638cd6841cb39 (patch) | |
| tree | 72b982373af16cc75a4196c2965c927178dc471c /tools | |
| parent | ac6a277060b19e42b4f3e8f3ecd498806e78dce7 (diff) | |
| download | zuul-9d6c0a9307a55bda5679b897c99638cd6841cb39.tar.gz | |
Add tox-py36 jobs
Now that we have ubuntu-bionic images online, we can start gating for
python3.6.
We only need to install bubblewrap PPA for ubuntu-xenial,
ubuntu-bionic already has bubblewrap packaged.
Update bindep.txt skipping ubuntu-xenial for bubblewrap.
Change-Id: Ic850a07001a9adef9cc459fcb107e0ebaaddf8ab
Depends-On: https://review.openstack.org/565884
Depends-On: https://review.openstack.org/565948
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/test-setup.sh | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/tools/test-setup.sh b/tools/test-setup.sh index 7fc46f867..d8538df67 100755 --- a/tools/test-setup.sh +++ b/tools/test-setup.sh @@ -42,12 +42,14 @@ mysql -u $DB_USER -p$DB_PW -h 127.0.0.1 -e " sudo -u postgres psql -c "CREATE ROLE $DB_USER WITH LOGIN SUPERUSER PASSWORD '$DB_PW';" sudo -u postgres psql -c "CREATE DATABASE openstack_citest OWNER $DB_USER TEMPLATE template0 ENCODING 'UTF8';" -# TODO(pabelanger): Move this into bindep after we figure out how to enable our -# PPA. -# NOTE(pabelanger): Avoid hitting http://keyserver.ubuntu.com -sudo apt-key add $TOOLSDIR/018D05F5.gpg LSBDISTCODENAME=$(lsb_release -cs) -echo "deb http://ppa.launchpad.net/openstack-ci-core/bubblewrap/ubuntu $LSBDISTCODENAME main" | \ - sudo tee /etc/apt/sources.list.d/openstack-ci-core-ubuntu-bubblewrap-xenial.list -sudo apt-get update -sudo apt-get --assume-yes install bubblewrap +if [ $LSBDISTCODENAME == 'xenial' ]; then + # TODO(pabelanger): Move this into bindep after we figure out how to enable our + # PPA. + # NOTE(pabelanger): Avoid hitting http://keyserver.ubuntu.com + sudo apt-key add $TOOLSDIR/018D05F5.gpg + echo "deb http://ppa.launchpad.net/openstack-ci-core/bubblewrap/ubuntu $LSBDISTCODENAME main" | \ + sudo tee /etc/apt/sources.list.d/openstack-ci-core-ubuntu-bubblewrap-xenial.list + sudo apt-get update + sudo apt-get --assume-yes install bubblewrap +fi |