From 9645f3fe96e64474f16c0a11fd0bf483d322a71a Mon Sep 17 00:00:00 2001
From: Radomir Dopieralski <openstack@sheep.art.pl>
Date: Fri, 9 Jan 2015 12:51:37 +0100
Subject: [PATCH] Enable Selenium tests for stackforge/tuskar-ui-extras

As requested, move the selenium job to a template.

Change-Id: I95b870ddd305cb1e6da9138d7c92521abd4c7b97
---
 jenkins/jobs/horizon.yaml   | 12 ------------
 jenkins/jobs/projects.yaml  |  4 +++-
 jenkins/jobs/selenium.yaml  | 11 +++++++++++
 jenkins/jobs/tuskar-ui.yaml | 12 ------------
 zuul/layout.yaml            |  2 ++
 5 files changed, 16 insertions(+), 25 deletions(-)
 create mode 100644 jenkins/jobs/selenium.yaml

diff --git a/jenkins/jobs/horizon.yaml b/jenkins/jobs/horizon.yaml
index 8fc7e05ef7..4866f284f5 100644
--- a/jenkins/jobs/horizon.yaml
+++ b/jenkins/jobs/horizon.yaml
@@ -1,15 +1,3 @@
-- job:
-    name: gate-horizon-selenium
-    node: 'bare-precise || bare-trusty'
-
-    builders:
-      - revoke-sudo
-      - gerrit-git-prep
-      - selenium
-
-    publishers:
-      - console-log
-
 - job:
     name: gate-horizon-python27-django14
     node: 'bare-precise || bare-trusty'
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index d362b790cf..1d9c510a4e 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -212,7 +212,7 @@
       - python-icehouse-bitrot-jobs
       - python-juno-bitrot-jobs
       - openstack-publish-jobs
-
+      - gate-{name}-selenium
 
 - project:
     name: ironic
@@ -1543,6 +1543,7 @@
     jobs:
       - python-jobs
       - pypi-jobs
+      - gate-{name}-selenium
 
 ########################################################################
 # Section: OpenStack API projects
@@ -4094,6 +4095,7 @@
     jobs:
       - python-jobs
       - pypi-jobs
+      - gate-{name}-selenium
 
 - project:
     name: vmware-nsx
diff --git a/jenkins/jobs/selenium.yaml b/jenkins/jobs/selenium.yaml
new file mode 100644
index 0000000000..4d50ae2127
--- /dev/null
+++ b/jenkins/jobs/selenium.yaml
@@ -0,0 +1,11 @@
+- job-template:
+    name: 'gate-{name}-selenium'
+    node: 'bare-precise || bare-trusty'
+
+    builders:
+      - revoke-sudo
+      - gerrit-git-prep
+      - selenium
+
+    publishers:
+      - console-log
diff --git a/jenkins/jobs/tuskar-ui.yaml b/jenkins/jobs/tuskar-ui.yaml
index c14c527b49..44b3048362 100644
--- a/jenkins/jobs/tuskar-ui.yaml
+++ b/jenkins/jobs/tuskar-ui.yaml
@@ -1,15 +1,3 @@
-- job:
-    name: gate-tuskar-ui-selenium
-    node: 'bare-precise || bare-trusty'
-
-    builders:
-      - revoke-sudo
-      - gerrit-git-prep
-      - selenium
-
-    publishers:
-      - console-log
-
 - job:
     name: gate-tuskar-ui-jshint
     node: 'bare-precise || bare-trusty'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index c474ce2292..91f3f56dbe 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -5765,9 +5765,11 @@ projects:
     check:
       - gate-tuskar-ui-extras-pep8
       - gate-tuskar-ui-extras-python27
+      - gate-tuskar-ui-extras-selenium
     gate:
       - gate-tuskar-ui-extras-pep8
       - gate-tuskar-ui-extras-python27
+      - gate-tuskar-ui-extras-selenium
     post:
       - tuskar-ui-extras-branch-tarball