From 8a7f3a83e3835c281fa15932cd3041d46495ae3a Mon Sep 17 00:00:00 2001
From: Andrey Pavlov <andrey-mp@yandex.ru>
Date: Fri, 27 Feb 2015 18:12:21 +0300
Subject: [PATCH] Create our own rally job for ec2-api

In previous review
https://review.openstack.org/#/c/159138/
I tried to use existing rally job. But I skipped fact that in this job
ec2-api wouldn't loaded. Now I was trying to think up how this existing
job can be adapted to load ec2-api plugin. And simple way to do it -
is to create another job-template with needed shell script and needed params.

Change-Id: I3a95b298a70795601ef4002fc413e91960af0f2b
---
 jenkins/jobs/ec2-api.yaml  | 45 ++++++++++++++++++++++++++++++++++++++
 jenkins/jobs/projects.yaml |  2 --
 zuul/layout.yaml           |  5 +++--
 3 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/jenkins/jobs/ec2-api.yaml b/jenkins/jobs/ec2-api.yaml
index 0f6565c1ad..ba4bf3ee4e 100644
--- a/jenkins/jobs/ec2-api.yaml
+++ b/jenkins/jobs/ec2-api.yaml
@@ -121,3 +121,48 @@
     publishers:
       - devstack-logs
       - console-log
+
+- job:
+    name: 'gate-rally-dsvm-ec2-api-fakevirt'
+    node: 'bare-precise || bare-trusty'
+
+    wrappers:
+      - build-timeout:
+          timeout: 125
+      - timestamps
+
+    builders:
+      - link-logs
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PROJECTS="stackforge/ec2-api $PROJECTS"
+          export DEVSTACK_LOCAL_CONFIG="enable_plugin ec2-api git://git.openstack.org/stackforge/ec2-api"
+          export DEVSTACK_GATE_VIRT_DRIVER=fake
+          export DEVSTACK_GATE_NEUTRON=1
+          export DEVSTACK_GATE_TIMEOUT=120
+
+          export RALLY_SCENARIO=ec2-api-fakevirt
+
+          export PROJECTS="stackforge/rally $PROJECTS"
+          export CEILOMETER_NOTIFICATION_TOPICS=notifications,profiler
+          export ENABLED_SERVICES=rally
+
+          function pre_test_hook {
+              # Install rally-devstack integration
+              cp -r $BASE/new/rally/contrib/devstack/* $BASE/new/devstack/
+          }
+          export -f pre_test_hook
+
+          function post_test_hook {
+              $BASE/new/rally/tests/ci/rally-gate.sh
+          }
+          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:
+      - devstack-logs
+      - console-log
+      - rally-plot
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 7feac8cf3c..c9986126ee 100755
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -3294,8 +3294,6 @@
           node: 'devstack-precise || devstack-trusty'
           branch-designator: ''
           branch-override: default
-      - 'gate-rally-dsvm-fakevirt-{name}':
-          name: 'ec2-api'
 
 - project:
     name: ec2-driver
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 236400910b..1f419d0578 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -638,7 +638,7 @@ jobs:
     branch: ^(?!stable)
   - name: check-functional-nova-network-dsvm-ec2api
     branch: ^(?!stable)
-  - name: gate-rally-dsvm-fakevirt-ec2-api
+  - name: gate-rally-dsvm-ec2-api-fakevirt
     voting: false
   - name: check-tempest-dsvm-centos7
     branch: ^(?!stable/icehouse).*$
@@ -4600,10 +4600,11 @@ projects:
       - check-tempest-dsvm-ec2api
       - check-functional-neutron-dsvm-ec2api
       - check-functional-nova-network-dsvm-ec2api
-      - gate-rally-dsvm-fakevirt-ec2-api
     gate:
       - gate-ec2-api-pep8
       - gate-ec2-api-python27
+    experimental:
+      - gate-rally-dsvm-ec2-api-fakevirt
 
   - name: stackforge/ec2-driver
     template: