diff options
| -rwxr-xr-x | jjb/doctor/doctor-env-presetup.sh | 7 | ||||
| -rw-r--r-- | jjb/global/slave-params.yaml | 4 | ||||
| -rw-r--r-- | releases/gambia/functest.yaml | 6 | ||||
| -rw-r--r-- | releases/gambia/sdnvpn.yaml | 18 | ||||
| -rw-r--r-- | releases/gambia/yardstick.yaml | 4 |
5 files changed, 35 insertions, 4 deletions
diff --git a/jjb/doctor/doctor-env-presetup.sh b/jjb/doctor/doctor-env-presetup.sh index 61e65c792..ebbf32c01 100755 --- a/jjb/doctor/doctor-env-presetup.sh +++ b/jjb/doctor/doctor-env-presetup.sh @@ -42,6 +42,13 @@ elif [[ ${INSTALLER_TYPE} == 'daisy' ]]; then echo "No available installer VM exists...exiting" exit 1 fi + +elif [[ ${INSTALLER_TYPE} == 'fuel' ]]; then + if [[ ! "${BRANCH}" =~ "danube" ]]; then + export SSH_KEY=${SSH_KEY:-/var/lib/opnfv/mcp.rsa} + sudo cp ${SSH_KEY} ${installer_key_file} + sudo chown `whoami`:`whoami` ${installer_key_file} + fi fi diff --git a/jjb/global/slave-params.yaml b/jjb/global/slave-params.yaml index e62a75c66..4ff5d6799 100644 --- a/jjb/global/slave-params.yaml +++ b/jjb/global/slave-params.yaml @@ -1187,10 +1187,6 @@ 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 be used' - parameter: name: 'ericsson-virtual5-defaults' diff --git a/releases/gambia/functest.yaml b/releases/gambia/functest.yaml index 722a35e70..59c205aa1 100644 --- a/releases/gambia/functest.yaml +++ b/releases/gambia/functest.yaml @@ -7,9 +7,15 @@ releases: - version: opnfv-7.0.0 location: functest: b7f9b53a34cd8ffcc9df4d2f286e55e13adb4a58 + - version: opnfv-7.1.0 + location: + functest: b21dede23cb7577497fb7adf2775a77c45a37e36 - version: opnfv-7.0.0 location: functest-kubernetes: fd5c939094244458aea31ead8c6519da95266c2a + - version: opnfv-7.1.0 + location: + functest-kubernetes: fd5c939094244458aea31ead8c6519da95266c2a branches: - name: stable/gambia diff --git a/releases/gambia/sdnvpn.yaml b/releases/gambia/sdnvpn.yaml index c3ee8cad3..309523058 100644 --- a/releases/gambia/sdnvpn.yaml +++ b/releases/gambia/sdnvpn.yaml @@ -1,9 +1,27 @@ +# SPDX-License-Identifier: Apache-2.0 +############################################################################## +# Copyright (c) 2018 The Linux Foundation and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## --- project: sdnvpn project-type: feature release-model: stable +releases: + - version: opnfv-7.0.0 + location: + sdnvpn: 6c2ec2eeedfc342e815b3dff7c190d8909e22e48 + - version: opnfv-7.1.0 + location: + sdnvpn: 3c74ef730c31343837b01c0e92e643d387ba8202 + branches: - name: stable/gambia location: sdnvpn: c05105a4f9f51f7bb31cad791e65d664e5a3bc4b + +release-notes: https://opnfv-sdnvpn.readthedocs.io/en/stable-gambia/release/release-notes diff --git a/releases/gambia/yardstick.yaml b/releases/gambia/yardstick.yaml index 2dc5ad6f4..60cd3e713 100644 --- a/releases/gambia/yardstick.yaml +++ b/releases/gambia/yardstick.yaml @@ -13,4 +13,8 @@ releases: location: yardstick: b9fa3eac6caf65a371f339fcbc3abc7cbe5b41cc + - version: opnfv-7.1.0 + location: + yardstick: a1e5634d35ba5f0095fdd2777efa4042b1872127 + release-notes: https://opnfv-yardstick.readthedocs.io/en/stable-gambia/release/release-notes/ |