Merge "Gate on CentOS 7 and check on Ubuntu Bionic"

This commit is contained in:
Zuul 2018-08-25 08:31:13 +00:00 committed by Gerrit Code Review
commit b67c1010da
2 changed files with 22 additions and 1 deletions

View File

@ -15,7 +15,7 @@
- ^releasenotes/.*$
vars:
devstack_localrc:
TEMPEST_PLUGINS: "'{{ ansible_user_dir }}/src/git.openstack.org/openstack/octavia-tempest-plugin'"
TEMPEST_PLUGINS: "'/opt/stack/octavia-tempest-plugin'"
devstack_local_conf:
post-config:
$OCTAVIA_CONF:
@ -124,3 +124,20 @@
vars:
devstack_localrc:
USE_PYTHON3: true
- job:
name: octavia-v2-dsvm-scenario-centos.7
parent: octavia-v2-dsvm-scenario
nodeset: devstack-single-node-centos-7
vars:
devstack_localrc:
OCTAVIA_AMP_BASE_OS: centos
OCTAVIA_AMP_DISTRIBUTION_RELEASE_ID: 7
OCTAVIA_AMP_IMAGE_SIZE: 3
- job:
name: octavia-v2-dsvm-scenario-ubuntu.bionic
parent: octavia-v2-dsvm-scenario
vars:
devstack_localrc:
OCTAVIA_AMP_BASE_OS: ubuntu
OCTAVIA_AMP_DISTRIBUTION_RELEASE_ID: bionic

View File

@ -11,6 +11,9 @@
- octavia-v2-dsvm-noop-py35-api
- octavia-v2-dsvm-scenario
- octavia-v2-dsvm-py35-scenario
- octavia-v2-dsvm-scenario-centos.7
- octavia-v2-dsvm-scenario-ubuntu.bionic:
voting: false
gate:
queue: octavia
jobs:
@ -18,3 +21,4 @@
- octavia-v2-dsvm-noop-py35-api
- octavia-v2-dsvm-scenario
- octavia-v2-dsvm-py35-scenario
- octavia-v2-dsvm-scenario-centos.7