openstack/project-config
Code Issues Proposed changes

Use local_conf for castellan, oaktree, rally, tacker

Browse Source 
Convert dsvm jobs to use local_conf whenever possible.

Change-Id: Ib76fdf6630d38df886faeda5b6d4c31ef67d55eb
This commit is contained in:
Andreas Jaeger 2017-07-15 20:01:47 +02:00
parent e8655d3a9f
commit 52f23f39a5
4 changed files with 52 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jenkins/jobs/castellan.yaml
View File

@ -11,6 +11,10 @@
- link-logs
- net-info
- devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
enable_plugin barbican git://git.openstack.org/openstack/barbican
- shell: |
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
@ -18,7 +22,6 @@
export PROJECTS="openstack/barbican $PROJECTS"
export PROJECTS="openstack/barbican-tempest-plugin $PROJECTS"
export PROJECTS="openstack/castellan $PROJECTS"
export DEVSTACK_LOCAL_CONFIG="enable_plugin barbican git://git.openstack.org/openstack/barbican"
export DEVSTACK_PROJECT_FROM_GIT="python-barbicanclient"
function gate_hook {

6
jenkins/jobs/oaktree.yaml
View File

@ -76,13 +76,17 @@
- link-logs
- net-info
- devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
enable_plugin oaktree git://git.openstack.org/openstack/oaktree
- shell: |
#!/bin/bash -xe
export GOPATH=$HOME/go
export PATH=$GOPATH/bin:$PATH
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_NEUTRON=1
export DEVSTACK_LOCAL_CONFIG="enable_plugin oaktree git://git.openstack.org/openstack/oaktree"
export DEVSTACK_PROJECT_FROM_GIT="shade"
export DEVSTACK_PROJECT_FROM_GIT+=",oaktree"
export DEVSTACK_PROJECT_FROM_GIT+=",oaktreemodel"

58
jenkins/jobs/rally.yaml
View File

@ -193,6 +193,13 @@
builders:
- link-logs
- devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer
enable_plugin aodh git://git.openstack.org/openstack/aodh
enable_plugin rally git://git.openstack.org/openstack/rally
enable_plugin designate git://git.openstack.org/openstack/designate
- shell: |
#!/bin/bash -xe
@ -220,15 +227,6 @@
ENABLED_SERVICES+=designate,designate-api,designate-central,designate-sink,designate-mdns,
export ENABLED_SERVICES
DEVSTACK_LOCAL_CONFIG="enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer"
DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin aodh git://git.openstack.org/openstack/aodh"
DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin rally git://git.openstack.org/openstack/rally"
export DEVSTACK_LOCAL_CONFIG
# Otherwise, enable the Designate devstack plugin.
DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin designate git://git.openstack.org/openstack/designate"
export DEVSTACK_LOCAL_CONFIG
function gate_hook {{
cd /opt/stack/new/designate/devstack/gate
./gate_hook.sh
@ -248,6 +246,11 @@
builders:
- link-logs
- devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
enable_plugin manila git://git.openstack.org/openstack/manila
enable_plugin rally git://git.openstack.org/openstack/rally
- shell: |
#!/bin/bash -xe
@ -268,13 +271,9 @@
export DEVSTACK_GATE_NEUTRON=1
export RALLY_SCENARIO={scenario}
export DEVSTACK_LOCAL_CONFIG="enable_plugin manila git://git.openstack.org/openstack/manila"
# Keep localrc to be able to set some vars in pre_test_hook
export KEEP_LOCALRC=1
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin rally git://git.openstack.org/openstack/rally"
function pre_test_hook {{
# Install manila-devstack integration
# 'dhss' means 'drivers handle share servers'
@ -342,6 +341,12 @@
builders:
- link-logs
- devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
enable_plugin rally git://git.openstack.org/openstack/rally
enable_plugin heat git://git.openstack.org/openstack/heat
enable_plugin murano git://git.openstack.org/openstack/murano
- shell: |
#!/bin/bash -xe
@ -362,13 +367,6 @@
export IDENTITY_API_VERSION=3
export DEVSTACK_LOCAL_CONFIG="enable_plugin rally git://git.openstack.org/openstack/rally"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat git://git.openstack.org/openstack/heat"
# Enable murano devstack plugin. Provided repo should be cloned by zuul before devstack run
# and below provided link should not be used.
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin murano git://git.openstack.org/openstack/murano"
export ENABLED_SERVICES
function pre_test_hook {{
@ -392,6 +390,11 @@
builders:
- link-logs
- devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
enable_plugin rally git://git.openstack.org/openstack/rally
enable_plugin mistral https://git.openstack.org/openstack/mistral
- shell: |
#!/bin/bash -xe
@ -411,8 +414,6 @@
export IDENTITY_API_VERSION=3
export ENABLED_SERVICES=h-api,h-api-cfn,h-api-cw,h-eng,heat,
export DEVSTACK_LOCAL_CONFIG="enable_plugin rally git://git.openstack.org/openstack/rally"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin mistral https://git.openstack.org/openstack/mistral"
function post_test_hook {{
$BASE/new/rally/tests/ci/rally-gate.sh
@ -461,6 +462,10 @@
- link-logs
- net-info
- devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
enable_plugin rally git://git.openstack.org/openstack/rally
- shell: |
#!/bin/bash -xe
@ -474,7 +479,6 @@
export DEVSTACK_GATE_TEMPEST=0
export DEVSTACK_GATE_EXERCISES=0
export RALLY_SCENARIO={scenario}
export DEVSTACK_LOCAL_CONFIG="enable_plugin rally git://git.openstack.org/openstack/rally"
export IDENTITY_API_VERSION=3
@ -845,6 +849,11 @@
builders:
- link-logs
- devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
enable_plugin rally git://git.openstack.org/openstack/rally
CINDER_ENABLE_V1_API=True
- shell: |
#/bin/bash -xe
@ -855,9 +864,6 @@
export PROJECTS="openstack/rally $PROJECTS"
export DEVSTACK_GATE_NEUTRON=1
DEVSTACK_LOCAL_CONFIG="enable_plugin rally git://git.openstack.org/openstack/rally"
DEVSTACK_LOCAL_CONFIG+=$'\n'"CINDER_ENABLE_V1_API=True"
export DEVSTACK_LOCAL_CONFIG
function post_test_hook {
cd $BASE/new/rally

20
jenkins/jobs/tacker.yaml
View File

@ -11,6 +11,17 @@
- link-logs
- net-info
- devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
SFC_UPDATE_OVS=False
enable_plugin heat git://git.openstack.org/openstack/heat
enable_plugin aodh git://git.openstack.org/openstack/aodh
enable_plugin ceilometer https://git.openstack.org/openstack/ceilometer
enable_plugin networking-sfc http://git.trystack.cn/openstack/networking-sfc
enable_plugin mistral git://git.openstack.org/openstack/mistral
enable_plugin barbican git://git.openstack.org/openstack/barbican
enable_plugin tacker git://git.openstack.org/openstack/tacker
- shell: |
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
@ -21,25 +32,16 @@
export PROJECTS="openstack/tacker $PROJECTS"
export PROJECTS="openstack/tacker-horizon $PROJECTS"
export PROJECTS="openstack/python-tackerclient $PROJECTS"
export DEVSTACK_LOCAL_CONFIG=""
export DEVSTACK_LOCAL_CONFIG+=$'\n'"SFC_UPDATE_OVS=False"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat git://git.openstack.org/openstack/heat"
export PROJECTS="openstack/heat $PROJECTS"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin aodh git://git.openstack.org/openstack/aodh"
export PROJECTS="openstack/aodh $PROJECTS"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ceilometer https://git.openstack.org/openstack/ceilometer"
export PROJECTS="openstack/ceilometer $PROJECTS"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin networking-sfc http://git.trystack.cn/openstack/networking-sfc"
export PROJECTS="openstack/networking-sfc $PROJECTS"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin mistral git://git.openstack.org/openstack/mistral"
export PROJECTS="openstack/mistral $PROJECTS"
export PROJECTS="openstack/mistral-dashboard $PROJECTS"
export PROJECTS="openstack/python-mistralclient $PROJECTS"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin barbican git://git.openstack.org/openstack/barbican"
export PROJECTS="openstack/barbican $PROJECTS"
export PROJECTS="openstack/python-barbicanclient $PROJECTS"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin tacker git://git.openstack.org/openstack/tacker"
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi