Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "[daisy] Fix the scenario in build-name"
[releng.git]
/
jjb
/
yardstick
/
yardstick-get-k8s-conf.sh
diff --git
a/jjb/yardstick/yardstick-get-k8s-conf.sh
b/jjb/yardstick/yardstick-get-k8s-conf.sh
index
e93367f
..
116d2f0
100755
(executable)
--- a/
jjb/yardstick/yardstick-get-k8s-conf.sh
+++ b/
jjb/yardstick/yardstick-get-k8s-conf.sh
@@
-4,5
+4,10
@@
set -e
dest_path="$HOME/admin.conf"
if [[ "${DEPLOY_SCENARIO:0:2}" == "k8" ]];then
dest_path="$HOME/admin.conf"
if [[ "${DEPLOY_SCENARIO:0:2}" == "k8" ]];then
- juju scp kubernetes-master/0:config "${dest_path}"
+ if [[ ${INSTALLER_TYPE} == 'joid' ]];then
+ juju scp kubernetes-master/0:config "${dest_path}"
+ elif [[ ${INSTALLER_TYPE} == 'compass' ]];then
+ echo "Copy admin.conf to ${dest_path}"
+ docker cp compass-tasks:/opt/admin.conf "${dest_path}"
+ fi
fi
fi