openstack/project-config
Code Issues Proposed changes

Use local_conf for almanach and aodh

Browse Source 
Convert almanach and aodh devstack jobs to use the new local_conf set
up.

Change-Id: I52103a3ffaa1e40aaa829388ccbf0552fed46995
This commit is contained in:
Andreas Jaeger 2017-03-16 19:59:54 +01:00
parent 34743c0d69
commit 79433b516e
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jenkins/jobs/almanach.yaml
View File

@ -11,6 +11,10 @@
- link-logs - link-logs
- net-info - net-info
- devstack-checkout - devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
enable_plugin almanach git://git.openstack.org/openstack/almanach
- shell: | - shell: |
#!/bin/bash -xe #!/bin/bash -xe
export PYTHONUNBUFFERED=true export PYTHONUNBUFFERED=true
@ -18,7 +22,6 @@
export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1 export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1
export DEVSTACK_GATE_TEMPEST_REGEX="^almanach\." export DEVSTACK_GATE_TEMPEST_REGEX="^almanach\."
export PROJECTS="openstack/almanach $PROJECTS" export PROJECTS="openstack/almanach $PROJECTS"
export DEVSTACK_LOCAL_CONFIG="enable_plugin almanach git://git.openstack.org/openstack/almanach"
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
./safe-devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh

10
jenkins/jobs/aodh.yaml
View File

@ -11,11 +11,14 @@
- link-logs - link-logs
- net-info - net-info
- devstack-checkout - devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
enable_plugin aodh git://git.openstack.org/openstack/aodh
- shell: | - shell: |
#!/bin/bash -xe #!/bin/bash -xe
export PYTHONUNBUFFERED=true export PYTHONUNBUFFERED=true
export PROJECTS="openstack/aodh $PROJECTS" export PROJECTS="openstack/aodh $PROJECTS"
export DEVSTACK_LOCAL_CONFIG="enable_plugin aodh git://git.openstack.org/openstack/aodh"
function gate_hook {{ function gate_hook {{
cd /opt/stack/new/aodh/devstack/gate cd /opt/stack/new/aodh/devstack/gate
@ -50,6 +53,10 @@
- link-logs - link-logs
- net-info - net-info
- devstack-checkout - devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
enable_plugin aodh git://git.openstack.org/openstack/aodh
- shell: | - shell: |
#!/bin/bash -xe #!/bin/bash -xe
export PYTHONUNBUFFERED=true export PYTHONUNBUFFERED=true
@ -58,7 +65,6 @@
export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1 export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1
export PROJECTS="openstack/aodh $PROJECTS" export PROJECTS="openstack/aodh $PROJECTS"
export AODH_BACKEND={backend} export AODH_BACKEND={backend}
export DEVSTACK_LOCAL_CONFIG="enable_plugin aodh git://git.openstack.org/openstack/aodh"
if [ "{backend}" = "postgresql" ] ; then if [ "{backend}" = "postgresql" ] ; then
export DEVSTACK_GATE_POSTGRES=1 export DEVSTACK_GATE_POSTGRES=1
fi fi