openstack/project-config
Code Issues Proposed changes

Collapse keystone2 and nova-net shade jobs

Browse Source 
Both are there so that we can test old deprecated but still existing
things. There's no need to test those configs separately.

Change-Id: I675809b8a1f51eb74bc3749d94691b1d5da71ba3
This commit is contained in:
Monty Taylor
2016-12-14 11:14:31 -06:00
parent b677a4ac3f
commit 00b979e7f3
3 changed files with 12 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
jenkins/jobs/projects.yaml
View File

@@ -14177,7 +14177,7 @@
- python-jobs
- pypi-jobs
- infra-publish-jobs
- '{pipeline}-shade-dsvm-functional-keystone2{suffix}':
- '{pipeline}-shade-dsvm-functional-legacy{suffix}':
pipeline: gate
node: ubuntu-xenial
suffix: ''
@@ -14197,11 +14197,6 @@
node: ubuntu-xenial
suffix: ''
branch-override: default
- '{pipeline}-shade-dsvm-functional-nova{suffix}':
pipeline: gate
node: ubuntu-xenial
suffix: ''
branch-override: stable/newton
- '{pipeline}-shade-dsvm-ansible{suffix}':
pipeline: gate
node: ubuntu-xenial

67
jenkins/jobs/shade.yaml
View File

@@ -1,5 +1,5 @@
- job-template:
name: '{pipeline}-shade-dsvm-functional-keystone2{suffix}'
name: '{pipeline}-shade-dsvm-functional-legacy{suffix}'
node: '{node}'
wrappers:
@@ -14,15 +14,16 @@
- shell: |
#!/bin/bash -xe
export SHADE_USE_KEYSTONE_V2=1
export SHADE_HAS_DESIGNATE=0
export SHADE_HAS_DESIGNATE=1
export SHADE_HAS_HEAT=1
export SHADE_HAS_MAGNUM=0
export SHADE_HAS_NEUTRON=1
export SHADE_HAS_NEUTRON=0
export SHADE_HAS_SWIFT=1
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_NEUTRON=1
export DEVSTACK_GATE_NEUTRON=0
export DEVSTACK_GATE_HEAT=1
export DEVSTACK_LOCAL_CONFIG="ENABLE_IDENTITY_V2=True"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin designate git://git.openstack.org/openstack/designate"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat git://git.openstack.org/openstack/heat"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service horizon"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-acentral"
@@ -32,6 +33,9 @@
export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-anotification"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-api"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-collector"
export PROJECTS="openstack/designate $PROJECTS"
export PROJECTS="openstack/designate-dashboard $PROJECTS"
export PROJECTS="openstack/designate-tempest-plugin $PROJECTS"
export PROJECTS="openstack-infra/shade $PROJECTS"
export BRANCH_OVERRIDE={branch-override}
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
@@ -42,6 +46,7 @@
$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
@@ -222,60 +227,6 @@
- devstack-logs
- console-log
- job-template:
name: '{pipeline}-shade-dsvm-functional-nova{suffix}'
node: '{node}'
wrappers:
- build-timeout:
timeout: 70
- timestamps
builders:
- link-logs
- net-info
- devstack-checkout
- shell: |
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
export SHADE_HAS_DESIGNATE=1
export SHADE_HAS_HEAT=1
export SHADE_HAS_MAGNUM=0
export SHADE_HAS_NEUTRON=0
export SHADE_HAS_SWIFT=1
export DEVSTACK_GATE_NEUTRON=0
export DEVSTACK_GATE_HEAT=1
export DEVSTACK_LOCAL_CONFIG="enable_plugin designate git://git.openstack.org/openstack/designate"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat git://git.openstack.org/openstack/heat"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service horizon"
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-anotification"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-api"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-collector"
export PROJECTS="openstack/designate $PROJECTS"
export PROJECTS="openstack/designate-dashboard $PROJECTS"
export PROJECTS="openstack/designate-tempest-plugin $PROJECTS"
export PROJECTS="openstack-infra/shade $PROJECTS"
export BRANCH_OVERRIDE={branch-override}
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi
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-template:
name: '{pipeline}-shade-dsvm-ansible{suffix}'
node: '{node}'

6
zuul/layout.yaml
View File

@@ -4850,18 +4850,16 @@ projects:
- name: infra-publish-jobs
check:
- shade-coverage-ubuntu-xenial
- gate-shade-dsvm-functional-keystone2
- gate-shade-dsvm-functional-legacy
- gate-shade-dsvm-functional-libs-nv
- gate-shade-dsvm-functional-magnum-nv
- gate-shade-dsvm-functional-neutron
- gate-shade-dsvm-functional-nova
- gate-shade-dsvm-ansible
- gate-shade-dsvm-ansible-dev-nv
- gate-dsvm-nodepool-src-shade
gate:
- gate-shade-dsvm-functional-keystone2
- gate-shade-dsvm-functional-legacy
- gate-shade-dsvm-functional-neutron
- gate-shade-dsvm-functional-nova
- gate-shade-dsvm-ansible
post:
- shade-coverage-ubuntu-xenial