openstack/project-config
Code Issues Proposed changes

Merge "[magnum] Replace old jobs with the experimental"

Browse Source
This commit is contained in:
Jenkins
2017-03-15 09:52:02 +00:00
committed by Gerrit Code Review
parent 6ac0eb0a7a 64d8ba9728
commit 550793787a
3 changed files with 16 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
jenkins/jobs/magnum.yaml
View File

@@ -1,80 +1,3 @@
- job-template:
name: '{pipeline}-functional-dsvm-magnum-{coe}{special}-{node}{suffix}'
node: '{node}'
wrappers:
- build-timeout:
timeout: 130
- timestamps
builders:
- link-logs
- net-info
- devstack-checkout
- shell: |
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TEMPEST=0
export DEVSTACK_GATE_NEUTRON=1
# Enable tempest for tempest plugin
export ENABLED_SERVICES=tempest
export DEVSTACK_LOCAL_CONFIG="disable_service horizon"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service s-account"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service s-container"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service s-object"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service s-proxy"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-acentral"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-acompute"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-alarm-evaluator"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-alarm-notifier"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-api"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-collector"
export BRANCH_OVERRIDE={branch-override}
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi
if [ "{special}" == "-identity-v3-only" ] ; then
export DEVSTACK_LOCAL_CONFIG="ENABLE_IDENTITY_V2=False"
fi
export PROJECTS="openstack/magnum $PROJECTS"
export PROJECTS="openstack/python-magnumclient $PROJECTS"
export PROJECTS="openstack/diskimage-builder $PROJECTS"
if [ "{special}" == "-ironic" ] ; then
export PROJECTS="openstack/ironic $PROJECTS"
export PROJECTS="openstack/ironic-lib $PROJECTS"
export PROJECTS="openstack/ironic-python-agent $PROJECTS"
export PROJECTS="openstack/python-ironicclient $PROJECTS"
export PROJECTS="openstack/pyghmi $PROJECTS"
export PROJECTS="openstack/virtualbmc $PROJECTS"
fi
# Keep localrc to be able to set some vars in post_test_hook
export KEEP_LOCALRC=1
function gate_hook {{
cd /opt/stack/new/magnum/
./magnum/tests/contrib/gate_hook.sh {coe} {special}
}}
export -f gate_hook
function post_test_hook {{
source $BASE/new/devstack/accrc/admin/admin
cd /opt/stack/new/magnum/
./magnum/tests/contrib/post_test_hook.sh {coe} {special}
}}
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
- builder:
name: devstack-magnum
builders:
@@ -160,7 +83,7 @@
- job-template:
name: '{pipeline}-experimental-functional-dsvm-magnum-{coe}-{node}{suffix}'
name: '{pipeline}-functional-dsvm-magnum-{coe}-{node}{suffix}'
node: '{node}'
wrappers:
@@ -186,7 +109,7 @@
- console-log
- job-template:
name: '{pipeline}-experimental-functional-dsvm-magnum-{coe}-ironic-{node}{suffix}'
name: '{pipeline}-functional-dsvm-magnum-{coe}-ironic-{node}{suffix}'
node: '{node}'
wrappers:
@@ -212,7 +135,7 @@
- console-log
- job-template:
name: '{pipeline}-experimental-functional-dsvm-magnum-{coe}-identity-v3-only-{node}{suffix}'
name: '{pipeline}-functional-dsvm-magnum-{coe}-identity-v3-only-{node}{suffix}'
node: '{node}'
wrappers:
@@ -238,7 +161,7 @@
- console-log
- job-template:
name: '{pipeline}-experimental-functional-dsvm-magnum-{coe}-multinode-{node-release}{suffix}'
name: '{pipeline}-functional-dsvm-magnum-{coe}-multinode-{node-release}{suffix}'
node: '{node}'
wrappers:

56
jenkins/jobs/projects.yaml
View File

@@ -6412,45 +6412,7 @@
- 'gate-{name}-tox-{envlist}-{node}':
envlist: migration
node: ubuntu-xenial
- '{pipeline}-functional-dsvm-magnum-{coe}{special}-{node}{suffix}':
pipeline: gate
node:
- ubuntu-trusty
- ubuntu-xenial
coe:
- 'api'
- 'k8s'
- 'swarm'
- 'mesos'
special: ''
suffix: ''
branch-override: default
- '{pipeline}-functional-dsvm-magnum-{coe}{special}-{node}{suffix}':
pipeline: gate
node: ubuntu-xenial
coe: 'swarm-mode'
special: ''
suffix: '-nv'
branch-override: default
- '{pipeline}-functional-dsvm-magnum-{coe}{special}-{node}{suffix}':
pipeline: gate
node:
- ubuntu-trusty
- ubuntu-xenial
coe: 'api'
special: '-identity-v3-only'
suffix: '-nv'
branch-override: default
- '{pipeline}-functional-dsvm-magnum-{coe}{special}-{node}{suffix}':
pipeline: gate
node: ubuntu-xenial
coe:
- 'k8s'
- 'swarm'
special: '-ironic'
suffix: '-nv'
branch-override: default
- '{pipeline}-experimental-functional-dsvm-magnum-{coe}-{node}{suffix}':
- '{pipeline}-functional-dsvm-magnum-{coe}-{node}{suffix}':
pipeline: gate
node:
- ubuntu-trusty
@@ -6462,32 +6424,32 @@
- 'mesos'
suffix: ''
branch-override: default
- '{pipeline}-experimental-functional-dsvm-magnum-{coe}-multinode-{node-release}{suffix}':
- '{pipeline}-functional-dsvm-magnum-{coe}-multinode-{node-release}{suffix}':
pipeline: gate
node: ubuntu-xenial-2-node
node-release: ubuntu-xenial
coe: 'k8s'
suffix: ''
suffix: '-nv'
branch-override: default
- '{pipeline}-experimental-functional-dsvm-magnum-{coe}-{node}{suffix}':
- '{pipeline}-functional-dsvm-magnum-{coe}-{node}{suffix}':
pipeline: gate
node: ubuntu-xenial
coe: 'swarm-mode'
suffix: ''
suffix: '-nv'
branch-override: default
- '{pipeline}-experimental-functional-dsvm-magnum-{coe}-identity-v3-only-{node}{suffix}':
- '{pipeline}-functional-dsvm-magnum-{coe}-identity-v3-only-{node}{suffix}':
pipeline: gate
node: ubuntu-xenial
coe: 'api'
suffix: ''
suffix: '-nv'
branch-override: default
- '{pipeline}-experimental-functional-dsvm-magnum-{coe}-ironic-{node}{suffix}':
- '{pipeline}-functional-dsvm-magnum-{coe}-ironic-{node}{suffix}':
pipeline: gate
node: ubuntu-xenial
coe:
- 'k8s'
- 'swarm'
suffix: ''
suffix: '-nv'
branch-override: default
- '{pipeline}-magnum-dib-buildimage-{image-name}-{node}':
pipeline: periodic

18
zuul/layout.yaml
View File

@@ -11447,12 +11447,10 @@ projects:
- gate-functional-dsvm-magnum-k8s-ubuntu-xenial
- gate-functional-dsvm-magnum-swarm-ubuntu-trusty
- gate-functional-dsvm-magnum-swarm-ubuntu-xenial
- gate-functional-dsvm-magnum-swarm-mode-ubuntu-xenial-nv
- gate-functional-dsvm-magnum-mesos-ubuntu-trusty
- gate-functional-dsvm-magnum-mesos-ubuntu-xenial
- gate-functional-dsvm-magnum-api-identity-v3-only-ubuntu-xenial-nv
- gate-functional-dsvm-magnum-k8s-ironic-ubuntu-xenial-nv
- gate-functional-dsvm-magnum-swarm-ironic-ubuntu-xenial-nv
- gate-magnum-tox-migration-ubuntu-xenial
- magnum-coverage-ubuntu-trusty-nv
- magnum-coverage-ubuntu-xenial-nv
@@ -11469,19 +11467,9 @@ projects:
- periodic-magnum-dib-buildimage-fedora-atomic-25-ubuntu-xenial
- periodic-magnum-dib-buildimage-ubuntu-mesos-ubuntu-xenial
experimental:
- gate-experimental-functional-dsvm-magnum-api-ubuntu-trusty
- gate-experimental-functional-dsvm-magnum-api-ubuntu-xenial
- gate-experimental-functional-dsvm-magnum-k8s-ubuntu-trusty
- gate-experimental-functional-dsvm-magnum-k8s-ubuntu-xenial
- gate-experimental-functional-dsvm-magnum-k8s-multinode-ubuntu-xenial
- gate-experimental-functional-dsvm-magnum-swarm-ubuntu-trusty
- gate-experimental-functional-dsvm-magnum-swarm-ubuntu-xenial
- gate-experimental-functional-dsvm-magnum-swarm-mode-ubuntu-xenial
- gate-experimental-functional-dsvm-magnum-mesos-ubuntu-trusty
- gate-experimental-functional-dsvm-magnum-mesos-ubuntu-xenial
- gate-experimental-functional-dsvm-magnum-api-identity-v3-only-ubuntu-xenial
- gate-experimental-functional-dsvm-magnum-k8s-ironic-ubuntu-xenial
- gate-experimental-functional-dsvm-magnum-swarm-ironic-ubuntu-xenial
- gate-functional-dsvm-magnum-k8s-multinode-ubuntu-xenial-nv
- gate-functional-dsvm-magnum-swarm-mode-ubuntu-xenial-nv
- gate-functional-dsvm-magnum-swarm-ironic-ubuntu-xenial-nv
- name: openstack/magnum-specs
template: