From 0771b437355f1b1dd2ce0e9a5bdf8390b3497c17 Mon Sep 17 00:00:00 2001
From: Artur Basiak <artur.basiak@ts.fujitsu.com>
Date: Fri, 4 Aug 2017 10:12:33 +0200
Subject: [PATCH] Provide unified gate configuration

Provide unified gate configuration for:
- monasca-log-api
- monasca-events-api
Read configuration for those project from devstackgaterc file.
Do not run unified gate on stable/(newton|ocata|pike) branches.

Change-Id: If7c74f4ffbdf484160690dbe16fb5759137a69ed
---
 jenkins/jobs/monasca.yaml  | 58 ++++++++++++++++++++++++++++++++++++++
 jenkins/jobs/projects.yaml | 10 +++++++
 zuul/layout.yaml           |  8 ++++++
 3 files changed, 76 insertions(+)

diff --git a/jenkins/jobs/monasca.yaml b/jenkins/jobs/monasca.yaml
index 2b6ee03a3b..1fa12eec5a 100644
--- a/jenkins/jobs/monasca.yaml
+++ b/jenkins/jobs/monasca.yaml
@@ -130,3 +130,61 @@
     publishers:
       - devstack-logs
       - console-log
+
+- job-template:
+    name: 'gate-tempest-dsvm-monasca-pipeline-{pipeline}-{node}{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_NEUTRON=0
+          export OVERRIDE_ENABLED_SERVICES=key,mysql,rabbit,tempest,dstat
+
+          devstack_plugin=''
+          if [ {pipeline} == 'logs']; then
+            devstack_plugin='log-api'
+          elif [ {pipeline} == 'events' ]; then
+            devstack_plugin='events-api'
+          else
+            echo "Unknown pipeline {pipeline}"
+            exit 1
+          fi
+
+          pre_test_hook_script=$BASE/new/monasca-$devstack_plugin/devstack/pre_test_hook.sh
+          post_test_hook_script=$BASE/new/monasca-$devstack_plugin/devstack/post_test_hook.sh
+          devstack_rc_script=/opt/stack/new/monasca-$devstack_plugin/devstack/devstackgaterc
+
+          if [ -f $pre_test_hook_script ]; then
+              function pre_test_hook {{
+                  source $pre_test_hook_script
+              }}
+              export -f pre_test_hook
+          fi
+
+          if [ -f $post_test_hook_script ]; then
+              function post_test_hook {{
+                  source $post_test_hook_script
+              }}
+              export -f post_test_hook
+          fi
+
+          if [ -f $devstack_rc_script ]; then
+              export DEVSTACK_GATE_SETTINGS=$devstack_rc_script
+          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
\ No newline at end of file
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 19792a9e74..f0f26d4383 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -7145,6 +7145,11 @@
       - openstack-releasenotes-jobs
       - api-ref-jobs:
           service: monitoring-events
+      - gate-tempest-dsvm-monasca-pipeline-{pipeline}-{node}{suffix}:
+          node: ubuntu-xenial
+          pipeline: events
+          suffix:
+            - '-nv'
 
 - project:
     name: monasca-grafana-datasource
@@ -7179,6 +7184,11 @@
           suffix:
             - ''
             - '-nv'
+      - gate-tempest-dsvm-monasca-pipeline-{pipeline}-{node}{suffix}:
+          node: ubuntu-xenial
+          pipeline: logs
+          suffix:
+            - '-nv'
 
 - project:
     name: monasca-notification
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 0f96814286..06f5a438f8 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1174,6 +1174,11 @@ jobs:
   - name: ^gate-tempest-dsvm-monasca-log-api-ubuntu-xenial$
     branch: ^(?!stable/newton).*$
 
+  # do not run unified tempest gate on stable/(newton|ocata|pike)
+  # it is meant to replace existing gate in the Queens release
+  - name: ^gate-tempest-dsvm-monasca-pipeline-(logs|events)-ubuntu-xenial(-nv)?$
+    branch: ^(?!stable/(newton|ocata|pike)).*$
+
   # disable requirement control @ stable/mitaka for networking-arista
   # networking-arista was not managed in requirements for mitaka.
   - name: ^gate-networking-arista-requirements$
@@ -11793,6 +11798,7 @@ projects:
       - name: api-ref-jobs
     check:
       - monasca-events-api-coverage-ubuntu-xenial
+      - gate-tempest-dsvm-monasca-pipeline-events-ubuntu-xenial-nv
     post:
       - monasca-events-api-coverage-ubuntu-xenial
 
@@ -11809,6 +11815,7 @@ projects:
       - name: nodejs4-publish-to-npm
     check:
       - gate-tempest-dsvm-monasca-log-api-ubuntu-xenial-nv
+      - gate-tempest-dsvm-monasca-pipeline-logs-ubuntu-xenial-nv
 
   - name: openstack/monasca-log-api
     template:
@@ -11825,6 +11832,7 @@ projects:
     check:
       - monasca-log-api-coverage-ubuntu-xenial
       - gate-tempest-dsvm-monasca-log-api-ubuntu-xenial
+      - gate-tempest-dsvm-monasca-pipeline-logs-ubuntu-xenial-nv
     gate:
       - gate-tempest-dsvm-monasca-log-api-ubuntu-xenial
     post: