Remove old functional job for Watcher

This patch set removes old functional test job and
renames new one to the old one.

Change-Id: I08c8faef0b61124f6c5d15844922c62dfaccc700
This commit is contained in:
Alexander Chadin 2017-08-18 15:52:44 +03:00
parent 9d3a8ce858
commit d97bf60d97
3 changed files with 1 additions and 54 deletions

View File

@ -15563,12 +15563,6 @@
node: ubuntu-xenial-2-node
suffix: '-nv'
branch-override: default
- '{pipeline}-watcher-dsvm-multinode-split-{node-release}{suffix}':
pipeline: gate
node-release: ubuntu-xenial
node: ubuntu-xenial-2-node
suffix: '-nv'
branch-override: default
- project:
name: watcher-dashboard

View File

@ -46,52 +46,6 @@
name: '{pipeline}-watcher-dsvm-multinode-{node-release}{suffix}'
node: '{node}'
wrappers:
- build-timeout:
timeout: 70
- timestamps
builders:
- link-logs
- net-info
- devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer
# Enable watcher devstack plugin.
enable_plugin watcher git://git.openstack.org/openstack/watcher
- shell: |
#!/bin/bash -xe
export DEVSTACK_SUBNODE_CONFIG=" "
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TEMPEST=1
export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1
export DEVSTACK_GATE_TEMPEST_REGEX="watcher_tempest_plugin"
export DEVSTACK_GATE_NEUTRON=1
export DEVSTACK_GATE_TOPOLOGY="multinode"
export PROJECTS="openstack/watcher $PROJECTS"
export PROJECTS="openstack/python-watcherclient $PROJECTS"
export BRANCH_OVERRIDE={branch-override}
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi
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-template:
name: '{pipeline}-watcher-dsvm-multinode-split-{node-release}{suffix}'
node: '{node}'
wrappers:
- build-timeout:
timeout: 70

View File

@ -18609,7 +18609,6 @@ projects:
- watcher-coverage-ubuntu-xenial-nv
- gate-rally-dsvm-watcher-watcher-ubuntu-xenial-nv
- gate-watcher-dsvm-multinode-ubuntu-xenial-nv
- gate-watcher-dsvm-multinode-split-ubuntu-xenial-nv
- name: openstack/watcher-dashboard
template:
@ -18635,7 +18634,7 @@ projects:
template:
- name: merge-check
check:
- gate-watcher-dsvm-multinode-split-ubuntu-xenial-nv
- gate-watcher-dsvm-multinode-ubuntu-xenial-nv
- gate-watcher-tempest-plugin-pep8-ubuntu-xenial
gate:
- gate-watcher-tempest-plugin-pep8-ubuntu-xenial