summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-08-10 10:25:17 +0200
committerFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-08-10 10:33:43 +0200
commit624b472448cdf9a3ee4e733ac0526d82e29d0127 (patch)
tree79569bc1d8d6099fe9dbcdce39acb47475d82356
parentf0830fb30a41e6db542ce7c843c5819fcb205c9e (diff)
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 <fatih.degirmenci@ericsson.com>
-rw-r--r--jjb/opnfv/slave-params.yml148
1 files changed, 0 insertions, 148 deletions
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
@@ -10,10 +10,6 @@
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'
@@ -24,10 +20,6 @@
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'
@@ -42,10 +34,6 @@
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'
@@ -59,10 +47,6 @@
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'
@@ -72,20 +56,12 @@
- 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:
@@ -93,10 +69,6 @@
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)"
@@ -114,10 +86,6 @@
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'
@@ -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
#####################################################
@@ -161,10 +117,6 @@
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."
@@ -175,10 +127,6 @@
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."
@@ -190,10 +138,6 @@
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."
@@ -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:
@@ -253,10 +185,6 @@
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'
@@ -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:
@@ -347,10 +255,6 @@
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'
@@ -365,10 +269,6 @@
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'
@@ -383,10 +283,6 @@
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)"
@@ -401,10 +297,6 @@
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)"
@@ -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:
@@ -465,10 +345,6 @@
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'
@@ -483,10 +359,6 @@
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.'
@@ -509,10 +381,6 @@
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.'
@@ -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
#####################################################
@@ -549,10 +413,6 @@
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."
@@ -564,10 +424,6 @@
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."
@@ -579,10 +435,6 @@
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."