diff options
| -rw-r--r-- | jjb/functest/functest.yml | 18 | ||||
| -rwxr-xr-x | utils/fetch_os_creds.sh | 3 |
2 files changed, 19 insertions, 2 deletions
diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml index 3a63f0f82..95a2cbcbc 100644 --- a/jjb/functest/functest.yml +++ b/jjb/functest/functest.yml @@ -18,7 +18,7 @@ installer_type: 'apex' installer_ip: '192.168.X.X' - compass: - node: 'huawei-us' + node: 'huawei-us-deploy-bare-1' installer_type: 'compass' installer_ip: '192.168.200.2' pod: @@ -37,6 +37,12 @@ installer_type: 'joid' installer_ip: '127.0.0.1' + - huawei-build: + node: 'huawei-us-deploy-bare-1' + installer_type: 'compass' + installer_ip: '192.168.200.2' + + jobs: - 'set-functest-env-{pod}' - 'functest-{pod}' @@ -383,7 +389,15 @@ - string: name: SSH_KEY default: "/root/.ssh/id_rsa" - description: "SSH public key to access the installer VM" + description: "SSH private key to access the installer VM" + +- parameter: + name: huawei-build + parameters: + - string: + name: GIT_BASE + default: ssh://gerrit.opnfv.org:29418/$PROJECT + description: "Override GIT_BASE" - parameter: name: opnfv-jump-2 diff --git a/utils/fetch_os_creds.sh b/utils/fetch_os_creds.sh index 7856e0dd7..5905726cb 100755 --- a/utils/fetch_os_creds.sh +++ b/utils/fetch_os_creds.sh @@ -106,6 +106,9 @@ elif [ "$installer_type" == "apex" ]; then # The credentials file is located in the Instack VM (192.0.2.1) # NOTE: This might change for bare metal deployments info "Fetching rc file from Instack VM $installer_ip..." + if [ -f /root/.ssh/id_rsa ]; then + chmod 600 /root/.ssh/id_rsa + fi sudo scp $ssh_options root@$installer_ip:/home/stack/overcloudrc $dest_path elif [ "$installer_type" == "compass" ]; then |