From e9a6156a05ed5fa88f1ac61654a68a55e5a608a3 Mon Sep 17 00:00:00 2001
From: Lakshmi N Sampath <lakshmi.sampath@hp.com>
Date: Mon, 28 Mar 2016 11:08:26 -0700
Subject: [PATCH] Change experimental to actual for searchlight

https://review.openstack.org/#/c/294224 had an experimental
job for testing elasticsearch install inside py27 job.

The test was successfull, so changing it for real.

Also adding elasticsearch package to py34 job which I
realized was missing.

Change-Id: Ifec2835a63d399a136ee5bdcdedadead18ebe817
---
 jenkins/jobs/macros.yaml      |  5 -----
 jenkins/jobs/python-jobs.yaml |  2 +-
 jenkins/jobs/searchlight.yaml | 25 +++++++++++++++++++++++++
 zuul/layout.yaml              | 21 ++++++++++++---------
 4 files changed, 38 insertions(+), 15 deletions(-)

diff --git a/jenkins/jobs/macros.yaml b/jenkins/jobs/macros.yaml
index 88c792ab41..0ce42b4808 100644
--- a/jenkins/jobs/macros.yaml
+++ b/jenkins/jobs/macros.yaml
@@ -818,11 +818,6 @@
           sudo apt-get install -y openjdk-7-jre
           wget https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-1.7.5.deb
           sudo dpkg -i elasticsearch-1.7.5.deb
-
-          #Switch to tar extract if service start doesn't work.
-          #wget https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-1.7.5.tar.gz
-          #tar -zxvf elasticsearch-1.7.5.tar.gz
-
           #Make 'elasticsearch' binary callable from within functional tests
           sudo ln -s /usr/share/elasticsearch/bin/elasticsearch /usr/local/bin/elasticsearch
 
diff --git a/jenkins/jobs/python-jobs.yaml b/jenkins/jobs/python-jobs.yaml
index 69f52acfcc..d83623374c 100644
--- a/jenkins/jobs/python-jobs.yaml
+++ b/jenkins/jobs/python-jobs.yaml
@@ -515,7 +515,7 @@
       - '{name}-coverage'
       - 'gate-{name}-pep8'
       - 'gate-{name}-python27-searchlight'
-      - 'gate-{name}-python34'
+      - 'gate-{name}-python34-searchlight'
       - 'gate-{name}-pypy'
       - 'gate-{name}-docs'
       - 'gate-{name}-requirements'
diff --git a/jenkins/jobs/searchlight.yaml b/jenkins/jobs/searchlight.yaml
index d15ce3247d..092ccc11fc 100644
--- a/jenkins/jobs/searchlight.yaml
+++ b/jenkins/jobs/searchlight.yaml
@@ -22,3 +22,28 @@
       - zuul-swift-test-results-with-console
 
     node: ubuntu-trusty
+
+- job-template:
+    name: 'gate-{name}-python34-searchlight'
+
+    wrappers:
+      - build-timeout:
+          timeout: 40
+      - timestamps
+
+    builders:
+      - print-template-name:
+          template-name: "{template-name}"
+      - zuul-git-prep-upper-constraints
+      - elasticsearch-install
+      - install-distro-packages
+      - revoke-sudo
+      - python34
+      - assert-no-extra-files
+
+    publishers:
+      - test-results
+      - console-log
+      - zuul-swift-test-results-with-console
+
+    node: ubuntu-trusty
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index c4f01aa0da..a4b0b8896f 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -309,20 +309,16 @@ project-templates:
       - '{name}-branch-tarball'
 
   # Invokes the same targets as python-jobs with one change:
-  # python27-searchlight is used instead of python27. The job
-  # python27-searchlight installs extra packages
+  # python27-searchlight is used instead of python27.
+  # The job python27-searchlight installs extra packages
   - name: python-jobs-searchlight
     check:
       - 'gate-{name}-docs'
       - 'gate-{name}-pep8'
-      # TODO(jaegerandi): Enable once experimental job works.
-      # - 'gate-{name}-python27-searchlight'
+      - 'gate-{name}-python27-searchlight'
     gate:
       - 'gate-{name}-docs'
       - 'gate-{name}-pep8'
-      # TODO(jaegerandi): Enable once experimental job works.
-      # - 'gate-{name}-python27-searchlight'
-    experimental:
       - 'gate-{name}-python27-searchlight'
     post:
       - '{name}-branch-tarball'
@@ -410,6 +406,13 @@ project-templates:
     gate:
       - 'gate-{name}-python34'
 
+  # Invokes the same targets as python3-jobs, but sets up extra packages.
+  - name: python3-jobs-searchlight
+    check:
+      - 'gate-{name}-python34-searchlight'
+    gate:
+      - 'gate-{name}-python34-searchlight'
+
   # Invokes the same targets as python3-jobs, but sets up databases.
   - name: python3-db-jobs
     check:
@@ -9835,7 +9838,7 @@ projects:
     template:
       - name: merge-check
       - name: python-jobs-searchlight
-      - name: python3-jobs
+      - name: python3-jobs-searchlight
       - name: openstack-client-publish-jobs
       - name: check-requirements
       - name: publish-to-pypi
@@ -10374,7 +10377,7 @@ projects:
     template:
       - name: merge-check
       - name: python-jobs-searchlight
-      - name: python3-jobs
+      - name: python3-jobs-searchlight
       - name: openstack-server-publish-jobs
       - name: openstack-server-release-jobs
       - name: check-requirements