Cleanup slave parameters

This is the first step towards having alignment of the job structure, applying
commit gating and use of labels for all installer jobs.

Apart from the above, it also
- puts all CI baremetal and virtual PODs together
- gets rid of use of slaves directly for CI baremetal and virtual PODs
- switches labels for all CI baremetal and virtual PODs using below labels
    {installer}-baremetal
    {installer}-virtual
- puts all CI build slaves together and switches to labels - except huawei-build
- puts all none-CI PODs together

Please note that this change does not impact the overall job structure.

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

diff --git a/jjb/armband/armband-project-jobs.yml b/jjb/armband/armband-project-jobs.yml
index 732a9ea..764a5d4 100644 (file)
--- a/jjb/armband/armband-project-jobs.yml
+++ b/jjb/armband/armband-project-jobs.yml
@@ -76,7 +76,7 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - 'arm-build1-defaults'
+        - 'opnfv-build-arm-defaults'
         - armband-project-parameter:
             gs-pathname: '{gs-pathname}'
 

diff --git a/jjb/bottlenecks/bottlenecks-project-jobs.yml b/jjb/bottlenecks/bottlenecks-project-jobs.yml
index ea000d8..28b49bc 100644 (file)
--- a/jjb/bottlenecks/bottlenecks-project-jobs.yml
+++ b/jjb/bottlenecks/bottlenecks-project-jobs.yml
@@ -119,7 +119,7 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - 'ericsson-build-defaults'
+        - 'opnfv-build-ubuntu-defaults'
         - bottlenecks-parameter:
             gs-packagepath: '{gs-packagepath}'
 

diff --git a/jjb/compass4nfv/compass-project-jobs.yml b/jjb/compass4nfv/compass-project-jobs.yml
index da28687..6e10e2f 100644 (file)
--- a/jjb/compass4nfv/compass-project-jobs.yml
+++ b/jjb/compass4nfv/compass-project-jobs.yml
@@ -160,7 +160,7 @@
         - compass-project-parameter:
             installer: '{installer}'
             gs-pathname: '{gs-pathname}'
-        - 'ericsson-build-defaults'
+        - 'opnfv-build-ubuntu-defaults'
         - '{installer}-defaults'
 
     scm:

diff --git a/jjb/fuel/fuel-project-jobs.yml b/jjb/fuel/fuel-project-jobs.yml
index 67343fb..9fc7ab2 100644 (file)
--- a/jjb/fuel/fuel-project-jobs.yml
+++ b/jjb/fuel/fuel-project-jobs.yml
@@ -43,7 +43,7 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - 'ericsson-build-defaults'
+        - 'opnfv-build-ubuntu-defaults'
         - '{installer}-defaults'
         - choice:
             name: FORCE_BUILD
@@ -92,7 +92,7 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
-        - 'ericsson-build-defaults'
+        - 'opnfv-build-ubuntu-defaults'
         - '{installer}-defaults'
         - fuel-project-parameter:
             gs-pathname: '{gs-pathname}'
@@ -159,7 +159,7 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
-        - 'ericsson-build-defaults'
+        - 'opnfv-build-ubuntu-defaults'
         - '{installer}-defaults'
         - fuel-project-parameter:
             gs-pathname: '{gs-pathname}'

diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml
index f9cf011..727419d 100644 (file)
--- a/jjb/functest/functest-ci-jobs.yml
+++ b/jjb/functest/functest-ci-jobs.yml
@@ -45,13 +45,6 @@
             slave-label: fuel-virtual
             installer: fuel
             <<: *brahmaputra
-
-# just in case if things go wrong
-        - lf-pod2:
-            slave-label: fuel-baremetal
-            installer: fuel
-            <<: *master
-
 # joid CI PODs
         - baremetal:
             slave-label: joid-baremetal

diff --git a/jjb/kvmfornfv/kvmfornfv.yml b/jjb/kvmfornfv/kvmfornfv.yml
index b042c56..aa8b645 100644 (file)
--- a/jjb/kvmfornfv/kvmfornfv.yml
+++ b/jjb/kvmfornfv/kvmfornfv.yml
@@ -23,7 +23,7 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
-        - 'ericsson-build-defaults'
+        - 'opnfv-build-ubuntu-defaults'
 
     scm:
         - gerrit-trigger-scm:
@@ -62,7 +62,7 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
-        - 'ericsson-build-defaults'
+        - 'opnfv-build-ubuntu-defaults'
 
     scm:
         - gerrit-trigger-scm:

diff --git a/jjb/opnfv/opnfv-docker.yml b/jjb/opnfv/opnfv-docker.yml
index 6b49242..6b4861c 100644 (file)
--- a/jjb/opnfv/opnfv-docker.yml
+++ b/jjb/opnfv/opnfv-docker.yml
@@ -34,7 +34,7 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - 'ericsson-build-defaults'
+        - 'opnfv-build-ubuntu-defaults'
         - string:
             name: PUSH_IMAGE
             default: "true"
@@ -77,7 +77,7 @@
     parameters:
         - project-parameter:
             project: 'yardstick'
-        - 'ericsson-build-defaults'
+        - 'opnfv-build-ubuntu-defaults'
         - string:
             name: PUSH_IMAGE
             default: "true"

diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml
index c4dc31d..b7ecfde 100644 (file)
--- a/jjb/opnfv/slave-params.yml
+++ b/jjb/opnfv/slave-params.yml
@@ -1,13 +1,14 @@
+#####################################################
+# Parameters for slaves using old labels
+# This will be cleaned up once the new job structure and
+# use of the new labels are in place
+#####################################################
 - parameter:
     name: 'apex-daily-master-defaults'
     parameters:
         - label:
             name: SLAVE_LABEL
             default: 'apex-daily-master'
-        - string:
-            name: INSTALLER_VERSION
-            default: latest
-            description: 'Version of the installer to deploy'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -23,9 +24,23 @@
             name: SLAVE_LABEL
             default: 'apex-verify-master'
         - string:
-            name: INSTALLER_VERSION
-            default: latest
-            description: 'Version of the installer to deploy'
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: 'Git URL to use on this Jenkins Slave'
+        - string:
+            name: SSH_KEY
+            default: /root/.ssh/id_rsa
+            description: 'SSH key to use for Apex'
+- parameter:
+    name: 'lf-pod1-defaults'
+    parameters:
+        - node:
+            name: SLAVE_NAME
+            description: 'Slave name on Jenkins'
+            allowed-slaves:
+                - lf-pod1
+            default-slaves:
+                - lf-pod1
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -34,22 +49,39 @@
             name: SSH_KEY
             default: /root/.ssh/id_rsa
             description: 'SSH key to use for Apex'
+#####################################################
+# Parameters for CI baremetal PODs
+#####################################################
 - parameter:
-    name: 'fuel-baremetal-defaults'
+    name: 'apex-baremetal-defaults'
     parameters:
         - label:
             name: SLAVE_LABEL
-            default: 'fuel-baremetal'
+            default: 'apex-baremetal'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
+        - string:
+            name: SSH_KEY
+            default: /root/.ssh/id_rsa
+            description: 'SSH key to use for Apex'
 - parameter:
-    name: 'fuel-virtual-defaults'
+    name: 'compass-baremetal-defaults'
     parameters:
         - label:
             name: SLAVE_LABEL
-            default: 'fuel-virtual'
+            default: 'compass-baremetal'
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: 'Git URL to use on this Jenkins Slave'
+- parameter:
+    name: 'fuel-baremetal-defaults'
+    parameters:
+        - label:
+            name: SLAVE_LABEL
+            default: 'fuel-baremetal'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -72,26 +104,23 @@
             name: EXTERNAL_NETWORK
             default: ext-net;flat;10.5.15.5;10.5.15.250;10.5.15.254;10.5.15.0/24
             description: "External network to create for pod5 (name;type;first ip;last ip; gateway;network)"
+#####################################################
+# Parameters for CI virtual PODs
+#####################################################
 - parameter:
-    name: 'joid-virtual-defaults'
+    name: 'apex-virtual-defaults'
     parameters:
         - label:
             name: SLAVE_LABEL
-            default: 'joid-virtual'
+            default: 'apex-virtual'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
-- parameter:
-    name: 'compass-baremetal-defaults'
-    parameters:
-        - label:
-            name: SLAVE_LABEL
-            default: 'compass-baremetal'
         - string:
-            name: GIT_BASE
-            default: https://gerrit.opnfv.org/gerrit/$PROJECT
-            description: 'Git URL to use on this Jenkins Slave'
+            name: SSH_KEY
+            default: /root/.ssh/id_rsa
+            description: 'SSH key to use for Apex'
 - parameter:
     name: 'compass-virtual-defaults'
     parameters:
@@ -103,176 +132,112 @@
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
 - parameter:
-    name: 'lf-pod1-defaults'
+    name: 'fuel-virtual-defaults'
     parameters:
-        - node:
-            name: SLAVE_NAME
-            description: 'Slave name on Jenkins'
-            allowed-slaves:
-                - lf-pod1
-            default-slaves:
-                - lf-pod1
-        - string:
-            name: INSTALLER_VERSION
-            default: latest
-            description: 'Version of the installer to deploy'
+        - label:
+            name: SLAVE_LABEL
+            default: 'fuel-virtual'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
-        - string:
-            name: SSH_KEY
-            default: /root/.ssh/id_rsa
-            description: 'SSH key to use for Apex'
-- parameter:
-    name: 'lf-pod2-defaults'
-    parameters:
-        - node:
-            name: SLAVE_NAME
-            description: 'Slave name on Jenkins'
-            allowed-slaves:
-                - lf-pod2
-            default-slaves:
-                - lf-pod2
-        - string:
-            name: GIT_BASE
-            default: ssh://gerrit.opnfv.org:29418/$PROJECT
-            description: 'Git URL to use on this Jenkins Slave'
 - parameter:
-    name: 'ericsson-pod1-defaults'
+    name: 'joid-virtual-defaults'
     parameters:
-        - node:
-            name: SLAVE_NAME
-            description: 'Slave name on Jenkins'
-            allowed-slaves:
-                - ericsson-pod1
-            default-slaves:
-                - ericsson-pod1
+        - label:
+            name: SLAVE_LABEL
+            default: 'joid-virtual'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
+#####################################################
+# Parameters for build slaves
+#####################################################
 - parameter:
-    name: 'ericsson-pod2-defaults'
+    name: 'opnfv-build-arm-defaults'
     parameters:
-        - node:
-            name: SLAVE_NAME
-            description: 'Slave name on Jenkins'
-            allowed-slaves:
-                - ericsson-pod2
-            default-slaves:
-                - ericsson-pod2
+        - label:
+            name: SLAVE_LABEL
+            default: 'opnfv-build-arm'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             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-pod2-defaults'
+    name: 'opnfv-build-centos-defaults'
     parameters:
-        - node:
-            name: SLAVE_NAME
-            description: 'Slave name on Jenkins'
-            allowed-slaves:
-                - intel-pod2
-            default-slaves:
-                - intel-pod2
-        - string:
-            name: INSTALLER_VERSION
-            default: stable
-            description: 'Version of the installer to deploy'
+        - label:
+            name: SLAVE_LABEL
+            default: 'opnfv-build-centos'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
         - string:
-            name: SSH_KEY
-            default: /root/.ssh/id_rsa
-            description: 'SSH key to use for Apex'
-
+            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-pod3-defaults'
+    name: 'opnfv-build-ubuntu-defaults'
     parameters:
-        - node:
-            name: SLAVE_NAME
-            description: 'Slave name on Jenkins'
-            allowed-slaves:
-                - intel-pod3
-            default-slaves:
-                - intel-pod3
+        - label:
+            name: SLAVE_LABEL
+            default: 'opnfv-build-ubuntu'
+            description: 'Slave label on Jenkins'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             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-pod5-defaults'
+    name: 'huawei-build-defaults'
     parameters:
         - node:
             name: SLAVE_NAME
             description: 'Slave name on Jenkins'
             allowed-slaves:
-                - intel-pod5
+                - huawei-build
             default-slaves:
-                - intel-pod5
-        - string:
-            name: INSTALLER_VERSION
-            default: stable
-            description: 'Version of the installer to deploy'
+                - huawei-build
         - 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)"
-        - string:
-            name: EXTERNAL_NETWORK
-            default: ext-net;flat;10.5.15.5;10.5.15.250;10.5.15.254;10.5.15.0/24
-            description: "External network to create for pod5 (name;type;first ip;last ip; gateway;network)"
-
+#####################################################
+# Parameters for none-CI PODs
+#####################################################
 - parameter:
-    name: 'intel-pod6-defaults'
+    name: 'ericsson-pod1-defaults'
     parameters:
         - node:
             name: SLAVE_NAME
             description: 'Slave name on Jenkins'
             allowed-slaves:
-                - intel-pod6
+                - ericsson-pod1
             default-slaves:
-                - intel-pod6
-        - string:
-            name: INSTALLER_VERSION
-            default: latest
-            description: 'Version of the installer to deploy'
+                - ericsson-pod1
         - 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)"
-        - string:
-            name: EXTERNAL_NETWORK
-            default: ext-net;flat;10.6.15.5;10.6.15.250;10.6.15.254;10.6.15.0/24
-            description: "External network to create for pod6 (name;type;first ip;last ip; gateway;network)"
-
 - parameter:
-    name: 'intel-pod7-defaults'
+    name: 'intel-pod2-defaults'
     parameters:
         - node:
             name: SLAVE_NAME
             description: 'Slave name on Jenkins'
             allowed-slaves:
-                - intel-pod7
+                - intel-pod2
             default-slaves:
-                - intel-pod7
-        - string:
-            name: INSTALLER_VERSION
-            default: latest
-            description: 'Version of the installer to deploy'
+                - intel-pod2
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -281,64 +246,20 @@
             name: SSH_KEY
             default: /root/.ssh/id_rsa
             description: 'SSH key to use for Apex'
-
 - parameter:
-    name: 'intel-pod8-defaults'
-    parameters:
-        - node:
-            name: SLAVE_NAME
-            description: 'Slave name on Jenkins'
-            allowed-slaves:
-                - intel-pod8
-            default-slaves:
-                - intel-pod8
-        - 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'
-
-- parameter:
-    name: 'huawei-build-defaults'
-    parameters:
-        - node:
-            name: SLAVE_NAME
-            description: 'Slave name on Jenkins'
-            allowed-slaves:
-                - huawei-build
-            default-slaves:
-                - huawei-build
-        - 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-pod1-defaults'
+    name: 'intel-pod3-defaults'
     parameters:
         - node:
             name: SLAVE_NAME
             description: 'Slave name on Jenkins'
             allowed-slaves:
-                - huawei-pod1
+                - intel-pod3
             default-slaves:
-                - huawei-pod1
-        - string:
-            name: INSTALLER_VERSION
-            default: stable
-            description: 'Version of the installer to deploy'
+                - intel-pod3
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
-
 - parameter:
     name: 'huawei-pod2-defaults'
     parameters:
@@ -349,15 +270,10 @@
                 - huawei-pod2
             default-slaves:
                 - huawei-pod2
-        - 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-pod3-defaults'
     parameters:
@@ -371,15 +287,10 @@
         - label:
             name: SLAVE_LABEL
             default: 'huawei-test'
-        - 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-pod4-defaults'
     parameters:
@@ -393,10 +304,6 @@
         - label:
             name: SLAVE_LABEL
             default: 'huawei-test'
-        - string:
-            name: INSTALLER_VERSION
-            default: stable
-            description: 'Version of the installer to deploy'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -415,7 +322,6 @@
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
-
 - parameter:
     name: 'juniper-pod1-defaults'
     parameters:
@@ -426,10 +332,6 @@
                 - juniper-pod1
             default-slaves:
                 - juniper-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
@@ -438,7 +340,6 @@
             name: CEPH_DISKS
             default: /srv
             description: "Disks to use by ceph (comma separated list)"
-
 - parameter:
     name: 'orange-pod2-defaults'
     parameters:
@@ -449,10 +350,6 @@
                 - orange-pod2
             default-slaves:
                 - orange-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
@@ -465,7 +362,6 @@
             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-pod5-defaults'
     parameters:
@@ -476,49 +372,10 @@
                 - orange-pod5
             default-slaves:
                 - orange-pod5
-        - 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'
-
-- parameter:
-    name: 'ericsson-build-defaults'
-    parameters:
-        - label:
-            name: SLAVE_LABEL
-            default: 'ericsson-build'
-        - string:
-            name: GIT_BASE
-            default: https://gerrit.opnfv.org/gerrit/$PROJECT
-            description: 'Git URL to use on these Jenkins Slaves'
-
-- parameter:
-    name: 'intel-virtual2-defaults'
-    parameters:
-        - node:
-            name: SLAVE_NAME
-            description: 'Slave name on Jenkins'
-            allowed-slaves:
-                - intel-virtual2
-            default-slaves:
-                - intel-virtual2
-        - 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: SSH_KEY
-            default: /root/.ssh/id_rsa
-            description: 'SSH key to use for Apex'
-
 - parameter:
     name: 'dell-pod1-defaults'
     parameters:
@@ -529,15 +386,10 @@
                 - dell-pod1
             default-slaves:
                 - dell-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 this Jenkins Slave'
-
 - parameter:
     name: 'dell-pod2-defaults'
     parameters:
@@ -548,15 +400,10 @@
                 - dell-pod2
             default-slaves:
                 - dell-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 this Jenkins Slave'
-
 - parameter:
     name: 'nokia-pod1-defaults'
     parameters:
@@ -567,10 +414,6 @@
                 - nokia-pod1
             default-slaves:
                 - nokia-pod1
-        - string:
-            name: INSTALLER_VERSION
-            default: stable
-            description: 'Version of the installer to deploy'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -579,22 +422,6 @@
             name: SSH_KEY
             default: /root/.ssh/id_rsa
             description: 'SSH key to use for Apex'
-
-- parameter:
-    name: 'arm-build1-defaults'
-    parameters:
-        - node:
-            name: SLAVE_NAME
-            description: 'Slave name on Jenkins'
-            allowed-slaves:
-                - arm-build1
-            default-slaves:
-                - arm-build1
-        - string:
-            name: GIT_BASE
-            default: https://gerrit.opnfv.org/gerrit/$PROJECT
-            description: 'Git URL to use on this Jenkins Slave'
-
 - parameter:
     name: 'arm-pod1-defaults'
     parameters:
@@ -621,7 +448,6 @@
             name: LAB_CONFIG_URL
             default: ssh://git@git.enea.com/pharos/lab-config
             description: 'Base URI to the configuration directory'
-
 - parameter:
     name: 'arm-pod2-defaults'
     parameters:
@@ -648,36 +474,6 @@
             name: LAB_CONFIG_URL
             default: ssh://git@git.enea.com/pharos/lab-config
             description: 'Base URI to the configuration directory'
-
-- parameter:
-    name: 'opnfv-build-centos-defaults'
-    parameters:
-        - label:
-            name: SLAVE_LABEL
-            default: 'opnfv-build-centos'
-        - string:
-            name: GIT_BASE
-            default: https://gerrit.opnfv.org/gerrit/$PROJECT
-            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: 'opnfv-build-ubuntu-defaults'
-    parameters:
-        - label:
-            name: SLAVE_LABEL
-            default: 'opnfv-build-ubuntu'
-            description: 'Slave label on Jenkins'
-        - string:
-            name: GIT_BASE
-            default: https://gerrit.opnfv.org/gerrit/$PROJECT
-            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."
 #####################################################
 # These slaves are just dummy slaves for sandbox jobs
 #####################################################

diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml
index 8b8ced1..21a6b80 100644 (file)
--- a/jjb/yardstick/yardstick-ci-jobs.yml
+++ b/jjb/yardstick/yardstick-ci-jobs.yml
@@ -49,14 +49,6 @@
             installer: fuel
             auto-trigger-name: 'daily-trigger-disabled'
             <<: *brahmaputra
-
-# just in case if things go wrong
-        - lf-pod2:
-            slave-label: '{pod}'
-            installer: fuel
-            auto-trigger-name: 'daily-trigger-disabled'
-            <<: *master
-
 # joid CI PODs
         - baremetal:
             slave-label: joid-baremetal

diff --git a/jjb/yardstick/yardstick-project-jobs.yml b/jjb/yardstick/yardstick-project-jobs.yml
index c6f3173..5973fce 100644 (file)
--- a/jjb/yardstick/yardstick-project-jobs.yml
+++ b/jjb/yardstick/yardstick-project-jobs.yml
@@ -31,7 +31,7 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
-        - 'ericsson-build-defaults'
+        - 'opnfv-build-ubuntu-defaults'
 
     scm:
         - gerrit-trigger-scm:
@@ -70,7 +70,7 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
-        - 'ericsson-build-defaults'
+        - 'opnfv-build-ubuntu-defaults'
         - string:
             name: GS_URL
             default: '$GS_BASE{gs-pathname}'