zuul/zuul
Code Issues Proposed changes

Merge "Add tox-py36 jobs"

Browse Source
This commit is contained in:
Zuul 2018-05-10 18:49:37 +00:00 committed by Gerrit Code Review
commit 1b747ca65f
3 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.zuul.yaml
View File

@ -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
View File

@ -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
View File

@ -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