openstack/project-config
Code Issues Proposed changes

Switch to Xenial: solum

Browse Source 
Change gate-solum-devstack-dsvm to a job-template.

Remove gate-solum-devstack-dsvm-centos7, it's a duplicate of
gate-solum-devstack-dsvm.

Change-Id: I45b9bd041431e4fd80cd5309f9897e881292e31c
This commit is contained in:
Andreas Jaeger
2016-12-06 20:25:45 +01:00
parent 388decb5b8
commit 4c56afa6c8
3 changed files with 22 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
jenkins/jobs/projects.yaml
View File

@@ -14379,6 +14379,14 @@
- 'gate-{name}-python35{suffix}':
suffix: '-nv'
- translation-jobs
- 'gate-solum-devstack-dsvm-{node}{suffix}':
node:
- ubuntu-trusty
- ubuntu-xenial
suffix: ''
- 'gate-solum-devstack-dsvm-{node}{suffix}':
node: centos-7
suffix: '-nv'
- project:
name: solum-dashboard

67
jenkins/jobs/solum.yaml
View File

@@ -1,6 +1,6 @@
- job:
name: 'gate-solum-devstack-dsvm'
node: ubuntu-trusty
- job-template:
name: 'gate-solum-devstack-dsvm-{node}{suffix}'
node: '{node}'
wrappers:
- build-timeout:
@@ -25,71 +25,22 @@
export KEEP_LOCALRC=1
function pre_test_hook {
function pre_test_hook {{
cd /opt/stack/new/solum/functionaltests
./pre_test_hook.sh
}
}}
export -f pre_test_hook
function gate_hook {
function gate_hook {{
cd /opt/stack/new/solum/functionaltests
./gate_hook.sh
}
}}
export -f gate_hook
function post_test_hook {
function post_test_hook {{
cd /opt/stack/new/solum/functionaltests
./post_test_hook.sh
}
export -f post_test_hook
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
./safe-devstack-vm-gate-wrap.sh
publishers:
- devstack-logs
- console-log
- job:
name: 'gate-solum-devstack-dsvm-centos7'
node: centos-7
wrappers:
- build-timeout:
timeout: 70
- timestamps
builders:
- link-logs
- net-info
- devstack-checkout
- shell: |
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_NEUTRON=1
export ENABLED_SERVICES=solum,solum-api,solum-conductor,solum-deployer,solum-worker,tempest,zaqar,barbican,mistral
export DEVSTACK_LOCAL_CONFIG="enable_plugin solum git://git.openstack.org/openstack/solum"
export PROJECTS="openstack/solum $PROJECTS"
# TODO(ravips): Workaround until barbican, mistral gets into devstack
export PROJECTS="openstack/barbican openstack/mistral $PROJECTS"
export PROJECTS="openstack/solum-dashboard $PROJECTS"
function pre_test_hook {
cd /opt/stack/new/solum/functionaltests
./pre_test_hook.sh
}
export -f pre_test_hook
function gate_hook {
cd /opt/stack/new/solum/functionaltests
./gate_hook.sh
}
export -f gate_hook
function post_test_hook {
cd /opt/stack/new/solum/functionaltests
./post_test_hook.sh
}
}}
export -f post_test_hook
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh

11
zuul/layout.yaml
View File

@@ -2810,9 +2810,6 @@ jobs:
- name: gate-solum-requirements
voting: false
- name: gate-solum-devstack-dsvm-centos7
voting: false
- name: gate-reviewstats-python34
voting: false
@@ -16759,10 +16756,12 @@ projects:
- name: check-requirements
- name: translation-jobs
check:
- gate-solum-devstack-dsvm
- gate-solum-devstack-dsvm-centos7
- gate-solum-devstack-dsvm-ubuntu-trusty
- gate-solum-devstack-dsvm-ubuntu-xenial
- gate-solum-devstack-dsvm-centos-7-nv
gate:
- gate-solum-devstack-dsvm
- gate-solum-devstack-dsvm-ubuntu-trusty
- gate-solum-devstack-dsvm-ubuntu-xenial
post:
- solum-coverage-ubuntu-trusty
- solum-coverage-ubuntu-xenial