WIP - Simplify zuul job config
Change-Id: Ibeda861b6c344d8b773229479390e7100ede7e0c
This commit is contained in:
parent
6e7de8a60d
commit
f9e9c89a9b
10
.zuul.yaml
10
.zuul.yaml
|
@ -32,14 +32,9 @@
|
|||
timeout: 7800
|
||||
required-projects:
|
||||
- openstack-infra/devstack-gate
|
||||
- openstack/heat
|
||||
- openstack/neutron-lbaas
|
||||
- openstack/python-zaqarclient
|
||||
- openstack/senlin
|
||||
- openstack/senlin-tempest-plugin
|
||||
- openstack/tempest
|
||||
- openstack/zaqar
|
||||
- openstack/zaqar-ui
|
||||
irrelevant-files:
|
||||
- ^.*\.rst$
|
||||
- ^api-ref/.*$
|
||||
|
@ -102,14 +97,9 @@
|
|||
timeout: 7800
|
||||
required-projects:
|
||||
- openstack-infra/devstack-gate
|
||||
- openstack/heat
|
||||
- openstack/neutron-lbaas
|
||||
- openstack/python-zaqarclient
|
||||
- openstack/senlin
|
||||
- openstack/senlin-tempest-plugin
|
||||
- openstack/tempest
|
||||
- openstack/zaqar
|
||||
- openstack/zaqar-ui
|
||||
irrelevant-files:
|
||||
- ^.*\.rst$
|
||||
- ^api-ref/.*$
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
- hosts: all
|
||||
name: Autoconverted job legacy-senlin-dsvm-tempest-py27-api from old job gate-senlin-dsvm-tempest-py27-api
|
||||
name: gate-senlin-dsvm-tempest-py27-api
|
||||
tasks:
|
||||
|
||||
- name: Ensure legacy workspace directory
|
||||
|
@ -36,48 +36,22 @@
|
|||
export DEVSTACK_GATE_INSTALL_TESTONLY=1
|
||||
export KEEP_LOCALRC=1
|
||||
|
||||
if [ "py27" == "py35" ]; then
|
||||
export DEVSTACK_GATE_USE_PYTHON3=True
|
||||
else
|
||||
export DEVSTACK_GATE_USE_PYTHON3=False
|
||||
fi
|
||||
|
||||
export DEVSTACK_GATE_USE_PYTHON3=False
|
||||
export SENLIN_TEST_TYPE="api"
|
||||
export DEVSTACK_GATE_TEMPEST_REGEX="senlin_tempest_plugin.tests.${SENLIN_TEST_TYPE}"
|
||||
export SENLIN_BACKEND="openstack_test"
|
||||
export DEVSTACK_GATE_TEMPEST_REGEX="senlin_tempest_plugin.tests.api"
|
||||
|
||||
services=rabbit,mysql,dstat,key,tempest
|
||||
services+=,g-api,g-reg
|
||||
services+=,n-api,n-cpu,n-cond,n-sch,n-crt
|
||||
# placement services mandatory for nova from ocata
|
||||
if [[ "stable/newton" != $ZUUL_BRANCH ]]; then
|
||||
services+=,placement-api,placement-client
|
||||
services+=,placement-api,placement-client
|
||||
fi
|
||||
services+=,c-sch,c-api,c-vol,c-bak
|
||||
# services+=,c-sch,c-api,c-vol,c-bak
|
||||
services+=,q-svc,q-dhcp,q-meta,q-agt,q-l3
|
||||
|
||||
export PROJECTS="openstack/senlin $PROJECTS"
|
||||
export DEVSTACK_LOCAL_CONFIG="enable_plugin senlin https://git.openstack.org/openstack/senlin"
|
||||
|
||||
if [ "${SENLIN_TEST_TYPE}" == "api" ]||[ "${SENLIN_TEST_TYPE}" == "functional" ]; then
|
||||
export SENLIN_BACKEND="openstack_test"
|
||||
else
|
||||
export SENLIN_BACKEND="openstack"
|
||||
export PROJECTS="openstack/heat $PROJECTS"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat git://git.openstack.org/openstack/heat"
|
||||
|
||||
# Enable LBaaS V2 plugin
|
||||
services+=,q-lbaasv2
|
||||
export PROJECTS="openstack/neutron-lbaas $PROJECTS"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-lbaas https://git.openstack.org/openstack/neutron-lbaas"
|
||||
|
||||
# Enable Zaqar
|
||||
export PROJECTS="openstack/zaqar $PROJECTS"
|
||||
export PROJECTS="openstack/python-zaqarclient $PROJECTS"
|
||||
export PROJECTS="openstack/zaqar-ui $PROJECTS"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin zaqar git://git.openstack.org/openstack/zaqar"
|
||||
fi
|
||||
|
||||
# use senlin-tempest-plugin
|
||||
export PROJECTS="openstack/senlin-tempest-plugin $PROJECTS"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/senlin-tempest-plugin'"
|
||||
|
||||
|
@ -89,13 +63,13 @@
|
|||
|
||||
function pre_test_hook {
|
||||
cd /opt/stack/new/senlin/senlin/tests/tempest/
|
||||
./pre_test_hook.sh
|
||||
source ./pre_test_hook.sh
|
||||
}
|
||||
export -f pre_test_hook
|
||||
|
||||
function post_test_hook {
|
||||
cd /opt/stack/new/senlin/senlin/tests/tempest/
|
||||
./post_test_hook.sh senlin_tempest_plugin.tests.${SENLIN_TEST_TYPE}
|
||||
source ./post_test_hook.sh
|
||||
}
|
||||
export -f post_test_hook
|
||||
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
- hosts: all
|
||||
name: Autoconverted job legacy-senlin-dsvm-tempest-py27-functional from old job
|
||||
gate-senlin-dsvm-tempest-py27-functional
|
||||
name: gate-senlin-dsvm-tempest-py27-functional
|
||||
tasks:
|
||||
|
||||
- name: Ensure legacy workspace directory
|
||||
|
@ -37,48 +36,21 @@
|
|||
export DEVSTACK_GATE_INSTALL_TESTONLY=1
|
||||
export KEEP_LOCALRC=1
|
||||
|
||||
if [ "py27" == "py35" ]; then
|
||||
export DEVSTACK_GATE_USE_PYTHON3=True
|
||||
else
|
||||
export DEVSTACK_GATE_USE_PYTHON3=False
|
||||
fi
|
||||
|
||||
export DEVSTACK_GATE_USE_PYTHON3=False
|
||||
export SENLIN_TEST_TYPE="functional"
|
||||
export DEVSTACK_GATE_TEMPEST_REGEX="senlin_tempest_plugin.tests.${SENLIN_TEST_TYPE}"
|
||||
export SENLIN_BACKEND="openstack_test"
|
||||
export DEVSTACK_GATE_TEMPEST_REGEX="senlin_tempest_plugin.tests.functional"
|
||||
|
||||
services=rabbit,mysql,dstat,key,tempest
|
||||
services+=,g-api,g-reg
|
||||
services+=,n-api,n-cpu,n-cond,n-sch,n-crt
|
||||
# placement services mandatory for nova from ocata
|
||||
if [[ "stable/newton" != $ZUUL_BRANCH ]]; then
|
||||
services+=,placement-api,placement-client
|
||||
services+=,placement-api,placement-client
|
||||
fi
|
||||
services+=,c-sch,c-api,c-vol,c-bak
|
||||
services+=,q-svc,q-dhcp,q-meta,q-agt,q-l3
|
||||
|
||||
export PROJECTS="openstack/senlin $PROJECTS"
|
||||
export DEVSTACK_LOCAL_CONFIG="enable_plugin senlin https://git.openstack.org/openstack/senlin"
|
||||
|
||||
if [ "${SENLIN_TEST_TYPE}" == "api" ]||[ "${SENLIN_TEST_TYPE}" == "functional" ]; then
|
||||
export SENLIN_BACKEND="openstack_test"
|
||||
else
|
||||
export SENLIN_BACKEND="openstack"
|
||||
export PROJECTS="openstack/heat $PROJECTS"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat git://git.openstack.org/openstack/heat"
|
||||
|
||||
# Enable LBaaS V2 plugin
|
||||
services+=,q-lbaasv2
|
||||
export PROJECTS="openstack/neutron-lbaas $PROJECTS"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-lbaas https://git.openstack.org/openstack/neutron-lbaas"
|
||||
|
||||
# Enable Zaqar
|
||||
export PROJECTS="openstack/zaqar $PROJECTS"
|
||||
export PROJECTS="openstack/python-zaqarclient $PROJECTS"
|
||||
export PROJECTS="openstack/zaqar-ui $PROJECTS"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin zaqar git://git.openstack.org/openstack/zaqar"
|
||||
fi
|
||||
|
||||
# use senlin-tempest-plugin
|
||||
export PROJECTS="openstack/senlin-tempest-plugin $PROJECTS"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/senlin-tempest-plugin'"
|
||||
|
||||
|
@ -90,13 +62,13 @@
|
|||
|
||||
function pre_test_hook {
|
||||
cd /opt/stack/new/senlin/senlin/tests/tempest/
|
||||
./pre_test_hook.sh
|
||||
source ./pre_test_hook.sh
|
||||
}
|
||||
export -f pre_test_hook
|
||||
|
||||
function post_test_hook {
|
||||
cd /opt/stack/new/senlin/senlin/tests/tempest/
|
||||
./post_test_hook.sh senlin_tempest_plugin.tests.${SENLIN_TEST_TYPE}
|
||||
source ./post_test_hook.sh
|
||||
}
|
||||
export -f post_test_hook
|
||||
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
- hosts: all
|
||||
name: Autoconverted job legacy-senlin-dsvm-tempest-py27-integration from old job
|
||||
gate-senlin-dsvm-tempest-py27-integration-nv
|
||||
name: gate-senlin-dsvm-tempest-py27-integration-nv
|
||||
tasks:
|
||||
|
||||
- name: Ensure legacy workspace directory
|
||||
|
@ -37,11 +36,7 @@
|
|||
export DEVSTACK_GATE_INSTALL_TESTONLY=1
|
||||
export KEEP_LOCALRC=1
|
||||
|
||||
if [ "py27" == "py35" ]; then
|
||||
export DEVSTACK_GATE_USE_PYTHON3=True
|
||||
else
|
||||
export DEVSTACK_GATE_USE_PYTHON3=False
|
||||
fi
|
||||
export DEVSTACK_GATE_USE_PYTHON3=False
|
||||
|
||||
export SENLIN_TEST_TYPE="integration"
|
||||
export DEVSTACK_GATE_TEMPEST_REGEX="senlin_tempest_plugin.tests.${SENLIN_TEST_TYPE}"
|
||||
|
@ -59,26 +54,23 @@
|
|||
export PROJECTS="openstack/senlin $PROJECTS"
|
||||
export DEVSTACK_LOCAL_CONFIG="enable_plugin senlin https://git.openstack.org/openstack/senlin"
|
||||
|
||||
if [ "${SENLIN_TEST_TYPE}" == "api" ]||[ "${SENLIN_TEST_TYPE}" == "functional" ]; then
|
||||
export SENLIN_BACKEND="openstack_test"
|
||||
else
|
||||
export SENLIN_BACKEND="openstack"
|
||||
export PROJECTS="openstack/heat $PROJECTS"
|
||||
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 heat git://git.openstack.org/openstack/heat"
|
||||
|
||||
# Enable LBaaS V2 plugin
|
||||
services+=,q-lbaasv2
|
||||
export PROJECTS="openstack/neutron-lbaas $PROJECTS"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-lbaas https://git.openstack.org/openstack/neutron-lbaas"
|
||||
# Enable LBaaS V2 plugin
|
||||
services+=,q-lbaasv2
|
||||
export PROJECTS="openstack/neutron-lbaas $PROJECTS"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-lbaas https://git.openstack.org/openstack/neutron-lbaas"
|
||||
|
||||
# Enable Zaqar
|
||||
export PROJECTS="openstack/zaqar $PROJECTS"
|
||||
export PROJECTS="openstack/python-zaqarclient $PROJECTS"
|
||||
export PROJECTS="openstack/zaqar-ui $PROJECTS"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin zaqar git://git.openstack.org/openstack/zaqar"
|
||||
export PROJECTS="openstack/zaqar-tempest-plugin $PROJECTS"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/zaqar-tempest-plugin'"
|
||||
fi
|
||||
# Enable Zaqar
|
||||
export PROJECTS="openstack/zaqar $PROJECTS"
|
||||
export PROJECTS="openstack/python-zaqarclient $PROJECTS"
|
||||
export PROJECTS="openstack/zaqar-ui $PROJECTS"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin zaqar git://git.openstack.org/openstack/zaqar"
|
||||
export PROJECTS="openstack/zaqar-tempest-plugin $PROJECTS"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/zaqar-tempest-plugin'"
|
||||
|
||||
export SENLIN_BACKEND="openstack"
|
||||
|
||||
# use senlin-tempest-plugin
|
||||
export PROJECTS="openstack/senlin-tempest-plugin $PROJECTS"
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
- hosts: all
|
||||
name: Autoconverted job legacy-senlin-dsvm-tempest-py35-api from old job gate-senlin-dsvm-tempest-py35-api-nv
|
||||
name: gate-senlin-dsvm-tempest-py35-api-nv
|
||||
tasks:
|
||||
|
||||
- name: Ensure legacy workspace directory
|
||||
|
@ -31,52 +31,28 @@
|
|||
export PYTHONUNBUFFERED=True
|
||||
export DEVSTACK_GATE_NEUTRON=1
|
||||
export DEVSTACK_GATE_TEMPEST=1
|
||||
export KEEP_LOCALRC=1
|
||||
export DEVSTACK_GATE_TEMPEST_NOTESTS=1
|
||||
export DEVSTACK_GATE_EXERCISES=0
|
||||
export DEVSTACK_GATE_INSTALL_TESTONLY=1
|
||||
export KEEP_LOCALRC=1
|
||||
|
||||
if [ "py35" == "py35" ]; then
|
||||
export DEVSTACK_GATE_USE_PYTHON3=True
|
||||
else
|
||||
export DEVSTACK_GATE_USE_PYTHON3=False
|
||||
fi
|
||||
|
||||
export DEVSTACK_GATE_USE_PYTHON3=True
|
||||
export SENLIN_TEST_TYPE="api"
|
||||
export DEVSTACK_GATE_TEMPEST_REGEX="senlin_tempest_plugin.tests.${SENLIN_TEST_TYPE}"
|
||||
export SENLIN_BACKEND="openstack_test"
|
||||
export DEVSTACK_GATE_TEMPEST_REGEX="senlin_tempest_plugin.tests.api"
|
||||
|
||||
services=rabbit,mysql,dstat,key,tempest
|
||||
services+=,g-api,g-reg
|
||||
services+=,n-api,n-cpu,n-cond,n-sch,n-crt
|
||||
# placement services mandatory for nova from ocata
|
||||
if [[ "stable/newton" != $ZUUL_BRANCH ]]; then
|
||||
services+=,placement-api,placement-client
|
||||
services+=,placement-api,placement-client
|
||||
fi
|
||||
services+=,c-sch,c-api,c-vol,c-bak
|
||||
services+=,q-svc,q-dhcp,q-meta,q-agt,q-l3
|
||||
# services+=,c-sch,c-api,c-vol,c-bak
|
||||
# services+=,q-svc,q-dhcp,q-meta,q-agt,q-l3
|
||||
|
||||
export PROJECTS="openstack/senlin $PROJECTS"
|
||||
export DEVSTACK_LOCAL_CONFIG="enable_plugin senlin https://git.openstack.org/openstack/senlin"
|
||||
|
||||
if [ "${SENLIN_TEST_TYPE}" == "api" ]||[ "${SENLIN_TEST_TYPE}" == "functional" ]; then
|
||||
export SENLIN_BACKEND="openstack_test"
|
||||
else
|
||||
export SENLIN_BACKEND="openstack"
|
||||
export PROJECTS="openstack/heat $PROJECTS"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat git://git.openstack.org/openstack/heat"
|
||||
|
||||
# Enable LBaaS V2 plugin
|
||||
services+=,q-lbaasv2
|
||||
export PROJECTS="openstack/neutron-lbaas $PROJECTS"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-lbaas https://git.openstack.org/openstack/neutron-lbaas"
|
||||
|
||||
# Enable Zaqar
|
||||
export PROJECTS="openstack/zaqar $PROJECTS"
|
||||
export PROJECTS="openstack/python-zaqarclient $PROJECTS"
|
||||
export PROJECTS="openstack/zaqar-ui $PROJECTS"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin zaqar git://git.openstack.org/openstack/zaqar"
|
||||
fi
|
||||
|
||||
# use senlin-tempest-plugin
|
||||
export PROJECTS="openstack/senlin-tempest-plugin $PROJECTS"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/senlin-tempest-plugin'"
|
||||
|
@ -89,13 +65,13 @@
|
|||
|
||||
function pre_test_hook {
|
||||
cd /opt/stack/new/senlin/senlin/tests/tempest/
|
||||
./pre_test_hook.sh
|
||||
source ./pre_test_hook.sh
|
||||
}
|
||||
export -f pre_test_hook
|
||||
|
||||
function post_test_hook {
|
||||
cd /opt/stack/new/senlin/senlin/tests/tempest/
|
||||
./post_test_hook.sh senlin_tempest_plugin.tests.${SENLIN_TEST_TYPE}
|
||||
source ./post_test_hook.sh
|
||||
}
|
||||
export -f post_test_hook
|
||||
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
- hosts: all
|
||||
name: Autoconverted job legacy-senlin-dsvm-tempest-py35-functional from old job
|
||||
gate-senlin-dsvm-tempest-py35-functional-nv
|
||||
name: gate-senlin-dsvm-tempest-py35-functional-nv
|
||||
tasks:
|
||||
|
||||
- name: Ensure legacy workspace directory
|
||||
|
@ -37,48 +36,22 @@
|
|||
export DEVSTACK_GATE_INSTALL_TESTONLY=1
|
||||
export KEEP_LOCALRC=1
|
||||
|
||||
if [ "py35" == "py35" ]; then
|
||||
export DEVSTACK_GATE_USE_PYTHON3=True
|
||||
else
|
||||
export DEVSTACK_GATE_USE_PYTHON3=False
|
||||
fi
|
||||
export DEVSTACK_GATE_USE_PYTHON3=True
|
||||
|
||||
export SENLIN_TEST_TYPE="functional"
|
||||
export DEVSTACK_GATE_TEMPEST_REGEX="senlin_tempest_plugin.tests.${SENLIN_TEST_TYPE}"
|
||||
export SENLIN_BACKEND="openstack_test"
|
||||
export DEVSTACK_GATE_TEMPEST_REGEX="senlin_tempest_plugin.tests.functional"
|
||||
|
||||
services=rabbit,mysql,dstat,key,tempest
|
||||
services+=,g-api,g-reg
|
||||
services+=,n-api,n-cpu,n-cond,n-sch,n-crt
|
||||
# placement services mandatory for nova from ocata
|
||||
if [[ "stable/newton" != $ZUUL_BRANCH ]]; then
|
||||
services+=,placement-api,placement-client
|
||||
services+=,placement-api,placement-client
|
||||
fi
|
||||
services+=,c-sch,c-api,c-vol,c-bak
|
||||
services+=,q-svc,q-dhcp,q-meta,q-agt,q-l3
|
||||
|
||||
export PROJECTS="openstack/senlin $PROJECTS"
|
||||
export DEVSTACK_LOCAL_CONFIG="enable_plugin senlin https://git.openstack.org/openstack/senlin"
|
||||
|
||||
if [ "${SENLIN_TEST_TYPE}" == "api" ]||[ "${SENLIN_TEST_TYPE}" == "functional" ]; then
|
||||
export SENLIN_BACKEND="openstack_test"
|
||||
else
|
||||
export SENLIN_BACKEND="openstack"
|
||||
export PROJECTS="openstack/heat $PROJECTS"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat git://git.openstack.org/openstack/heat"
|
||||
|
||||
# Enable LBaaS V2 plugin
|
||||
services+=,q-lbaasv2
|
||||
export PROJECTS="openstack/neutron-lbaas $PROJECTS"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-lbaas https://git.openstack.org/openstack/neutron-lbaas"
|
||||
|
||||
# Enable Zaqar
|
||||
export PROJECTS="openstack/zaqar $PROJECTS"
|
||||
export PROJECTS="openstack/python-zaqarclient $PROJECTS"
|
||||
export PROJECTS="openstack/zaqar-ui $PROJECTS"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin zaqar git://git.openstack.org/openstack/zaqar"
|
||||
fi
|
||||
|
||||
# use senlin-tempest-plugin
|
||||
export PROJECTS="openstack/senlin-tempest-plugin $PROJECTS"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/senlin-tempest-plugin'"
|
||||
|
||||
|
@ -90,13 +63,13 @@
|
|||
|
||||
function pre_test_hook {
|
||||
cd /opt/stack/new/senlin/senlin/tests/tempest/
|
||||
./pre_test_hook.sh
|
||||
source ./pre_test_hook.sh
|
||||
}
|
||||
export -f pre_test_hook
|
||||
|
||||
function post_test_hook {
|
||||
cd /opt/stack/new/senlin/senlin/tests/tempest/
|
||||
./post_test_hook.sh senlin_tempest_plugin.tests.${SENLIN_TEST_TYPE}
|
||||
source ./post_test_hook.sh
|
||||
}
|
||||
export -f post_test_hook
|
||||
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
- hosts: all
|
||||
name: Autoconverted job legacy-senlin-dsvm-tempest-py35-integration from old job
|
||||
gate-senlin-dsvm-tempest-py35-integration-nv
|
||||
name: gate-senlin-dsvm-tempest-py35-integration-nv
|
||||
tasks:
|
||||
|
||||
- name: Ensure legacy workspace directory
|
||||
|
@ -37,14 +36,10 @@
|
|||
export DEVSTACK_GATE_INSTALL_TESTONLY=1
|
||||
export KEEP_LOCALRC=1
|
||||
|
||||
if [ "py35" == "py35" ]; then
|
||||
export DEVSTACK_GATE_USE_PYTHON3=True
|
||||
else
|
||||
export DEVSTACK_GATE_USE_PYTHON3=False
|
||||
fi
|
||||
export DEVSTACK_GATE_USE_PYTHON3=True
|
||||
|
||||
export SENLIN_TEST_TYPE="integration"
|
||||
export DEVSTACK_GATE_TEMPEST_REGEX="senlin_tempest_plugin.tests.${SENLIN_TEST_TYPE}"
|
||||
export DEVSTACK_GATE_TEMPEST_REGEX="senlin_tempest_plugin.tests.integration"
|
||||
|
||||
services=rabbit,mysql,dstat,key,tempest
|
||||
services+=,g-api,g-reg
|
||||
|
@ -58,32 +53,27 @@
|
|||
|
||||
export PROJECTS="openstack/senlin $PROJECTS"
|
||||
export DEVSTACK_LOCAL_CONFIG="enable_plugin senlin https://git.openstack.org/openstack/senlin"
|
||||
export PROJECTS="openstack/heat $PROJECTS"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat git://git.openstack.org/openstack/heat"
|
||||
|
||||
if [ "${SENLIN_TEST_TYPE}" == "api" ]||[ "${SENLIN_TEST_TYPE}" == "functional" ]; then
|
||||
export SENLIN_BACKEND="openstack_test"
|
||||
else
|
||||
export SENLIN_BACKEND="openstack"
|
||||
export PROJECTS="openstack/heat $PROJECTS"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat git://git.openstack.org/openstack/heat"
|
||||
# Enable LBaaS V2 plugin
|
||||
services+=,q-lbaasv2
|
||||
export PROJECTS="openstack/neutron-lbaas $PROJECTS"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-lbaas https://git.openstack.org/openstack/neutron-lbaas"
|
||||
|
||||
# Enable LBaaS V2 plugin
|
||||
services+=,q-lbaasv2
|
||||
export PROJECTS="openstack/neutron-lbaas $PROJECTS"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-lbaas https://git.openstack.org/openstack/neutron-lbaas"
|
||||
|
||||
# Enable Zaqar
|
||||
export PROJECTS="openstack/zaqar $PROJECTS"
|
||||
export PROJECTS="openstack/python-zaqarclient $PROJECTS"
|
||||
export PROJECTS="openstack/zaqar-ui $PROJECTS"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin zaqar git://git.openstack.org/openstack/zaqar"
|
||||
export PROJECTS="openstack/zaqar-tempest-plugin $PROJECTS"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/zaqar-tempest-plugin'"
|
||||
fi
|
||||
# Enable Zaqar
|
||||
export PROJECTS="openstack/zaqar $PROJECTS"
|
||||
export PROJECTS="openstack/python-zaqarclient $PROJECTS"
|
||||
export PROJECTS="openstack/zaqar-ui $PROJECTS"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin zaqar git://git.openstack.org/openstack/zaqar"
|
||||
export PROJECTS="openstack/zaqar-tempest-plugin $PROJECTS"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/zaqar-tempest-plugin'"
|
||||
|
||||
# use senlin-tempest-plugin
|
||||
export PROJECTS="openstack/senlin-tempest-plugin $PROJECTS"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/senlin-tempest-plugin'"
|
||||
|
||||
export SENLIN_BACKEND="openstack"
|
||||
export OVERRIDE_ENABLED_SERVICES=$services
|
||||
|
||||
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
|
||||
|
|
|
@ -22,8 +22,6 @@ export SENLIN_DIR=$DEST/senlin
|
|||
|
||||
source $DEVSTACK_DIR/openrc admin admin
|
||||
|
||||
if [ ! -z "$1" ]; then
|
||||
cd $DEST/tempest
|
||||
echo "Running tempest with regex $1"
|
||||
sudo tox -evenv-tempest -- tempest run --regex $1
|
||||
fi
|
||||
cd $DEST/tempest
|
||||
echo "Running tempest " $SENLIN_TEST_TYPE "tests"
|
||||
sudo tox -evenv-tempest -- tempest run --regex $DEVSTACK_GATE_TEMPEST_REGEX
|
||||
|
|
|
@ -17,6 +17,7 @@
|
|||
set -x
|
||||
|
||||
export localconf=$BASE/new/devstack/local.conf
|
||||
|
||||
export SENLIN_CONF=/etc/senlin/senlin.conf
|
||||
export ZAQAR_CONF=/etc/zaqar/zaqar.conf
|
||||
export SENLIN_BACKEND=${SENLIN_BACKEND:-'openstack_test'}
|
||||
|
|
Loading…
Reference in New Issue