Remove the patrole heat job
Now that Tempest is removing Heat tests, Patrole should follow suit. Change-Id: Ifd150ef113988e7a3721ee174f0453f99ce198f6 Needed-By: I169e74a3af4957248cda26d108b61ff187ae4b1d
This commit is contained in:
parent
6a0a78f1b8
commit
b578a641c2
|
@ -58,67 +58,6 @@
|
|||
- devstack-logs
|
||||
- console-log
|
||||
|
||||
# Job for Patrole + Heat + Tempest. Tests admin and heat_stack_user roles.
|
||||
- job-template:
|
||||
name: '{pipeline}-tempest-dsvm-patrole-heat-{rbac-role}-{node}{suffix}'
|
||||
node: '{node}'
|
||||
|
||||
wrappers:
|
||||
- build-timeout:
|
||||
timeout: 70
|
||||
- timestamps
|
||||
|
||||
builders:
|
||||
- print-template-name:
|
||||
template-name: "{template-name}"
|
||||
- link-logs
|
||||
- net-info
|
||||
- devstack-checkout
|
||||
- local_conf:
|
||||
conf: |
|
||||
[[local|localrc]]
|
||||
enable_plugin patrole git://git.openstack.org/openstack/patrole
|
||||
enable_plugin heat git://git.openstack.org/openstack/heat
|
||||
- shell: |
|
||||
#!/bin/bash -xe
|
||||
export PYTHONUNBUFFERED=true
|
||||
|
||||
# Ensure that tempest set up is executed, but do not automatically
|
||||
# execute tempest tests; they are executed in post_test_hook.
|
||||
export DEVSTACK_GATE_TEMPEST=1
|
||||
export DEVSTACK_GATE_NEUTRON=1
|
||||
export DEVSTACK_GATE_TEMPEST_NOTESTS=1
|
||||
|
||||
export PROJECTS="openstack/patrole $PROJECTS"
|
||||
|
||||
export BRANCH_OVERRIDE={branch-override}
|
||||
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
|
||||
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
|
||||
fi
|
||||
|
||||
# Keep localrc to be able to set some vars in pre_test_hook
|
||||
export KEEP_LOCALRC=1
|
||||
|
||||
function pre_test_hook {{
|
||||
source $BASE/new/patrole/contrib/pre_test_hook.sh \
|
||||
{rbac-role} heat
|
||||
}}
|
||||
export -f pre_test_hook
|
||||
|
||||
function post_test_hook {{
|
||||
source $BASE/new/patrole/contrib/post_test_hook.sh \
|
||||
{rbac-role} heat
|
||||
}}
|
||||
export -f post_test_hook
|
||||
|
||||
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
|
||||
./safe-devstack-vm-gate-wrap.sh
|
||||
|
||||
publishers:
|
||||
- test-results
|
||||
- devstack-logs
|
||||
- console-log
|
||||
|
||||
# Job for Patrole + Tempest multinode environment. Tests admin and Member roles.
|
||||
- job-template:
|
||||
name: '{pipeline}-tempest-dsvm-patrole-multinode-{rbac-role}-{node-release}{suffix}'
|
||||
|
|
|
@ -10191,14 +10191,6 @@
|
|||
rbac-role:
|
||||
- admin
|
||||
- member
|
||||
- '{pipeline}-tempest-dsvm-patrole-heat-{rbac-role}-{node}{suffix}':
|
||||
pipeline: gate
|
||||
node: ubuntu-xenial
|
||||
branch-override: default
|
||||
suffix: '-nv'
|
||||
rbac-role:
|
||||
- admin
|
||||
- heat_stack_user
|
||||
- '{pipeline}-tempest-dsvm-patrole-multinode-{rbac-role}-{node-release}{suffix}':
|
||||
pipeline: gate
|
||||
node-release: ubuntu-xenial
|
||||
|
|
|
@ -15108,8 +15108,6 @@ projects:
|
|||
check:
|
||||
- gate-tempest-dsvm-patrole-admin-ubuntu-xenial
|
||||
- gate-tempest-dsvm-patrole-member-ubuntu-xenial
|
||||
- gate-tempest-dsvm-patrole-heat-admin-ubuntu-xenial-nv
|
||||
- gate-tempest-dsvm-patrole-heat-heat_stack_user-ubuntu-xenial-nv
|
||||
- gate-tempest-dsvm-patrole-multinode-admin-ubuntu-xenial-nv
|
||||
- gate-tempest-dsvm-patrole-multinode-member-ubuntu-xenial-nv
|
||||
gate:
|
||||
|
|
Loading…
Reference in New Issue