diff options
| author |   xudan <xudan16@huawei.com> | 2018-03-20 04:30:01 -0400 |
|---|---|---|
| committer | xudan <xudan16@huawei.com> | 2018-03-20 04:52:25 -0400 |
| commit | 39eff18b123ce9b939427838414d1360787c7e4f (patch) | |
| tree | 5eaffabec353c28a959ed89bacae7e1aadea154e /jjb/dovetail | |
| parent | 44af730357e1bebb9490138970aafbd1bdd2dcbd (diff) | |
Add Compass POD ipmi info to pod.yaml for ha.tc009
1. For ha.tc009 which needs to login one controller node and shut it down
with its ipmi info.
2. So it needs to add impi info and jumpserver info into pod.yaml file.
3. Remove yardstick.img file to save artifacts space
JIRA: DOVETAIL-628
Change-Id: I4d2aa48b209155f27e49a7bb871a170683b47fc9
Signed-off-by: xudan <xudan16@huawei.com>
Diffstat (limited to 'jjb/dovetail')
| -rwxr-xr-x | jjb/dovetail/dovetail-run.sh | 23 |
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!" |