X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fopnfv%2Fpod-params.yml;h=e36a0b684562cb32ee231e718faa5adf3e9a979c;hb=47c4fa36b11a3b65d74c4fc7ea2241d313a77966;hp=fb02e7d5db6b0d20d1c0b6e115e99280011cb0b4;hpb=2a09650c83b5d896820259198492f9e4d108c3f5;p=releng.git

diff --git a/jjb/opnfv/pod-params.yml b/jjb/opnfv/pod-params.yml
index fb02e7d5d..e36a0b684 100644
--- a/jjb/opnfv/pod-params.yml
+++ b/jjb/opnfv/pod-params.yml
@@ -1,5 +1,5 @@
 - parameter:
-    name: 'lf-pod1-defaults'
+    name: 'opnfv-jump-1-defaults'
     parameters:
         - node:
             name: SLAVE_NAME
@@ -22,7 +22,7 @@
             description: 'SSH key to use for Apex'
 
 - parameter:
-    name: 'lf-pod2-defaults'
+    name: 'opnfv-jump-2-defaults'
     parameters:
         - node:
             name: SLAVE_NAME
@@ -38,7 +38,25 @@
         - string:
             name: GIT_BASE
             default: ssh://gerrit.opnfv.org:29418/$PROJECT
-            description: 'Git URL for LF POD2'
+            description: 'Git URL to use on the jumphost'
+
+- parameter:
+    name: 'ericsson-pod1-defaults'
+    parameters:
+        - node:
+            name: SLAVE_NAME
+            description: 'Slave name on Jenkins'
+            allowed-slaves:
+                - ericsson-pod1
+            default-slaves:
+                - ericsson-pod1
+        - string:
+            name: INSTALLER_VERSION
+            default: latest
+            description: 'Version of the installer to deploy'
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on the jumphost'
 
 - parameter:
@@ -48,9 +66,9 @@
             name: SLAVE_NAME
             description: 'Slave name on Jenkins'
             allowed-slaves:
-                - ericsson-ca-fuel-bare-1
+                - ericsson-pod2
             default-slaves:
-                - ericsson-ca-fuel-bare-1
+                - ericsson-pod2
         - string:
             name: INSTALLER_VERSION
             default: latest
@@ -61,7 +79,7 @@
             description: 'Git URL to use on the jumphost'
 
 - parameter:
-    name: 'intel-pod2-defaults'
+    name: 'intelpod2-jumphost-defaults'
     parameters:
         - node:
             name: SLAVE_NAME
@@ -83,6 +101,21 @@
             default: /root/.ssh/id_rsa
             description: 'SSH key to use for Apex'
 
+- parameter:
+    name: 'intel-pod3-defaults'
+    parameters:
+        - node:
+            name: SLAVE_NAME
+            description: 'Slave name on Jenkins'
+            allowed-slaves:
+                - intel-pod3
+            default-slaves:
+                - intel-pod3
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: 'Git URL to use on the jumphost'
+
 - parameter:
     name: 'intel-pod5-defaults'
     parameters:
@@ -90,9 +123,9 @@
             name: SLAVE_NAME
             description: 'Slave name on Jenkins'
             allowed-slaves:
-                - intelpod5-jumphost
+                - intel-pod5
             default-slaves:
-                - intelpod5-jumphost
+                - intel-pod5
         - string:
             name: INSTALLER_VERSION
             default: stable
@@ -109,9 +142,9 @@
             name: SLAVE_NAME
             description: 'Slave name on Jenkins'
             allowed-slaves:
-                - intelpod6-jumphost
+                - intel-pod6
             default-slaves:
-                - intelpod6-jumphost
+                - intel-pod6
         - string:
             name: INSTALLER_VERSION
             default: latest
@@ -128,9 +161,9 @@
             name: SLAVE_NAME
             description: 'Slave name on Jenkins'
             allowed-slaves:
-                - intelpod8-jumphost
+                - intel-pod8
             default-slaves:
-                - intelpod8-jumphost
+                - intel-pod8
         - string:
             name: INSTALLER_VERSION
             default: latest
@@ -141,7 +174,7 @@
             description: 'Git URL to use on the jumphost'
 
 - parameter:
-    name: 'huawei-sc-pod1-defaults'
+    name: 'huawei-us-deploy-bare-1-defaults'
     parameters:
         - node:
             name: SLAVE_NAME
@@ -158,3 +191,165 @@
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on the jumphost'
+
+- parameter:
+    name: 'opnfv-build-defaults'
+    parameters:
+        - node:
+            name: SLAVE_NAME
+            description: 'Slave name on Jenkins'
+            allowed-slaves:
+                - intel-us-build-1
+                - ericsson-ca-build-1
+            default-slaves:
+                - intel-us-build-1
+                - ericsson-ca-build-1
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: 'Git URL to use on the slave'
+
+- parameter:
+    name: 'intel-us-build-1-defaults'
+    parameters:
+        - node:
+            name: SLAVE_NAME
+            description: 'Slave name on Jenkins'
+            allowed-slaves:
+                - intel-us-build-1
+            default-slaves:
+                - intel-us-build-1
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: 'Git URL to use on the slave'
+
+- parameter:
+    name: 'intel-us-build-2-defaults'
+    parameters:
+        - node:
+            name: SLAVE_NAME
+            description: 'Slave name on Jenkins'
+            allowed-slaves:
+                - intel-us-build-2
+            default-slaves:
+                - intel-us-build-2
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: 'Git URL to use on the slave'
+
+- parameter:
+    name: 'ericsson-ca-build-1-defaults'
+    parameters:
+        - node:
+            name: SLAVE_NAME
+            description: 'Slave name on Jenkins'
+            allowed-slaves:
+                - ericsson-ca-build-1
+            default-slaves:
+                - ericsson-ca-build-1
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: 'Git URL to use on the slave'
+
+- parameter:
+    name: 'zte-build-1'
+    parameters:
+        - node:
+            name: SLAVE_NAME
+            description: 'Slave name on Jenkins'
+            allowed-slaves:
+                - zte-build-1
+            default-slaves:
+                - zte-build-1
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: 'Git URL to use on the slave'
+
+- parameter:
+    name: 'orange-pod2-defaults'
+    parameters:
+        - node:
+            name: SLAVE_NAME
+            description: 'Slave name on Jenkins'
+            allowed-slaves:
+                - orange-fr-pod2
+            default-slaves:
+                - orange-fr-pod2
+        - string:
+            name: INSTALLER_VERSION
+            default: latest
+            description: 'Version of the installer to deploy'
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: 'Git URL to use on the jumphost'
+        - string:
+            name: LAB_CONFIG
+            default: "/home/opnfv/repos/functest"
+            description: "Openstack credentials on the dev lab"
+
+
+- parameter:
+    name: 'orange-test1-defaults'
+    parameters:
+        - node:
+            name: SLAVE_NAME
+            description: 'Slave name on Jenkins'
+            allowed-slaves:
+                - orange-test1
+            default-slaves:
+                - orange-test1
+        - string:
+            name: INSTALLER_VERSION
+            default: latest
+            description: 'Version of the installer to deploy'
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: 'Git URL to use on the jumphost'
+
+- parameter:
+    name: 'intel-us-deploy-virtual-1-defaults'
+    parameters:
+        - node:
+            name: SLAVE_NAME
+            description: 'Slave name on Jenkins'
+            allowed-slaves:
+                - intel-us-deploy-virtual-1
+            default-slaves:
+                - intel-us-deploy-virtual-1
+        - string:
+            name: INSTALLER_VERSION
+            default: latest
+            description: 'Version of the installer to deploy'
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: 'Git URL to use on the jumphost'
+
+- parameter:
+    name: 'intel-us-deploy-virtual-2-defaults'
+    parameters:
+        - node:
+            name: SLAVE_NAME
+            description: 'Slave name on Jenkins'
+            allowed-slaves:
+                - intel-us-deploy-virtual-2
+            default-slaves:
+                - intel-us-deploy-virtual-2
+        - string:
+            name: INSTALLER_VERSION
+            default: latest
+            description: 'Version of the installer to deploy'
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: 'Git URL to use on the jumphost'
+        - string:
+            name: SSH_KEY
+            default: /root/.ssh/id_rsa
+            description: 'SSH key to use for Apex'