Transition ec2-api jobs to xenial
This is part of the trusty to xenial transition. For changes against branches >= newton run jobs on Xenial. Older branches continue to run on trusty. Change-Id: Idfc480c1a7732543c4aeb167146e0e670e6f509d
This commit is contained in:
parent
89d993de8e
commit
1ea787a74d
|
@ -1,5 +1,5 @@
|
||||||
- job-template:
|
- job-template:
|
||||||
name: '{pipeline}-functional-{network}-dsvm-ec2api{job-suffix}'
|
name: '{pipeline}-functional-{network}-dsvm-ec2api-{node}{job-suffix}'
|
||||||
node: '{node}'
|
node: '{node}'
|
||||||
|
|
||||||
wrappers:
|
wrappers:
|
||||||
|
@ -40,9 +40,9 @@
|
||||||
- devstack-logs
|
- devstack-logs
|
||||||
- console-log
|
- console-log
|
||||||
|
|
||||||
- job:
|
- job-template:
|
||||||
name: 'ec2-api-functional-neutron-dsvm-full'
|
name: 'ec2-api-functional-neutron-dsvm-full-{node}{job-suffix}'
|
||||||
node: ubuntu-trusty
|
node: '{node}'
|
||||||
|
|
||||||
wrappers:
|
wrappers:
|
||||||
- build-timeout:
|
- build-timeout:
|
||||||
|
@ -65,11 +65,11 @@
|
||||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"RUN_LONG_TESTS=1"
|
export DEVSTACK_LOCAL_CONFIG+=$'\n'"RUN_LONG_TESTS=1"
|
||||||
export ENABLED_SERVICES+=,swift3
|
export ENABLED_SERVICES+=,swift3
|
||||||
|
|
||||||
function post_test_hook {
|
function post_test_hook {{
|
||||||
source $BASE/new/devstack/accrc/admin/admin
|
source $BASE/new/devstack/accrc/admin/admin
|
||||||
cd /opt/stack/new/ec2-api/
|
cd /opt/stack/new/ec2-api/
|
||||||
./ec2api/tests/contrib/post_test_hook.sh
|
./ec2api/tests/contrib/post_test_hook.sh
|
||||||
}
|
}}
|
||||||
export -f post_test_hook
|
export -f post_test_hook
|
||||||
|
|
||||||
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
|
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
|
||||||
|
@ -79,9 +79,9 @@
|
||||||
- devstack-logs
|
- devstack-logs
|
||||||
- console-log
|
- console-log
|
||||||
|
|
||||||
- job:
|
- job-template:
|
||||||
name: 'ec2-api-rally-dsvm-fakevirt'
|
name: 'ec2-api-rally-dsvm-fakevirt-{node}{job-suffix}'
|
||||||
node: ubuntu-trusty
|
node: '{node}'
|
||||||
|
|
||||||
wrappers:
|
wrappers:
|
||||||
- build-timeout:
|
- build-timeout:
|
||||||
|
@ -105,13 +105,13 @@
|
||||||
export RALLY_SCENARIO=ec2-api-fakevirt
|
export RALLY_SCENARIO=ec2-api-fakevirt
|
||||||
export CEILOMETER_NOTIFICATION_TOPICS=notifications,profiler
|
export CEILOMETER_NOTIFICATION_TOPICS=notifications,profiler
|
||||||
|
|
||||||
function post_test_hook {
|
function post_test_hook {{
|
||||||
# run needed preparation steps for third-party project
|
# run needed preparation steps for third-party project
|
||||||
if [ -f $BASE/new/ec2-api/rally-scenarios/post_test_hook.sh ] ; then
|
if [ -f $BASE/new/ec2-api/rally-scenarios/post_test_hook.sh ] ; then
|
||||||
$BASE/new/ec2-api/rally-scenarios/post_test_hook.sh
|
$BASE/new/ec2-api/rally-scenarios/post_test_hook.sh
|
||||||
fi
|
fi
|
||||||
$BASE/new/rally/tests/ci/rally-gate.sh
|
$BASE/new/rally/tests/ci/rally-gate.sh
|
||||||
}
|
}}
|
||||||
export -f post_test_hook
|
export -f post_test_hook
|
||||||
|
|
||||||
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
|
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
|
||||||
|
|
|
@ -4265,18 +4265,32 @@
|
||||||
- 'gate-{name}-python35{suffix}':
|
- 'gate-{name}-python35{suffix}':
|
||||||
suffix: '-nv'
|
suffix: '-nv'
|
||||||
- pypi-jobs
|
- pypi-jobs
|
||||||
- '{pipeline}-functional-{network}-dsvm-ec2api{job-suffix}':
|
- '{pipeline}-functional-{network}-dsvm-ec2api-{node}{job-suffix}':
|
||||||
pipeline: gate
|
pipeline: gate
|
||||||
node: ubuntu-trusty
|
node:
|
||||||
|
- ubuntu-trusty
|
||||||
|
- ubuntu-xenial
|
||||||
job-suffix: ''
|
job-suffix: ''
|
||||||
branch-override: default
|
branch-override: default
|
||||||
network: 'neutron'
|
network: 'neutron'
|
||||||
- '{pipeline}-functional-{network}-dsvm-ec2api{job-suffix}':
|
- '{pipeline}-functional-{network}-dsvm-ec2api-{node}{job-suffix}':
|
||||||
pipeline: gate
|
pipeline: gate
|
||||||
node: ubuntu-trusty
|
node:
|
||||||
|
- ubuntu-trusty
|
||||||
|
- ubuntu-xenial
|
||||||
job-suffix: ''
|
job-suffix: ''
|
||||||
branch-override: default
|
branch-override: default
|
||||||
network: 'nova-network'
|
network: 'nova-network'
|
||||||
|
- 'ec2-api-functional-neutron-dsvm-full-{node}{job-suffix}':
|
||||||
|
node:
|
||||||
|
- ubuntu-trusty
|
||||||
|
- ubuntu-xenial
|
||||||
|
job-suffix: '-nv'
|
||||||
|
- 'ec2-api-rally-dsvm-fakevirt-{node}{job-suffix}':
|
||||||
|
node:
|
||||||
|
- ubuntu-trusty
|
||||||
|
- ubuntu-xenial
|
||||||
|
job-suffix: '-nv'
|
||||||
|
|
||||||
- project:
|
- project:
|
||||||
name: ekko
|
name: ekko
|
||||||
|
|
|
@ -2023,12 +2023,6 @@ jobs:
|
||||||
- name: gate-functional-nova-network-dsvm-gceapi
|
- name: gate-functional-nova-network-dsvm-gceapi
|
||||||
voting: false
|
voting: false
|
||||||
|
|
||||||
- name: ec2-api-rally-dsvm-fakevirt
|
|
||||||
voting: false
|
|
||||||
|
|
||||||
- name: ec2-api-functional-neutron-dsvm-full
|
|
||||||
voting: false
|
|
||||||
|
|
||||||
- name: gate-python-magnumclient-python34
|
- name: gate-python-magnumclient-python34
|
||||||
branch: ^(?!stable/liberty).*$
|
branch: ^(?!stable/liberty).*$
|
||||||
|
|
||||||
|
@ -8843,11 +8837,15 @@ projects:
|
||||||
- name: check-requirements
|
- name: check-requirements
|
||||||
- name: publish-to-pypi
|
- name: publish-to-pypi
|
||||||
check:
|
check:
|
||||||
- gate-functional-neutron-dsvm-ec2api
|
- gate-functional-neutron-dsvm-ec2api-ubuntu-trusty
|
||||||
- gate-functional-nova-network-dsvm-ec2api
|
- gate-functional-neutron-dsvm-ec2api-ubuntu-xenial
|
||||||
|
- gate-functional-nova-network-dsvm-ec2api-ubuntu-trusty
|
||||||
|
- gate-functional-nova-network-dsvm-ec2api-ubuntu-xenial
|
||||||
experimental:
|
experimental:
|
||||||
- ec2-api-functional-neutron-dsvm-full
|
- ec2-api-functional-neutron-dsvm-full-ubuntu-trusty-nv
|
||||||
- ec2-api-rally-dsvm-fakevirt
|
- ec2-api-functional-neutron-dsvm-full-ubuntu-xenial-nv
|
||||||
|
- ec2-api-rally-dsvm-fakevirt-ubuntu-trusty-nv
|
||||||
|
- ec2-api-rally-dsvm-fakevirt-ubuntu-xenial-nv
|
||||||
|
|
||||||
- name: openstack/ec2-driver
|
- name: openstack/ec2-driver
|
||||||
template:
|
template:
|
||||||
|
|
Loading…
Reference in New Issue