Remove GIT_BASE parameter from slave parameters 07/18307/1
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>
Wed, 10 Aug 2016 08:25:17 +0000 (10:25 +0200)
committerFatih Degirmenci <fatih.degirmenci@ericsson.com>
Wed, 10 Aug 2016 08:33:43 +0000 (10:33 +0200)
All the slaves can clone repos from OPNFV Gerrit via https. As a
result of this, the previously introduced GIT_BASE parameter can
now be removed from slave-params.yml file to keep it clean and tidy
and prevent questions.

See the build history of the below job for clone testing on all the slaves
labelled with opnfv-sysinfo.
    https://build.opnfv.org/ci/job/repo_clone_test/

This change can only be submitted once the GIT_BASE env var on OPNFV Jenkins
Global Configuration is switched to https.

If any job fails on a slave due to issues with the cloning, it needs to
be fixed immediately.

Change-Id: I9620b9a6a9abed3696f1c917aa392a720f5b1cb0
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
jjb/opnfv/slave-params.yml

index 4d73ad8..d2a303a 100644 (file)
@@ -9,10 +9,6 @@
         - 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
         - 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
                 - 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
         - 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
         - 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
         - 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
         - 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
 #####################################################
         - 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
         - 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
             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
                 - 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
 #####################################################
                 - 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:
                 - 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:
                 - 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
                 - 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:
                 - 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:
         - 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:
         - 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:
                 - 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:
                 - 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'
                 - 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'
                 - 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
                 - 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
                 - 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:
                 - 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:
                 - 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:
                 - 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
                 - 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'
                 - 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'
                 - 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
 #####################################################
             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
             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
             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