[Scalpels] Removing tempest from dsvm job
There are two fixes in Scalpels' job template: * remove tempest from its dsvm job * add support to pre_test_hook * mv the dsvm to experimental Change-Id: I955ab7f2904c0d27d88041eddad33c6a50457473
This commit is contained in:
parent
cded74082b
commit
5e9b543c77
|
@ -14,7 +14,7 @@
|
||||||
- shell: |
|
- shell: |
|
||||||
#!/bin/bash -xe
|
#!/bin/bash -xe
|
||||||
# Start with the base set of services
|
# Start with the base set of services
|
||||||
ENABLED_SERVICES=mysql,rabbit,key,tempest,g-api,g-reg,
|
ENABLED_SERVICES=mysql,rabbit,key,g-api,g-reg,
|
||||||
# Add Nova services (except for nova-network)
|
# Add Nova services (except for nova-network)
|
||||||
ENABLED_SERVICES+=n-api,n-cond,n-cpu,n-crt,n-obj,n-sch
|
ENABLED_SERVICES+=n-api,n-cond,n-cpu,n-crt,n-obj,n-sch
|
||||||
# Enable Neutron
|
# Enable Neutron
|
||||||
|
@ -22,9 +22,7 @@
|
||||||
export ENABLED_SERVICES
|
export ENABLED_SERVICES
|
||||||
export PYTHONUNBUFFERED=true
|
export PYTHONUNBUFFERED=true
|
||||||
export DEVSTACK_GATE_TIMEOUT=120
|
export DEVSTACK_GATE_TIMEOUT=120
|
||||||
export DEVSTACK_GATE_TEMPEST=1
|
|
||||||
export DEVSTACK_GATE_NEUTRON=1
|
export DEVSTACK_GATE_NEUTRON=1
|
||||||
export DEVSTACK_GATE_TEMPEST_FULL=1
|
|
||||||
export DEVSTACK_GATE_NEUTRON_DVR=1
|
export DEVSTACK_GATE_NEUTRON_DVR=1
|
||||||
export BRANCH_OVERRIDE={branch-override}
|
export BRANCH_OVERRIDE={branch-override}
|
||||||
export PROJECTS="openstack/scalpels $PROJECTS"
|
export PROJECTS="openstack/scalpels $PROJECTS"
|
||||||
|
@ -32,6 +30,13 @@
|
||||||
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
|
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
|
||||||
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
|
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
function pre_test_hook {{
|
||||||
|
# setup DEVSTACK_GATE_* options here
|
||||||
|
$BASE/new/scalpels/tests/ci/pre-test-hook.sh
|
||||||
|
}}
|
||||||
|
export -f pre_test_hook
|
||||||
|
|
||||||
function post_test_hook {{
|
function post_test_hook {{
|
||||||
$BASE/new/scalpels/tests/ci/scalpels-ci.sh
|
$BASE/new/scalpels/tests/ci/scalpels-ci.sh
|
||||||
}}
|
}}
|
||||||
|
|
|
@ -8339,7 +8339,7 @@ projects:
|
||||||
- name: python3-jobs
|
- name: python3-jobs
|
||||||
- name: check-requirements
|
- name: check-requirements
|
||||||
- name: publish-to-pypi
|
- name: publish-to-pypi
|
||||||
check:
|
experimental:
|
||||||
- gate-scalpels-dsvm-neutron
|
- gate-scalpels-dsvm-neutron
|
||||||
|
|
||||||
- name: openstack/searchlight
|
- name: openstack/searchlight
|
||||||
|
|
Loading…
Reference in New Issue