Revert "Remove GIT_BASE parameter from slave parameters"

This reverts commit 624b472448cdf9a3ee4e733ac0526d82e29d0127.

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

diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml
index d2a303a..4d73ad8 100644 (file)
--- a/jjb/opnfv/slave-params.yml
+++ b/jjb/opnfv/slave-params.yml
@@ -9,6 +9,10 @@
         - label:
             name: SLAVE_LABEL
             default: 'apex-daily-master'
+        - 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
@@ -19,6 +23,10 @@
         - label:
             name: SLAVE_LABEL
             default: 'apex-verify-master'
+        - 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
@@ -33,6 +41,10 @@
                 - lf-pod1
             default-slaves:
                 - lf-pod1
+        - 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
@@ -46,6 +58,10 @@
         - label:
             name: SLAVE_LABEL
             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
@@ -56,18 +72,30 @@
         - 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'
 - parameter:
     name: 'fuel-baremetal-defaults'
     parameters:
         - label:
             name: SLAVE_LABEL
             default: 'fuel-baremetal'
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: 'Git URL to use on this Jenkins Slave'
 - parameter:
     name: 'joid-baremetal-defaults'
     parameters:
         - label:
             name: SLAVE_LABEL
             default: 'joid-baremetal'
+        - 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
@@ -85,6 +113,10 @@
         - label:
             name: SLAVE_LABEL
             default: 'apex-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
@@ -95,18 +127,30 @@
         - label:
             name: SLAVE_LABEL
             default: 'compass-virtual'
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: 'Git URL to use on this Jenkins Slave'
 - parameter:
     name: 'fuel-virtual-defaults'
     parameters:
         - 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'
 - parameter:
     name: 'joid-virtual-defaults'
     parameters:
         - 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
 #####################################################
@@ -116,6 +160,10 @@
         - 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
@@ -126,6 +174,10 @@
         - 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
@@ -137,6 +189,10 @@
             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
@@ -151,6 +207,10 @@
                 - huawei-build
             default-slaves:
                 - huawei-build
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: 'Git URL to use on this Jenkins Slave'
 #####################################################
 # Parameters for none-CI PODs
 #####################################################
@@ -164,6 +224,10 @@
                 - ericsson-pod1
             default-slaves:
                 - ericsson-pod1
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: 'Git URL to use on this Jenkins Slave'
 - parameter:
     name: 'intel-pod1-defaults'
     parameters:
@@ -174,6 +238,10 @@
                 - intel-pod1
             default-slaves:
                 - intel-pod1
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: 'Git URL to use on this Jenkins Slave'
 - parameter:
     name: 'intel-pod2-defaults'
     parameters:
@@ -184,6 +252,10 @@
                 - intel-pod2
             default-slaves:
                 - intel-pod2
+        - 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
@@ -198,6 +270,10 @@
                 - intel-pod3
             default-slaves:
                 - 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:
@@ -208,6 +284,10 @@
                 - huawei-pod2
             default-slaves:
                 - huawei-pod2
+        - 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:
@@ -221,6 +301,10 @@
         - label:
             name: SLAVE_LABEL
             default: 'huawei-test'
+        - 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:
@@ -234,6 +318,10 @@
         - label:
             name: SLAVE_LABEL
             default: 'huawei-test'
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: 'Git URL to use on this Jenkins Slave'
 - parameter:
     name: 'zte-pod1-defaults'
     parameters:
@@ -244,6 +332,10 @@
                 - zte-pod1
             default-slaves:
                 - zte-pod1
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: 'Git URL to use on this Jenkins Slave'
 - parameter:
     name: 'zte-pod2-defaults'
     parameters:
@@ -254,6 +346,10 @@
                 - zte-pod2
             default-slaves:
                 - zte-pod2
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: 'Git URL to use on this Jenkins Slave'
         - string:
             name: INSTALLER_IP
             default: '10.20.1.2'
@@ -268,6 +364,10 @@
                 - zte-pod3
             default-slaves:
                 - zte-pod3
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: 'Git URL to use on this Jenkins Slave'
         - string:
             name: BRIDGE
             default: 'br0'
@@ -282,6 +382,10 @@
                 - juniper-pod1
             default-slaves:
                 - juniper-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
@@ -296,6 +400,10 @@
                 - orange-pod2
             default-slaves:
                 - orange-pod2
+        - 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: /dev/sdb /dev/sdc
@@ -314,6 +422,10 @@
                 - orange-pod5
             default-slaves:
                 - orange-pod5
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: 'Git URL to use on this Jenkins Slave'
 - parameter:
     name: 'dell-pod1-defaults'
     parameters:
@@ -324,6 +436,10 @@
                 - dell-pod1
             default-slaves:
                 - dell-pod1
+        - 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:
@@ -334,6 +450,10 @@
                 - dell-pod2
             default-slaves:
                 - dell-pod2
+        - 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:
@@ -344,6 +464,10 @@
                 - nokia-pod1
             default-slaves:
                 - nokia-pod1
+        - 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
@@ -358,6 +482,10 @@
                 - arm-pod1
             default-slaves:
                 - arm-pod1
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: 'Git URL to use on this Jenkins Slave'
         - string:
             name: DEFAULT_BRIDGE
             default: 'admin6_br0,public6_br0'
@@ -380,6 +508,10 @@
                 - arm-pod2
             default-slaves:
                 - arm-pod2
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: 'Git URL to use on this Jenkins Slave'
         - string:
             name: DEFAULT_BRIDGE
             default: 'admin_br0,public_br0'
@@ -402,6 +534,10 @@
                 - intel-virtual6
             default-slaves:
                 - intel-virtual6
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: 'Git URL to use on this Jenkins Slave'
 #####################################################
 # These slaves are just dummy slaves for sandbox jobs
 #####################################################
@@ -412,6 +548,10 @@
             name: SLAVE_LABEL
             default: 'sandbox-baremetal'
             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
@@ -423,6 +563,10 @@
             name: SLAVE_LABEL
             default: 'sandbox-virtual'
             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
@@ -434,6 +578,10 @@
             name: SLAVE_LABEL
             default: 'dummy-pod1'
             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