Browse Source

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>
changes/81/565881/7
Paul Belanger 3 years ago
committed by Ian Wienand
parent
commit
9d6c0a9307
  1. 10
      .zuul.yaml
  2. 2
      bindep.txt
  3. 18
      tools/test-setup.sh

10
.zuul.yaml

@ -53,6 +53,11 @@
irrelevant-files:
- zuul/cmd/migrate.py
- playbooks/zuul-migrate/.*
- tox-py36:
nodeset: ubuntu-bionic
irrelevant-files:
- zuul/cmd/migrate.py
- playbooks/zuul-migrate/.*
- build-javascript-content:
success-url: 'npm/html/status.html'
files:
@ -89,6 +94,11 @@
irrelevant-files:
- zuul/cmd/migrate.py
- playbooks/zuul-migrate/.*
- tox-py36:
nodeset: ubuntu-bionic
irrelevant-files:
- zuul/cmd/migrate.py
- playbooks/zuul-migrate/.*
- build-javascript-content:
success-url: 'npm/html/status.html'
files:

2
bindep.txt

@ -17,7 +17,7 @@ libffi-dev [platform:dpkg]
libffi-devel [platform:rpm]
python3-dev [platform:dpkg]
python3-devel [platform:rpm !platform:centos]
bubblewrap [platform:rpm]
bubblewrap [!platform:ubuntu-xenial]
redhat-rpm-config [platform:rpm]
libre2-dev [platform:dpkg]
re2-devel [platform:rpm]

18
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
Loading…
Cancel
Save