From d57ff240090becf07349066f98b8886c49c00f90 Mon Sep 17 00:00:00 2001
From: Ryota MIBU <r-mibu@cq.jp.nec.com>
Date: Wed, 25 May 2016 12:11:40 +0900
Subject: [PATCH] cleanup tempest jobs for ceilometer and aodh

Tempest test codes for ceilometer has been moved from tempest tree
to ceilometer and aodh trees as tempest plugins. This patch drops old
test jobs for ceilometer testing using tempest tree, and makes new jobs
(using tempest plugin in ceilometer and aodh trees) voting in order to
complete the migration process for ceilometer tempest tests.

Change-Id: I79d1ea226853151152fc33fe9f9847265a499353
Depends-On: I4250b7d215cff38b7f1b0db0f0ba1ea303cc2133
---
 jenkins/jobs/ceilometer.yaml | 100 -----------------------------------
 jenkins/jobs/projects.yaml   |  30 -----------
 zuul/layout.yaml             |  20 +------
 3 files changed, 1 insertion(+), 149 deletions(-)

diff --git a/jenkins/jobs/ceilometer.yaml b/jenkins/jobs/ceilometer.yaml
index e6bc017102..f8e2a50ea8 100644
--- a/jenkins/jobs/ceilometer.yaml
+++ b/jenkins/jobs/ceilometer.yaml
@@ -1,103 +1,3 @@
-- job-template:
-    name: 'gate-tempest-dsvm-ceilometer-{backend}{job-suffix}'
-    node: '{node}'
-
-    wrappers:
-      - build-timeout:
-          timeout: 130
-      - timestamps
-
-    builders:
-      - link-logs
-      - net-info
-      - devstack-checkout
-      - shell: |
-          #!/bin/bash -xe
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_CEILOMETER_BACKEND={backend}
-          export DEVSTACK_LOCAL_CONFIG="enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer"
-          export BRANCH_OVERRIDE={branch-override}
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          fi
-          if [ "{backend}" = "postgresql" ] ; then
-              export DEVSTACK_GATE_POSTGRES=1
-          fi
-          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
-          ./safe-devstack-vm-gate-wrap.sh
-
-    publishers:
-      - devstack-logs
-      - console-log
-
-
-- job-template:
-    name: 'gate-tempest-dsvm-ceilometer-{backend}-full{job-suffix}'
-    node: '{node}'
-
-    wrappers:
-      - build-timeout:
-          timeout: 130
-      - timestamps
-
-    builders:
-      - link-logs
-      - net-info
-      - devstack-checkout
-      - shell: |
-          #!/bin/bash -xe
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_TEMPEST_FULL=1
-          export DEVSTACK_GATE_CEILOMETER_BACKEND={backend}
-          export DEVSTACK_LOCAL_CONFIG="enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer"
-          export BRANCH_OVERRIDE={branch-override}
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          fi
-          if [ "{backend}" = "postgresql" ] ; then
-              export DEVSTACK_GATE_POSTGRES=1
-          fi
-          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
-          ./safe-devstack-vm-gate-wrap.sh
-
-    publishers:
-      - devstack-logs
-      - console-log
-
-- job-template:
-    name: 'gate-tempest-dsvm-ceilometer-{backend}-neutron-full{job-suffix}'
-    node: '{node}'
-
-    wrappers:
-      - build-timeout:
-          timeout: 130
-      - timestamps
-
-    builders:
-      - link-logs
-      - net-info
-      - devstack-checkout
-      - shell: |
-          #!/bin/bash -xe
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_TEMPEST_FULL=1
-          export DEVSTACK_GATE_NEUTRON=1
-          export DEVSTACK_GATE_CEILOMETER_BACKEND={backend}
-          export DEVSTACK_LOCAL_CONFIG="enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer"
-          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:
-      - devstack-logs
-      - console-log
-
 - job-template:
     name: 'gate-ceilometer-dsvm-tempest-plugin-{backend}{network}'
     node: ubuntu-trusty
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index a9d978bf38..a299150663 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -446,36 +446,6 @@
       - translation-jobs-mitaka
       - gate-rally-dsvm-fakevirt-{name}
       - openstack-releasenotes-jobs
-      - 'gate-tempest-dsvm-ceilometer-{backend}-full{job-suffix}':
-          backend: 'mongodb'
-          node: ubuntu-trusty
-          job-suffix: ''
-          branch-override: default
-      - 'gate-tempest-dsvm-ceilometer-{backend}-full{job-suffix}':
-          backend: 'mysql'
-          node: ubuntu-trusty
-          job-suffix: ''
-          branch-override: default
-      - 'gate-tempest-dsvm-ceilometer-{backend}-full{job-suffix}':
-          backend: 'postgresql'
-          node: ubuntu-trusty
-          job-suffix: ''
-          branch-override: default
-      - 'gate-tempest-dsvm-ceilometer-{backend}{job-suffix}':
-          backend: 'es'
-          node: ubuntu-trusty
-          job-suffix: ''
-          branch-override: default
-      - 'gate-tempest-dsvm-ceilometer-{backend}-full{job-suffix}':
-          backend: 'es'
-          node: ubuntu-trusty
-          job-suffix: ''
-          branch-override: default
-      - 'gate-tempest-dsvm-ceilometer-{backend}-neutron-full{job-suffix}':
-          backend: 'mysql'
-          node: ubuntu-trusty
-          job-suffix: ''
-          branch-override: default
       - 'gate-ceilometer-dsvm-tempest-plugin-{backend}{network}':
           backend: 'mongodb'
           network: ''
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 27c47cf32d..f2c3d32151 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2425,13 +2425,7 @@ jobs:
   - name: gate-neutron-lbaas-dashboard-npm-run-test
     voting: false
 
-  - name: gate-tempest-dsvm-ceilometer-mongodb-full
-    voting: false
-
-  - name: ^gate-ceilometer-dsvm-tempest-plugin-.*$
-    voting: false
-
-  - name: ^gate-aodh-dsvm-tempest-plugin-.*$
+  - name: gate-ceilometer-dsvm-tempest-plugin-mongodb
     voting: false
 
   - name: gate-horizon-selenium-headless
@@ -4839,25 +4833,16 @@ projects:
       - gate-ceilometer-dsvm-tempest-plugin-postgresql
       - gate-grenade-dsvm-ceilometer
       - gate-telemetry-dsvm-integration-ceilometer
-      - gate-tempest-dsvm-ceilometer-mongodb-full
-      - gate-tempest-dsvm-ceilometer-mysql-full
-      - gate-tempest-dsvm-ceilometer-mysql-neutron-full
-      - gate-tempest-dsvm-ceilometer-postgresql-full
     gate:
       - gate-ceilometer-dsvm-functional-mongodb
       - gate-ceilometer-dsvm-functional-mysql
       - gate-ceilometer-dsvm-functional-postgresql
       - gate-grenade-dsvm-ceilometer
       - gate-telemetry-dsvm-integration-ceilometer
-      - gate-tempest-dsvm-ceilometer-mysql-full
-      - gate-tempest-dsvm-ceilometer-mysql-neutron-full
-      - gate-tempest-dsvm-ceilometer-postgresql-full
     experimental:
       - gate-ceilometer-dsvm-tempest-plugin-es
       - gate-grenade-dsvm-forward
       - gate-rally-dsvm-fakevirt-ceilometer
-      - gate-tempest-dsvm-ceilometer-es
-      - gate-tempest-dsvm-ceilometer-es-full
 
   - name: openstack/ceilometer-powervm
     template:
@@ -11770,8 +11755,6 @@ projects:
       - gate-tempest-dsvm-full-liberty
       - gate-tempest-dsvm-postgres-full-liberty
       - gate-tempest-dsvm-neutron-full-liberty
-      # NOTE(chdent): remove when ceilometer tempest tests are in a plugin
-      - gate-tempest-dsvm-ceilometer-mysql-neutron-full
     gate:
       - gate-tempest-pep8
       - gate-tempest-docs
@@ -11791,7 +11774,6 @@ projects:
       - gate-tempest-dsvm-neutron-dvr-multinode-full
       - gate-grenade-dsvm-forward
       - gate-tempest-dsvm-cells
-      - gate-tempest-dsvm-ceilometer-mongodb-full
       - gate-tempest-dsvm-full-test-accounts
       - gate-tempest-dsvm-neutron-full-test-accounts
       - gate-tempest-dsvm-neutron-full-non-admin