Refactor fuel JJB to prepare for Milestone E

Replace default stream definitions with stream anchors in order
to be able to specify which job on which POD runs against which
branch.

Move project specific verify job to its own file to ease the stream
handling.

Enable CI on Ericsson POD2.

Change-Id: I3732b43d8858473535ef5666882ee85124c6d652
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>

1 files changed, 24 insertions, 24 deletions

diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml
index e36a0b684..aaefd337d 100644
--- a/jjb/opnfv/slave-params.yml
+++ b/jjb/opnfv/slave-params.yml
@@ -15,7 +15,7 @@
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
-            description: 'Git URL to use on the jumphost'
+            description: 'Git URL to use on this Jenkins Slave'
         - string:
             name: SSH_KEY
             default: /root/.ssh/id_rsa
@@ -38,7 +38,7 @@
         - string:
             name: GIT_BASE
             default: ssh://gerrit.opnfv.org:29418/$PROJECT
-            description: 'Git URL to use on the jumphost'
+            description: 'Git URL to use on this Jenkins Slave'
 
 - parameter:
     name: 'ericsson-pod1-defaults'
@@ -57,7 +57,7 @@
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
-            description: 'Git URL to use on the jumphost'
+            description: 'Git URL to use on this Jenkins Slave'
 
 - parameter:
     name: 'ericsson-pod2-defaults'
@@ -76,7 +76,7 @@
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
-            description: 'Git URL to use on the jumphost'
+            description: 'Git URL to use on this Jenkins Slave'
 
 - parameter:
     name: 'intelpod2-jumphost-defaults'
@@ -95,7 +95,7 @@
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
-            description: 'Git URL to use on the jumphost'
+            description: 'Git URL to use on this Jenkins Slave'
         - string:
             name: SSH_KEY
             default: /root/.ssh/id_rsa
@@ -114,7 +114,7 @@
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
-            description: 'Git URL to use on the jumphost'
+            description: 'Git URL to use on this Jenkins Slave'
 
 - parameter:
     name: 'intel-pod5-defaults'
@@ -133,7 +133,7 @@
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
-            description: 'Git URL to use on the jumphost'
+            description: 'Git URL to use on this Jenkins Slave'
 
 - parameter:
     name: 'intel-pod6-defaults'
@@ -152,7 +152,7 @@
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
-            description: 'Git URL to use on the jumphost'
+            description: 'Git URL to use on this Jenkins Slave'
 
 - parameter:
     name: 'intel-pod8-defaults'
@@ -171,7 +171,7 @@
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
-            description: 'Git URL to use on the jumphost'
+            description: 'Git URL to use on this Jenkins Slave'
 
 - parameter:
     name: 'huawei-us-deploy-bare-1-defaults'
@@ -190,7 +190,7 @@
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
-            description: 'Git URL to use on the jumphost'
+            description: 'Git URL to use on this Jenkins Slave'
 
 - parameter:
     name: 'opnfv-build-defaults'
@@ -207,7 +207,7 @@
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
-            description: 'Git URL to use on the slave'
+            description: 'Git URL to use on this Jenkins Slave'
 
 - parameter:
     name: 'intel-us-build-1-defaults'
@@ -222,7 +222,7 @@
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
-            description: 'Git URL to use on the slave'
+            description: 'Git URL to use on this Jenkins Slave'
 
 - parameter:
     name: 'intel-us-build-2-defaults'
@@ -237,7 +237,7 @@
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
-            description: 'Git URL to use on the slave'
+            description: 'Git URL to use on this Jenkins Slave'
 
 - parameter:
     name: 'ericsson-ca-build-1-defaults'
@@ -252,7 +252,7 @@
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
-            description: 'Git URL to use on the slave'
+            description: 'Git URL to use on this Jenkins Slave'
 
 - parameter:
     name: 'zte-build-1'
@@ -267,7 +267,7 @@
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
-            description: 'Git URL to use on the slave'
+            description: 'Git URL to use on this Jenkins Slave'
 
 - parameter:
     name: 'orange-pod2-defaults'
@@ -286,7 +286,7 @@
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
-            description: 'Git URL to use on the jumphost'
+            description: 'Git URL to use on this Jenkins Slave'
         - string:
             name: LAB_CONFIG
             default: "/home/opnfv/repos/functest"
@@ -310,26 +310,26 @@
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
-            description: 'Git URL to use on the jumphost'
+            description: 'Git URL to use on this Jenkins Slave'
 
 - parameter:
-    name: 'intel-us-deploy-virtual-1-defaults'
+    name: 'fuel-deploy-virtual-defaults'
     parameters:
         - node:
             name: SLAVE_NAME
             description: 'Slave name on Jenkins'
             allowed-slaves:
                 - intel-us-deploy-virtual-1
+# ericsson slave has been excluded until the issues are identified and solved
+#                - ericsson-ca-deploy-virtual-1
             default-slaves:
                 - intel-us-deploy-virtual-1
-        - string:
-            name: INSTALLER_VERSION
-            default: latest
-            description: 'Version of the installer to deploy'
+# ericsson slave has been excluded until the issues are identified and solved
+#                - ericsson-ca-deploy-virtual-1
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
-            description: 'Git URL to use on the jumphost'
+            description: 'Git URL to use on this Jenkins Slave'
 
 - parameter:
     name: 'intel-us-deploy-virtual-2-defaults'
@@ -348,7 +348,7 @@
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
-            description: 'Git URL to use on the jumphost'
+            description: 'Git URL to use on this Jenkins Slave'
         - string:
             name: SSH_KEY
             default: /root/.ssh/id_rsa