openstack
/
project-config
Code Issues Proposed changes

Use local_conf in more places 

Migrate some jobs to use the new local_conf setup.

Change-Id: I495b4b9cfd707e9535719da17d39ab6008445df7
This commit is contained in:
Andreas Jaeger 2017-04-07 11:29:33 +02:00
parent 430b2065fe
commit ce9f462975
5 changed files with 37 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jenkins/jobs/app-catalog.yaml
View File

@ -13,6 +13,10 @@
- devstack-checkout
- firefox-install
- xvfb-install
- local_conf:
conf: |
[[local|localrc]]
enable_plugin app-catalog-ui https://git.openstack.org/openstack/app-catalog-ui
- shell: |
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
@ -23,7 +27,6 @@
# Enable App Catalog Horizon plugin
export PROJECTS="openstack/app-catalog-ui $PROJECTS"
export DEVSTACK_LOCAL_CONFIG="enable_plugin app-catalog-ui https://git.openstack.org/openstack/app-catalog-ui"
function pre_test_hook {
$BASE/new/app-catalog-ui/tools/gate/integration/pre_test_hook.sh

5
jenkins/jobs/blazar.yaml
View File

@ -11,6 +11,10 @@
- link-logs
- net-info
- devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
enable_plugin blazar git://git.openstack.org/openstack/blazar
- shell: |
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
@ -19,7 +23,6 @@
export PROJECTS="openstack/blazar $PROJECTS"
export PROJECTS="openstack/blazar-nova $PROJECTS"
export PROJECTS="openstack/python-blazarclient $PROJECTS"
export DEVSTACK_LOCAL_CONFIG="enable_plugin blazar git://git.openstack.org/openstack/blazar"
# Construct a regex to limiting scope of tempest
r="^(?:tempest\.cli\.simple_read_only\.test_.*reservation.*)"

5
jenkins/jobs/cinder.yaml
View File

@ -88,12 +88,15 @@
- link-logs
- net-info
- devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
CINDER_USE_MOD_WSGI=True
- shell: |
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TEMPEST=1
export DEVSTACK_GATE_TEMPEST_FULL=1
export DEVSTACK_LOCAL_CONFIG="CINDER_USE_MOD_WSGI=True"
export BRANCH_OVERRIDE={branch-override}
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE

8
jenkins/jobs/cloudkitty.yaml
View File

@ -9,12 +9,14 @@
builders:
- devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer
enable_plugin cloudkitty git://git.openstack.org/openstack/cloudkitty master
- shell: |
#!/bin/bash -xe
DEVSTACK_LOCAL_CONFIG="enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer"
DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin cloudkitty https://github.com/openstack/cloudkitty master"
export DEVSTACK_LOCAL_CONFIG
export PROJECTS="openstack/cloudkitty $PROJECTS"
export PROJECTS="openstack/python-cloudkittyclient $PROJECTS"
export PROJECTS="openstack/cloudkitty-dashboard $PROJECTS"

41
jenkins/jobs/congress.yaml
View File

@ -11,14 +11,22 @@
- link-logs
- net-info
- devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer
enable_plugin heat git://git.openstack.org/openstack/heat
enable_plugin congress git://git.openstack.org/openstack/congress
enable_plugin murano git://git.openstack.org/openstack/murano
enable_plugin aodh git://git.openstack.org/openstack/aodh
# To deploy congress as multi-process (api, pe, datasources)
CONGRESS_MULTIPROCESS_DEPLOYMENT=True
- shell: |
#!/bin/bash -xe
ENABLED_SERVICES=s-proxy,s-object,s-container,s-account,
ENABLED_SERVICES+=h-eng,h-api,h-api-cfn,h-api-cw
DEVSTACK_LOCAL_CONFIG="enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer"
DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat git://git.openstack.org/openstack/heat"
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TEMPEST=1
export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1
@ -33,16 +41,7 @@
export PROJECTS="openstack/python-muranoclient $PROJECTS"
export PROJECTS="openstack/python-aodhclient $PROJECTS"
# Enable congress devstack plugin.
DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin congress git://git.openstack.org/openstack/congress"
# To be enabled for Mitaka and later
DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin murano git://git.openstack.org/openstack/murano"
DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin aodh git://git.openstack.org/openstack/aodh"
# To deploy congress as multi-process (api, pe, datasources)
DEVSTACK_LOCAL_CONFIG+=$'\n'"CONGRESS_MULTIPROCESS_DEPLOYMENT=True"
export ENABLED_SERVICES
export DEVSTACK_LOCAL_CONFIG
export BRANCH_OVERRIDE={branch-override}
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
@ -72,14 +71,20 @@
- link-logs
- net-info
- devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer
enable_plugin heat git://git.openstack.org/openstack/heat
enable_plugin congress git://git.openstack.org/openstack/congress
enable_plugin aodh git://git.openstack.org/openstack/aodh
CONGRESS_REPLICATED=True
CONGRESS_MULTIPROCESS_DEPLOYMENT=True
- shell: |
#!/bin/bash -xe
ENABLED_SERVICES=s-proxy,s-object,s-container,s-account,
ENABLED_SERVICES+=h-eng,h-api,h-api-cfn,h-api-cw
DEVSTACK_LOCAL_CONFIG="enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer"
DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat git://git.openstack.org/openstack/heat"
export ENABLED_SERVICES
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TEMPEST=1
@ -91,12 +96,6 @@
export PROJECTS="openstack/python-aodhclient $PROJECTS"
export PROJECTS="openstack/aodh $PROJECTS"
export DEVSTACK_PROJECT_FROM_GIT=python-congressclient
# Enable congress devstack plugin.
DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin congress git://git.openstack.org/openstack/congress"
DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin aodh git://git.openstack.org/openstack/aodh"
DEVSTACK_LOCAL_CONFIG+=$'\n'"CONGRESS_REPLICATED=True"
DEVSTACK_LOCAL_CONFIG+=$'\n'"CONGRESS_MULTIPROCESS_DEPLOYMENT=True"
export DEVSTACK_LOCAL_CONFIG
export BRANCH_OVERRIDE={branch-override}
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE