diff options
| author |   Aric Gardner <agardner@linuxfoundation.org> | 2016-10-14 18:08:40 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2016-10-14 18:08:40 +0000 |
| commit | e12646d2de1e1596af9329e39cf1daf2a3ddee14 (patch) | |
| tree | 9f4ed5a47089ab7ad8068387c034865634e0d638 | |
| parent | 309ce2c22f96f3a04a3f4a8c5da680fc9b5bf06b (diff) | |
| parent | c873d542c2628a0265faba0fe9a72d47feab0409 (diff) | |
Merge "Armband: Move lab-config to OPNFV securedlab"
| -rwxr-xr-x | jjb/armband/armband-deploy.sh | 2 | ||||
| -rw-r--r-- | jjb/opnfv/slave-params.yml | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/jjb/armband/armband-deploy.sh b/jjb/armband/armband-deploy.sh index 41ec0f23c..c8e58afa8 100755 --- a/jjb/armband/armband-deploy.sh +++ b/jjb/armband/armband-deploy.sh @@ -49,7 +49,7 @@ mkdir -p $TMPDIR cd $WORKSPACE if [[ $LAB_CONFIG_URL =~ ^(git|ssh):// ]]; then - echo "cloning $LAB_CONFIG_URL" + echo "Cloning securedlab repo ${GIT_BRANCH##origin/}" git clone --quiet --branch ${GIT_BRANCH##origin/} $LAB_CONFIG_URL lab-config LAB_CONFIG_URL=file://${WORKSPACE}/lab-config diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml index 4ffaff4ae..7eca41a6d 100644 --- a/jjb/opnfv/slave-params.yml +++ b/jjb/opnfv/slave-params.yml @@ -162,7 +162,7 @@ description: 'Git URL to use on this Jenkins Slave' - string: name: LAB_CONFIG_URL - default: ssh://git@git.enea.com/pharos/lab-config + default: ssh://jenkins-enea@gerrit.opnfv.org:29418/securedlab description: 'Base URI to the configuration directory' - parameter: name: 'joid-baremetal-defaults' @@ -227,7 +227,7 @@ description: 'Git URL to use on this Jenkins Slave' - string: name: LAB_CONFIG_URL - default: ssh://git@git.enea.com/pharos/lab-config + default: ssh://jenkins-enea@gerrit.opnfv.org:29418/securedlab description: 'Base URI to the configuration directory' - parameter: name: 'joid-virtual-defaults' @@ -608,7 +608,7 @@ description: 'Git URL to use on this Jenkins Slave' - string: name: LAB_CONFIG_URL - default: ssh://git@git.enea.com/pharos/lab-config + default: ssh://jenkins-enea@gerrit.opnfv.org:29418/securedlab description: 'Base URI to the configuration directory' - parameter: name: 'intel-virtual6-defaults' |