Enable QTIP container for docker build and push jjob

[releng.git] / jjb / opnfv / slave-params.yml

diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml
index e36a0b6..576f605 100644 (file)
--- 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,11 @@
         - 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'
+        - string:
+            name: POD_CONF_DIR
+            default: $WORKSPACE/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2
+            description: 'Directory where POD configuration files are located.'
 
 - parameter:
     name: 'ericsson-pod1-defaults'
@@ -57,7 +61,11 @@
         - 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: POD_CONF_DIR
+            default: $WORKSPACE/deploy/templates/hardware_environment/conf/ericsson_montreal_lab/pod1
+            description: 'Directory where POD configuration files are located.'
 
 - parameter:
     name: 'ericsson-pod2-defaults'
@@ -76,7 +84,11 @@
         - 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: POD_CONF_DIR
+            default: $WORKSPACE/deploy/templates/hardware_environment/conf/ericsson_montreal_lab/pod2
+            description: 'Directory where POD configuration files are located.'
 
 - parameter:
     name: 'intelpod2-jumphost-defaults'
@@ -95,7 +107,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 +126,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 +145,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 +164,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 +183,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 +202,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 +219,11 @@
         - 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'
+        - string:
+            name: BUILD_DIRECTORY
+            default: $WORKSPACE/build_output
+            description: "Directory where the build artifact will be located upon the completion of the build."
 
 - parameter:
     name: 'intel-us-build-1-defaults'
@@ -222,7 +238,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 +253,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 +268,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 +283,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 +302,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 +326,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 +364,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