x
/
fuel-ccp-ci-config
Code Issues Proposed changes

Merge "Add share server to hosts"

This commit is contained in:
Jenkins 2017-03-23 14:23:33 +00:00 committed by Gerrit Code Review
parent 0fcec52724 2829e6da73
commit 4a669de690
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jenkins-tp/jobs/builders/fuel-ccp-simple-deployment.sh
View File

@ -25,6 +25,8 @@ export DOCKER_REGISTRY="${DOCKER_REGISTRY_HOST}:6000"
export DOCKER_REGISTRY_IP="`getent hosts ${DOCKER_REGISTRY_HOST} | awk '{print $1}'`"
export IMAGES_NAMESPACE="ccp"
export REGISTRY_NAMESPACE="mcp"
export SHARE_HOST="share01-scc.ng.mirantis.net"
export SHARE_IP="`getent hosts ${SHARE_HOST} | awk '{print $1}'`"
function prepare_k8s_env {
# Prepare K8s env:
@ -313,7 +315,6 @@ ccp_wait_for_deployment_to_finish () {
echo "Max time exceeded"
${SSH_COMMAND} ccp status
${SSH_COMMAND} fuel-ccp/tools/diagnostic-snapshot.sh -n ccp -c ccp.yml
${SCP_COMMAND} vagrant@"${ADMIN_IP}":/tmp/ccp-diag/*.tar.gz .
return 1
fi
done
@ -390,6 +391,7 @@ prepare_ccp_config
ccp_install
if [ ${COMPONENT} == "smoke" ]; then
sshpass -p vagrant ssh -o StrictHostKeyChecking=no vagrant@"${ADMIN_IP}" "echo ${SHARE_IP} ${SHARE_HOST} |sudo tee -a /etc/hosts"
ssh -i ~/.ssh/jenkins_storage share@share01-scc.ng.mirantis.net rm /srv/static/share/tests/tests/result-${VERSION}.xml
${SCP_COMMAND} ccp.yml vagrant@"${ADMIN_IP}":~/
${SSH_COMMAND} "ccp -vvv --debug --config-file ~/ccp.yml fetch"