summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorFatih Degirmenci <fdegir@gmail.com>2018-03-21 08:19:09 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-03-21 08:19:09 +0000
commitac161e386f7b903af5b328147c170b0deecf7aa3 (patch)
tree9d949e70471e172b0d7b26924da60bd4f43208ce /jjb
parent8188883873553620a59cae05e96a9bfdc2415a2e (diff)
parent39eff18b123ce9b939427838414d1360787c7e4f (diff)
Merge "Add Compass POD ipmi info to pod.yaml for ha.tc009"
Diffstat (limited to 'jjb')
-rwxr-xr-xjjb/dovetail/dovetail-run.sh23
1 files changed, 18 insertions, 5 deletions
diff --git a/jjb/dovetail/dovetail-run.sh b/jjb/dovetail/dovetail-run.sh
index b8c432458..1c53dbee4 100755
--- a/jjb/dovetail/dovetail-run.sh
+++ b/jjb/dovetail/dovetail-run.sh
@@ -93,13 +93,24 @@ fi
cat $OPENRC
if [[ ! "${SUT_BRANCH}" =~ "danube" && ${INSTALLER_TYPE} == "compass" ]]; then
+ compass_repo=${WORKSPACE}/compass4nfv/
+ git clone https://github.com/opnfv/compass4nfv.git ${compass_repo} >/dev/null
+ pip install shyaml
+ scenario_file=${compass_repo}/deploy/conf/hardware_environment/$NODE_NAME/os-nosdn-nofeature-ha.yml
+ ipmiIp=$(cat ${scenario_file} | shyaml get-value hosts.0.ipmiIp)
+ ipmiPass=$(cat ${scenario_file} | shyaml get-value hosts.0.ipmiPass)
+ ipmiUser=root
+ jumpserver_ip=$(ifconfig | grep -A 5 docker0 | grep "inet addr" | cut -d ':' -f 2 | cut -d ' ' -f 1)
+
cat << EOF >${DOVETAIL_CONFIG}/pod.yaml
nodes:
-- {ip: 10.1.0.52, name: node1, password: root, role: controller, user: root}
+- {ip: ${jumpserver_ip}, name: node0, password: root, role: Jumpserver, user: root}
+- {ip: 10.1.0.50, name: node1, password: root, role: controller, user: root,
+ ipmi_ip: ${ipmiIp}, ipmi_user: ${ipmiUser}, ipmi_password: ${ipmiPass}}
- {ip: 10.1.0.51, name: node2, password: root, role: controller, user: root}
-- {ip: 10.1.0.50, name: node3, password: root, role: controller, user: root}
-- {ip: 10.1.0.54, name: node4, password: root, role: compute, user: root}
-- {ip: 10.1.0.53, name: node5, password: root, role: compute, user: root}
+- {ip: 10.1.0.52, name: node3, password: root, role: controller, user: root}
+- {ip: 10.1.0.53, name: node4, password: root, role: compute, user: root}
+- {ip: 10.1.0.54, name: node5, password: root, role: compute, user: root}
EOF
fi
@@ -154,6 +165,7 @@ if [[ ! -f ${DOVETAIL_CONFIG}/pod.yaml ]]; then
fi
if [ -f ${DOVETAIL_CONFIG}/pod.yaml ]; then
+ sudo chown jenkins:jenkins ${DOVETAIL_CONFIG}/pod.yaml
echo "Adapt process info for $INSTALLER_TYPE ..."
attack_process='rabbitmq'
cat << EOF >> ${DOVETAIL_CONFIG}/pod.yaml
@@ -307,8 +319,9 @@ sudo cp -r ${DOVETAIL_HOME}/results ./
# PRIMARY_GROUP=$(id -gn $CURRENT_USER)
# sudo chown -R ${CURRENT_USER}:${PRIMARY_GROUP} ${WORKSPACE}/results
-#remove useless workspace from yardstick to save disk space
+#remove useless files to save disk space
sudo rm -rf ./results/workspace
+sudo rm -f ./results/yardstick.img
echo "Dovetail: done!"