openstack
/
project-config
Code Issues Proposed changes

Use local_conf for manial, mogan, monasca*, murano 

Use local_conf stanza for more projects.

Change-Id: I6d00984c65ebb3086011c219038345070f4d48b9
This commit is contained in:
Andreas Jaeger 2017-07-15 19:31:41 +02:00
parent e8655d3a9f
commit cc4b6cf61c
5 changed files with 72 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
jenkins/jobs/manila.yaml
View File

@ -11,6 +11,11 @@
- link-logs
- net-info
- devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
enable_plugin manila git://git.openstack.org/openstack/manila
enable_plugin manila-ui git://git.openstack.org/openstack/manila-ui
- firefox-install
- xvfb-install
- shell: |
@ -22,8 +27,6 @@
export DEVSTACK_GATE_INSTALL_TESTONLY=1
export DEVSTACK_GATE_NEUTRON=1
export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient"
export DEVSTACK_LOCAL_CONFIG="enable_plugin manila git://git.openstack.org/openstack/manila"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin manila-ui git://git.openstack.org/openstack/manila-ui"
# Keep localrc to be able to set some vars in pre_test_hook
export KEEP_LOCALRC=1
@ -59,6 +62,10 @@
- link-logs
- net-info
- devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
enable_plugin manila git://git.openstack.org/openstack/manila
- shell: |
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
@ -72,11 +79,6 @@
fi
export ENABLED_SERVICES=tempest
# Enable manila devstack plugin. Provided repo should be
# cloned by zuul before devstack run and below provided
# link should not be used.
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
@ -148,6 +150,10 @@
- link-logs
- net-info
- devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
enable_plugin manila git://git.openstack.org/openstack/manila
- shell: |
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
@ -170,11 +176,6 @@
fi
export OVERRIDE_ENABLED_SERVICES
# Enable manila devstack plugin. Provided repo should be
# cloned by zuul before devstack run and below provided
# link should not be used.
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
@ -277,17 +278,16 @@
- link-logs
- net-info
- devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
enable_plugin manila git://git.openstack.org/openstack/manila
- shell: |
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_NEUTRON=1
export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient"
# Enable manila devstack plugin. Provided repo should be
# cloned by zuul before devstack run and below provided link
# should not be used.
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
@ -390,6 +390,18 @@
- link-logs
- net-info
- devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
enable_plugin manila git://git.openstack.org/openstack/manila
# Enable devstack-plugin-glusterfs plugin, to install and configure GlusterFS.
enable_plugin devstack-plugin-glusterfs git://git.openstack.org/openstack/devstack-plugin-glusterfs
# Configure devstack-plugin-glusterfs to enable GlusterFS as a backend for Manila.
CONFIGURE_GLUSTERFS_MANILA=True
# Configure devstack-plugin-glusterfs to use respective GlusterFS driver variant.
GLUSTERFS_MANILA_DRIVER_TYPE=glusterfs-{variant}
- shell: |
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
@ -398,20 +410,6 @@
export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient"
export PROJECTS="openstack/devstack-plugin-glusterfs $PROJECTS"
# Enable manila devstack plugin. Provided repo should be
# cloned by zuul before devstack run and below provided link
# should not be used.
export DEVSTACK_LOCAL_CONFIG="enable_plugin manila git://git.openstack.org/openstack/manila"
# Enable devstack-plugin-glusterfs plugin, to install and configure GlusterFS.
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin devstack-plugin-glusterfs git://git.openstack.org/openstack/devstack-plugin-glusterfs"
# Configure devstack-plugin-glusterfs to enable GlusterFS as a backend for Manila.
export DEVSTACK_LOCAL_CONFIG+=$'\n'"CONFIGURE_GLUSTERFS_MANILA=True"
# Configure devstack-plugin-glusterfs to use respective GlusterFS driver variant.
export DEVSTACK_LOCAL_CONFIG+=$'\n'"GLUSTERFS_MANILA_DRIVER_TYPE=glusterfs-{variant}"
# Keep localrc to be able to set some vars in pre_test_hook
export KEEP_LOCALRC=1
@ -448,6 +446,12 @@
- link-logs
- net-info
- devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
enable_plugin manila git://git.openstack.org/openstack/manila
# Enable devstack-plugin-hdfs plugin, to install and configure HDFS.
enable_plugin devstack-plugin-hdfs git://git.openstack.org/openstack/devstack-plugin-hdfs
- shell: |
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
@ -456,13 +460,6 @@
export PROJECTS="openstack/devstack-plugin-hdfs $PROJECTS"
export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient"
# Enable manila devstack plugin. Provided repo should be cloned by zuul before devstack run
# and below provided link should not be used.
export DEVSTACK_LOCAL_CONFIG="enable_plugin manila git://git.openstack.org/openstack/manila"
# Enable devstack-plugin-hdfs plugin, to install and configure HDFS.
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin devstack-plugin-hdfs git://git.openstack.org/openstack/devstack-plugin-hdfs"
# Keep localrc to be able to set some vars in pre_test_hook
export KEEP_LOCALRC=1

13
jenkins/jobs/mogan.yaml
View File

@ -11,6 +11,14 @@
- link-logs
- net-info
- devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
enable_plugin ironic git://git.openstack.org/openstack/ironic
enable_plugin mogan git://git.openstack.org/openstack/mogan
IRONIC_TEMPEST_WHOLE_DISK_IMAGE=False
IRONIC_VM_EPHEMERAL_DISK=1
IRONIC_USE_RESOURCE_CLASSES=True
- shell: |
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
@ -30,11 +38,6 @@
export PROJECTS="openstack/ironic-lib $PROJECTS"
export PROJECTS="openstack/ironic-python-agent $PROJECTS"
export PROJECTS="openstack/python-ironicclient $PROJECTS"
export DEVSTACK_LOCAL_CONFIG="enable_plugin ironic git://git.openstack.org/openstack/ironic"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin mogan git://git.openstack.org/openstack/mogan"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_TEMPEST_WHOLE_DISK_IMAGE=False"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_EPHEMERAL_DISK=1"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_USE_RESOURCE_CLASSES=True"
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
./safe-devstack-vm-gate-wrap.sh

7
jenkins/jobs/monasca-transform.yaml
View File

@ -12,12 +12,15 @@
- link-logs
- net-info
- devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
enable_plugin monasca-api git://git.openstack.org/openstack/monasca-api
enable_plugin monasca-transform git://git.openstack.org/openstack/monasca-transform
- shell: |
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
export ENABLED_SERVICES=tempest
export DEVSTACK_LOCAL_CONFIG="enable_plugin monasca-api git://git.openstack.org/openstack/monasca-api"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin monasca-transform git://git.openstack.org/openstack/monasca-transform"
export PROJECTS="openstack/monasca-transform $PROJECTS"
export PROJECTS="openstack/monasca-api $PROJECTS"
export PROJECTS="openstack/monasca-persister $PROJECTS"

17
jenkins/jobs/monasca.yaml
View File

@ -11,6 +11,12 @@
- link-logs
- net-info
- devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
enable_plugin monasca-api git://git.openstack.org/openstack/monasca-api
MONASCA_API_IMPLEMENTATION_LANG={lang}
MONASCA_PERSISTER_IMPLEMENTATION_LANG={lang}
- shell: |
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
@ -20,14 +26,11 @@
export DEVSTACK_GATE_NEUTRON=1
export DEVSTACK_GATE_EXERCISES=0
export DEVSTACK_LOCAL_CONFIG="enable_plugin monasca-api git://git.openstack.org/openstack/monasca-api"
if [ {backend} == "postgresql" ]; then
export DEVSTACK_GATE_POSTGRES=1
else
export DEVSTACK_GATE_POSTGRES=0
fi
export DEVSTACK_LOCAL_CONFIG+=$'\n'"MONASCA_API_IMPLEMENTATION_LANG={lang}"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"MONASCA_PERSISTER_IMPLEMENTATION_LANG={lang}"
export PROJECTS="openstack/monasca-api $PROJECTS"
export PROJECTS="openstack/monasca-persister $PROJECTS"
@ -86,14 +89,16 @@
- link-logs
- net-info
- devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
enable_plugin monasca-api git://git.openstack.org/openstack/monasca-api
enable_plugin monasca-log-api git://git.openstack.org/openstack/monasca-log-api
- shell: |
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_NEUTRON=0
export OVERRIDE_ENABLED_SERVICES=key,mysql,rabbit,tempest,dstat
DEVSTACK_LOCAL_CONFIG="enable_plugin monasca-api git://git.openstack.org/openstack/monasca-api"
DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin monasca-log-api git://git.openstack.org/openstack/monasca-log-api"
export DEVSTACK_LOCAL_CONFIG
export PROJECTS="openstack/monasca-api $PROJECTS"
export PROJECTS="openstack/monasca-log-api $PROJECTS"

21
jenkins/jobs/murano.yaml
View File

@ -12,6 +12,14 @@
- link-logs
- net-info
- devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
enable_plugin heat git://git.openstack.org/openstack/heat
enable_plugin mistral git://git.openstack.org/openstack/mistral
enable_plugin congress git://git.openstack.org/openstack/congress
MURANO_ENABLE_MODEL_POLICY_ENFORCEMENT=True
enable_plugin murano git://git.openstack.org/openstack/murano
- shell: |
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
@ -30,14 +38,8 @@
export PROJECTS="openstack/python-mistralclient $PROJECTS"
export KEEP_LOCALRC=1
export DEVSTACK_LOCAL_CONFIG="enable_plugin heat git://git.openstack.org/openstack/heat"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin mistral git://git.openstack.org/openstack/mistral"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin congress git://git.openstack.org/openstack/congress"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"MURANO_ENABLE_MODEL_POLICY_ENFORCEMENT=True"
# 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"
function pre_test_hook {{
cd /opt/stack/new/murano/functionaltests
@ -185,6 +187,11 @@
- net-info
- zuul-git-prep
- devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
enable_plugin murano git://git.openstack.org/openstack/murano
disable_service heat h-api h-api-cfn h-api-cw h-eng
- shell: |
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
@ -194,8 +201,6 @@
export PROJECTS="openstack/murano $PROJECTS"
export PROJECTS="openstack/python-muranoclient $PROJECTS"
export PROJECTS="openstack/murano-dashboard $PROJECTS"
export DEVSTACK_LOCAL_CONFIG="enable_plugin murano git://git.openstack.org/openstack/murano"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service heat h-api h-api-cfn h-api-cw h-eng"
function post_test_hook {{
# Configure and run functional tests
. /opt/stack/new/devstack/openrc admin admin