Code Review / releng.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
New external network for ericsson-pod2
[releng.git] / jjb / opnfv / slave-params.yml
diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml
index 002ab7e..b2c6e7c 100644 (file)
--- a/jjb/opnfv/slave-params.yml
+++ b/jjb/opnfv/slave-params.yml
@@ -39,10 +39,6 @@
             name: GIT_BASE
             default: ssh://gerrit.opnfv.org:29418/$PROJECT
             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'
@@ -86,9 +82,9 @@
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             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.'
+            name: EXTERNAL_NETWORK
+            default: 'admin_floating_net'
+            description: 'external network'
 
 - parameter:
     name: 'intelpod2-jumphost-defaults'
@@ -146,6 +142,14 @@
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
+        - string:
+            name: CEPH_DISKS
+            default: /srv
+            description: "Disks to use by ceph (comma separated list)"
+        - string:
+            name: EXTERNAL_NETWORK
+            default: ext-net;flat;10.2.65.5;10.2.65.250;10.2.65.1;10.2.65.0/24
+            description: "External network to create for pod5 (name;type;first ip;last ip; gateway;network)"
 
 - parameter:
     name: 'intel-pod6-defaults'
@@ -165,6 +169,14 @@
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
+        - string:
+            name: CEPH_DISKS
+            default: /srv
+            description: "Disks to use by ceph (comma separated list)"
+        - string:
+            name: EXTERNAL_NETWORK
+            default: ext-net;flat;10.2.66.5;10.2.66.250;10.2.66.1;10.2.66.0/24
+            description: "External network to create for pod6 (name;type;first ip;last ip; gateway;network)"
 
 - parameter:
     name: 'intel-pod8-defaults'
@@ -186,15 +198,15 @@
             description: 'Git URL to use on this Jenkins Slave'
 
 - parameter:
-    name: 'huawei-us-deploy-bare-1-defaults'
+    name: 'huawei-build-defaults'
     parameters:
         - node:
             name: SLAVE_NAME
             description: 'Slave name on Jenkins'
             allowed-slaves:
-                - huawei-us-deploy-bare-1
+                - huawei-build
             default-slaves:
-                - huawei-us-deploy-bare-1
+                - huawei-build
         - string:
             name: INSTALLER_VERSION
             default: stable
@@ -205,17 +217,46 @@
             description: 'Git URL to use on this Jenkins Slave'
 
 - parameter:
-    name: 'opnfv-build-defaults'
+    name: 'huawei-us-deploy-bare-1-defaults'
     parameters:
         - node:
             name: SLAVE_NAME
             description: 'Slave name on Jenkins'
             allowed-slaves:
-                - intel-us-build-1
-                - ericsson-ca-build-1
+                - huawei-us-deploy-bare-1
             default-slaves:
-                - intel-us-build-1
-                - ericsson-ca-build-1
+                - huawei-us-deploy-bare-1
+        - string:
+            name: INSTALLER_VERSION
+            default: stable
+            description: 'Version of the installer to deploy'
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: 'Git URL to use on this Jenkins Slave'
+
+- parameter:
+    name: 'huawei-virtual-defaults'
+    parameters:
+        - label:
+            name: SLAVE_LABEL
+            default: 'huawei-deploy-vm'
+        - string:
+            name: INSTALLER_VERSION
+            default: stable
+            description: 'Version of the installer to deploy'
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: 'Git URL to use on this Jenkins Slave'
+
+- parameter:
+    name: 'opnfv-build-defaults'
+    parameters:
+        - label:
+            name: SLAVE_LABEL
+            default: 'opnfv-build'
+            description: 'Slave label on Jenkins'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -256,34 +297,42 @@
             description: 'Git URL to use on this Jenkins Slave'
 
 - parameter:
-    name: 'ericsson-ca-build-1-defaults'
+    name: 'zte-build-1-defaults'
     parameters:
         - node:
             name: SLAVE_NAME
             description: 'Slave name on Jenkins'
             allowed-slaves:
-                - ericsson-ca-build-1
+                - zte-build-1
             default-slaves:
-                - ericsson-ca-build-1
+                - zte-build-1
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
 
 - parameter:
-    name: 'zte-build-1'
+    name: 'juniper-pod1-defaults'
     parameters:
         - node:
             name: SLAVE_NAME
             description: 'Slave name on Jenkins'
             allowed-slaves:
-                - zte-build-1
+                - juniper-us-test-1
             default-slaves:
-                - zte-build-1
+                - juniper-us-test-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 this Jenkins Slave'
+        - string:
+            name: CEPH_DISKS
+            default: /srv
+            description: "Disks to use by ceph (comma separated list)"
 
 - parameter:
     name: 'orange-pod2-defaults'
@@ -304,10 +353,13 @@
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
         - string:
-            name: LAB_CONFIG
-            default: "/home/opnfv/repos/functest"
-            description: "Openstack credentials on the dev lab"
-
+            name: CEPH_DISKS
+            default: /dev/sdb /dev/sdc
+            description: "Disks to use by ceph by default (space separated list)"
+        - string:
+            name: EXTERNAL_NETWORK
+            default: ext-net;flat;161.105.231.2;161.105.231.62;161.105.231.1;161.105.231.0/26
+            description: "External network to create (name;type;first ip;last ip; gateway;network)"
 
 - parameter:
     name: 'orange-test1-defaults'
@@ -329,11 +381,22 @@
             description: 'Git URL to use on this Jenkins Slave'
 
 - parameter:
-    name: 'fuel-deploy-virtual-defaults'
+    name: 'virtual-defaults'
+    parameters:
+        - label:
+            name: SLAVE_LABEL
+            default: '{installer}-deploy-virtual'
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: 'Git URL to use on these Jenkins Slaves'
+
+- parameter:
+    name: 'ericsson-build-defaults'
     parameters:
         - label:
             name: SLAVE_LABEL
-            default: 'fuel-deploy-virtual'
+            default: 'ericsson-build'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT