diff options
| author |   Gary Wu <gary.i.wu@huawei.com> | 2018-06-26 14:27:41 -0700 |
|---|---|---|
| committer | Gary Wu <gary.i.wu@huawei.com> | 2018-06-26 16:54:46 -0700 |
| commit | c4749702f342ccba051fa081e4efa0b9c46286d1 (patch) | |
| tree | 0c91e4142f9b5a3ecab16a36dfd772a5eacafe7f /deployment/heat/onap-oom/scripts | |
| parent | b529fa1824be51fac31f6d3d3bd1b82a21161f2e (diff) | |
Test using RAM disk for /dockerdata-nfs
Change-Id: I82d461caa7d9be77af366f8186f1b7851a914ac9
Issue-ID: INT-532
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
Diffstat (limited to 'deployment/heat/onap-oom/scripts')
| -rwxr-xr-x | deployment/heat/onap-oom/scripts/deploy.sh | 3 | ||||
| -rwxr-xr-x | deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/deployment/heat/onap-oom/scripts/deploy.sh b/deployment/heat/onap-oom/scripts/deploy.sh index e3acd3c95..8a41a78de 100755 --- a/deployment/heat/onap-oom/scripts/deploy.sh +++ b/deployment/heat/onap-oom/scripts/deploy.sh @@ -68,12 +68,13 @@ ssh-keygen -R $RANCHER_IP ssh -o StrictHostKeychecking=no -i $SSH_KEY ubuntu@$RANCHER_IP "sed -u '/Cloud-init.*finished/q' <(tail -n+0 -f /var/log/cloud-init-output.log)" for n in $(seq 1 6); do + echo "Wait count $n of 6" + sleep 15m timeout 15m ssh -i $SSH_KEY ubuntu@$RANCHER_IP 'sudo su -l root -c "/root/oom/kubernetes/robot/ete-k8s.sh onap health"' RESULT=$? if [ $RESULT -eq 0 ]; then break fi - sleep 15m done ROBOT_POD=$(ssh -i $SSH_KEY ubuntu@$RANCHER_IP 'sudo su -c "kubectl --namespace onap get pods"' | grep robot | sed 's/ .*//') if [ "$ROBOT_POD" == "" ]; then diff --git a/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh b/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh index 23f969c6b..32ccfc55a 100755 --- a/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh +++ b/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh @@ -50,6 +50,9 @@ cat <<EOF __apt_proxy__: { get_param: apt_proxy } __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] } __integration_override_yaml__: { get_param: integration_override_yaml } + __gerrit_branch__: { get_param: gerrit_branch } + __gerrit_refspec__: { get_param: gerrit_refspec } + __docker_manifest__: { get_param: docker_manifest } __oam_network_id__: { get_resource: oam_network } __oam_subnet_id__: { get_resource: oam_subnet } __k8s_1_vm_ip__: { get_attr: [k8s_1_floating_ip, floating_ip_address] } |