From: Fatih Degirmenci Date: Wed, 10 Aug 2016 08:25:17 +0000 (+0200) Subject: Remove GIT_BASE parameter from slave parameters X-Git-Tag: colorado.1.0~170^2 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=624b472448cdf9a3ee4e733ac0526d82e29d0127;p=releng.git Remove GIT_BASE parameter from slave parameters 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 --- diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml index 4d73ad807..d2a303a74 100644 --- a/jjb/opnfv/slave-params.yml +++ b/jjb/opnfv/slave-params.yml @@ -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 @@ -23,10 +19,6 @@ - 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 @@ -41,10 +33,6 @@ - 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 @@ -58,10 +46,6 @@ - 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 @@ -72,30 +56,18 @@ - 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 @@ -113,10 +85,6 @@ - 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 @@ -127,30 +95,18 @@ - 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 ##################################################### @@ -160,10 +116,6 @@ - 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 @@ -174,10 +126,6 @@ - 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 @@ -189,10 +137,6 @@ 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 @@ -207,10 +151,6 @@ - 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 ##################################################### @@ -224,10 +164,6 @@ - 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: @@ -238,10 +174,6 @@ - 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: @@ -252,10 +184,6 @@ - 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 @@ -270,10 +198,6 @@ - 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: @@ -284,10 +208,6 @@ - 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: @@ -301,10 +221,6 @@ - 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: @@ -318,10 +234,6 @@ - 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: @@ -332,10 +244,6 @@ - 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: @@ -346,10 +254,6 @@ - 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' @@ -364,10 +268,6 @@ - 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' @@ -382,10 +282,6 @@ - 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 @@ -400,10 +296,6 @@ - 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 @@ -422,10 +314,6 @@ - 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: @@ -436,10 +324,6 @@ - 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: @@ -450,10 +334,6 @@ - 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: @@ -464,10 +344,6 @@ - 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 @@ -482,10 +358,6 @@ - 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' @@ -508,10 +380,6 @@ - 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' @@ -534,10 +402,6 @@ - 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 ##################################################### @@ -548,10 +412,6 @@ 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 @@ -563,10 +423,6 @@ 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 @@ -578,10 +434,6 @@ 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