diff options
| author |   xudan <xudan16@huawei.com> | 2017-12-28 21:12:07 -0500 |
|---|---|---|
| committer | xudan <xudan16@huawei.com> | 2017-12-28 21:12:07 -0500 |
| commit | d8f30ed2d6f06774b0b0ae8ec8cf85906d0891ec (patch) | |
| tree | ad8644efdc5248097a976c869df9e1103ffa3508 | |
| parent | 8bb5b1f2154da334570c5791a6a9a8ad43e829af (diff) | |
Support run dovetail CI jobs on fuel euphrates and master
Change-Id: Iaf64316f8db351dd72f1ec1079953764f797dc3b
Signed-off-by: xudan <xudan16@huawei.com>
| -rwxr-xr-x | jjb/dovetail/dovetail-run.sh | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/jjb/dovetail/dovetail-run.sh b/jjb/dovetail/dovetail-run.sh index 5f8f87ec4..cccc55f12 100755 --- a/jjb/dovetail/dovetail-run.sh +++ b/jjb/dovetail/dovetail-run.sh @@ -73,13 +73,17 @@ if [[ -f $OPENRC ]]; then exit 1 fi fi - cat $OPENRC else echo "ERROR: cannot find file $OPENRC. Please check if it is existing." sudo ls -al ${DOVETAIL_CONFIG} exit 1 fi +if [[ ! "${SUT_BRANCH}" =~ "danube" && ${INSTALLER_TYPE} == "fuel" ]]; then + sed -i "s#/etc/ssl/certs/mcp_os_cacert#${CACERT}#g" ${OPENRC} +fi +cat $OPENRC + if [[ ! "${SUT_BRANCH}" =~ "danube" && ${INSTALLER_TYPE} == "compass" ]]; then cat << EOF >${DOVETAIL_CONFIG}/pod.yaml nodes: @@ -138,8 +142,12 @@ fi ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" if [ "$INSTALLER_TYPE" == "fuel" ]; then - echo "Fetching id_rsa file from jump_server $INSTALLER_IP..." - sshpass -p r00tme sudo scp $ssh_options root@${INSTALLER_IP}:~/.ssh/id_rsa ${DOVETAIL_CONFIG}/id_rsa + if [[ "${SUT_BRANCH}" =~ "danube" ]]; then + echo "Fetching id_rsa file from jump_server $INSTALLER_IP..." + sshpass -p r00tme sudo scp $ssh_options root@${INSTALLER_IP}:~/.ssh/id_rsa ${DOVETAIL_CONFIG}/id_rsa + else + cp ${SSH_KEY} ${DOVETAIL_CONFIG}/id_rsa + fi fi if [ "$INSTALLER_TYPE" == "apex" ]; then |