openstack/project-config
Code Issues Proposed changes

Merge "Revert "Add magnum plugin to keystone2 job in shade""

Browse Source
This commit is contained in:
Jenkins 2016-05-03 09:05:37 +00:00 committed by Gerrit Code Review
commit f854501335
2 changed files with 47 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
jenkins/jobs/shade.yaml
View File

@ -18,14 +18,9 @@
export DEVSTACK_GATE_NEUTRON=1 export DEVSTACK_GATE_NEUTRON=1
export DEVSTACK_GATE_HEAT=1 export DEVSTACK_GATE_HEAT=1
export DEVSTACK_LOCAL_CONFIG="enable_plugin designate git://git.openstack.org/openstack/designate" export DEVSTACK_LOCAL_CONFIG="enable_plugin designate git://git.openstack.org/openstack/designate"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin magnum git://git.openstack.org/openstack/magnum"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_GUEST_IMAGE_URL='http://tarballs.openstack.org/magnum/images/fedora-atomic-f23-dib.qcow2'"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_IMAGE_NAME='fedora-atomic-f23-dib'"
export PROJECTS="openstack/designate $PROJECTS" export PROJECTS="openstack/designate $PROJECTS"
export PROJECTS="openstack/designate-dashboard $PROJECTS" export PROJECTS="openstack/designate-dashboard $PROJECTS"
export PROJECTS="openstack/designate-tempest-plugin $PROJECTS" export PROJECTS="openstack/designate-tempest-plugin $PROJECTS"
export PROJECTS="openstack/magnum $PROJECTS"
export PROJECTS="openstack/python-magnumclient $PROJECTS"
export PROJECTS="openstack-infra/shade $PROJECTS" export PROJECTS="openstack-infra/shade $PROJECTS"
export BRANCH_OVERRIDE={branch-override} export BRANCH_OVERRIDE={branch-override}
if [ "$BRANCH_OVERRIDE" != "default" ] ; then if [ "$BRANCH_OVERRIDE" != "default" ] ; then
@ -202,6 +197,46 @@
- devstack-logs - devstack-logs
- console-log - console-log
- job:
name: 'gate-shade-dsvm-functional-keystone2-magnum'
node: ubuntu-trusty
wrappers:
- build-timeout:
timeout: 70
- timestamps
builders:
- link-logs
- net-info
- devstack-checkout
- shell: |
#!/bin/bash -xe
export SHADE_USE_KEYSTONE_V2=1
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_NEUTRON=1
export DEVSTACK_GATE_HEAT=1
export PROJECTS="openstack/designate $PROJECTS"
export PROJECTS="openstack/designate-dashboard $PROJECTS"
export PROJECTS="openstack/designate-tempest-plugin $PROJECTS"
export PROJECTS="openstack/magnum $PROJECTS"
export PROJECTS="openstack/python-magnumclient $PROJECTS"
export PROJECTS="openstack-infra/shade $PROJECTS"
export DEVSTACK_LOCAL_CONFIG="enable_plugin designate git://git.openstack.org/openstack/designate"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin magnum git://git.openstack.org/openstack/magnum"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_GUEST_IMAGE_URL='http://tarballs.openstack.org/magnum/images/fedora-atomic-f23-dib.qcow2'"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_IMAGE_NAME='fedora-atomic-f23-dib'"
function post_test_hook {
$BASE/new/shade/shade/tests/functional/hooks/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: - job:
name: 'gate-shade-dsvm-functional-neutron-magnum' name: 'gate-shade-dsvm-functional-neutron-magnum'
node: ubuntu-trusty node: ubuntu-trusty
@ -227,6 +262,9 @@
export PROJECTS="openstack/python-magnumclient $PROJECTS" export PROJECTS="openstack/python-magnumclient $PROJECTS"
export PROJECTS="openstack-infra/shade $PROJECTS" export PROJECTS="openstack-infra/shade $PROJECTS"
export DEVSTACK_LOCAL_CONFIG="enable_plugin designate git://git.openstack.org/openstack/designate" export DEVSTACK_LOCAL_CONFIG="enable_plugin designate git://git.openstack.org/openstack/designate"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin magnum git://git.openstack.org/openstack/magnum"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_GUEST_IMAGE_URL='http://tarballs.openstack.org/magnum/images/fedora-atomic-f23-dib.qcow2'"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_IMAGE_NAME='fedora-atomic-f23-dib'"
function post_test_hook { function post_test_hook {
$BASE/new/shade/shade/tests/functional/hooks/post_test_hook.sh $BASE/new/shade/shade/tests/functional/hooks/post_test_hook.sh

4
zuul/layout.yaml
View File

@ -1684,6 +1684,9 @@ jobs:
- name: gate-dsvm-nodepool-src-shade - name: gate-dsvm-nodepool-src-shade
voting: false voting: false
- name: gate-shade-dsvm-functional-keystone2-magnum
voting: false
- name: gate-bashate-devstack - name: gate-bashate-devstack
voting: false voting: false
@ -4040,6 +4043,7 @@ projects:
- gate-shade-dsvm-ansible - gate-shade-dsvm-ansible
- gate-shade-dsvm-ansible-dev-nv - gate-shade-dsvm-ansible-dev-nv
- gate-dsvm-nodepool-src-shade - gate-dsvm-nodepool-src-shade
- gate-shade-dsvm-functional-keystone2-magnum
gate: gate:
- gate-shade-dsvm-functional-keystone2 - gate-shade-dsvm-functional-keystone2
- gate-shade-dsvm-functional-neutron - gate-shade-dsvm-functional-neutron