diff options
author | 2016-08-12 19:29:43 +0000 | |
---|---|---|
committer | 2016-08-12 19:29:43 +0000 | |
commit | 5c65fda41b2c81bca3897b72edf74738f1111584 (patch) | |
tree | 8303fc492d2d45770bafc36676fb987652f94c7b /jjb | |
parent | 624b472448cdf9a3ee4e733ac0526d82e29d0127 (diff) |
Revert "Remove GIT_BASE parameter from slave parameters"
This reverts commit 624b472448cdf9a3ee4e733ac0526d82e29d0127.
Change-Id: I900e6a3206331024cc9722de94a1237b9e1b89e0
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Diffstat (limited to 'jjb')
-rw-r--r-- | jjb/opnfv/slave-params.yml | 148 |
1 files changed, 148 insertions, 0 deletions
diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml index d2a303a74..4d73ad807 100644 --- a/jjb/opnfv/slave-params.yml +++ b/jjb/opnfv/slave-params.yml @@ -10,6 +10,10 @@ 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 description: 'SSH key to use for Apex' @@ -20,6 +24,10 @@ 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 description: 'SSH key to use for Apex' @@ -34,6 +42,10 @@ 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 description: 'SSH key to use for Apex' @@ -47,6 +59,10 @@ 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 description: 'SSH key to use for Apex' @@ -56,12 +72,20 @@ - 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: @@ -69,6 +93,10 @@ 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 description: "Disks to use by ceph (comma separated list)" @@ -86,6 +114,10 @@ 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 description: 'SSH key to use for Apex' @@ -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 ##################################################### @@ -117,6 +161,10 @@ 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." @@ -127,6 +175,10 @@ 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." @@ -138,6 +190,10 @@ 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." @@ -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: @@ -185,6 +253,10 @@ 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 description: 'SSH key to use for Apex' @@ -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: @@ -255,6 +347,10 @@ 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' description: 'IP of the installer' @@ -269,6 +365,10 @@ 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' description: 'pxe bridge for booting of Fuel master' @@ -283,6 +383,10 @@ 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 description: "Disks to use by ceph (comma separated list)" @@ -297,6 +401,10 @@ 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 description: "Disks to use by ceph by default (space separated list)" @@ -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: @@ -345,6 +465,10 @@ 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 description: 'SSH key to use for Apex' @@ -359,6 +483,10 @@ 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' desciption: 'The bridge to use for Fuel PXE booting. It can be a comma sparated list of bridges, in which case the first is the PXE boot bridge, and all subsequent interfaces that will be added to the VM. If left empty, most deploy scripts will default to pxebr.' @@ -381,6 +509,10 @@ 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' desciption: 'The bridge to use for Fuel PXE booting. It can be a comma sparated list of bridges, in which case the first is the PXE boot bridge, and all subsequent interfaces that will be added to the VM. If left empty, most deploy scripts will default to pxebr.' @@ -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 ##################################################### @@ -413,6 +549,10 @@ 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 description: "Directory where the build artifact will be located upon the completion of the build." @@ -424,6 +564,10 @@ 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 description: "Directory where the build artifact will be located upon the completion of the build." @@ -435,6 +579,10 @@ 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 description: "Directory where the build artifact will be located upon the completion of the build." |