Merge "Refactor simple deployment job to use zuul-cloner"
This commit is contained in:
commit
cedd56540f
|
@ -87,20 +87,14 @@ ${SSH_COMMAND} "ssh -o StrictHostKeyChecking=no node3 sudo service ntp restart"
|
||||||
|
|
||||||
# Prepare env on "admin" VM:
|
# Prepare env on "admin" VM:
|
||||||
if [ ${COMPONENT} == "full" ];then
|
if [ ${COMPONENT} == "full" ];then
|
||||||
pushd fuel-ccp
|
|
||||||
git fetch "${ZUUL_URL}"/"${ZUUL_PROJECT}" "${ZUUL_REF}"
|
|
||||||
git checkout FETCH_HEAD
|
|
||||||
popd
|
|
||||||
${SCP_COMMAND} -r fuel-ccp/ vagrant@"${ADMIN_IP}":~/
|
${SCP_COMMAND} -r fuel-ccp/ vagrant@"${ADMIN_IP}":~/
|
||||||
else
|
else
|
||||||
${SCP_COMMAND} -r fuel-ccp/ vagrant@"${ADMIN_IP}":~/
|
${SCP_COMMAND} -r fuel-ccp/ vagrant@"${ADMIN_IP}":~/
|
||||||
REPO=`echo ${ZUUL_PROJECT} | cut -d '/' -f 2`
|
|
||||||
# set +x is just for security reasons to avoid publishing internal IP
|
# set +x is just for security reasons to avoid publishing internal IP
|
||||||
set +x
|
set +x
|
||||||
getent hosts zuul.mcp.fuel-infra.org | ${SSH_COMMAND} "sudo tee -a /etc/hosts"
|
getent hosts zuul.mcp.fuel-infra.org | ${SSH_COMMAND} "sudo tee -a /etc/hosts"
|
||||||
set -x
|
set -x
|
||||||
${SSH_COMMAND} "pushd fuel-ccp && tox -e venv -- ccp --verbose --debug --config-file ~/fuel-ccp/tools/ccp-multi-deploy/config/ccp-cli-${VERSION}-config-1.yaml fetch"
|
${SCP_COMMAND} -r containers/openstack/ vagrant@"${ADMIN_IP}":/tmp/ccp-repos
|
||||||
${SSH_COMMAND} "cd /tmp/ccp-repos/${REPO} && git fetch ${ZUUL_URL}/${ZUUL_PROJECT} ${ZUUL_REF} && git checkout FETCH_HEAD"
|
|
||||||
fi
|
fi
|
||||||
# Run CCP deployment and OpenStack tests:
|
# Run CCP deployment and OpenStack tests:
|
||||||
${SSH_COMMAND} "pushd fuel-ccp && APT_CACHE_SERVER=http://${APT_CACHE_SERVER_IP}:${APT_CACHE_SERVER_PORT} tox -e multi-deploy -- --openstack-version ${VERSION} --number-of-envs 1"
|
${SSH_COMMAND} "pushd fuel-ccp && APT_CACHE_SERVER=http://${APT_CACHE_SERVER_IP}:${APT_CACHE_SERVER_PORT} tox -e multi-deploy -- --openstack-version ${VERSION} --number-of-envs 1"
|
||||||
|
|
|
@ -4,6 +4,7 @@
|
||||||
Deploy CCP and run basic OpenStack tests (uses snapshot for K8s cluster)
|
Deploy CCP and run basic OpenStack tests (uses snapshot for K8s cluster)
|
||||||
node: standard
|
node: standard
|
||||||
builders:
|
builders:
|
||||||
|
- zuul-clone
|
||||||
- inject:
|
- inject:
|
||||||
properties-content: |
|
properties-content: |
|
||||||
COMPONENT={component}
|
COMPONENT={component}
|
||||||
|
@ -49,6 +50,7 @@
|
||||||
scm-repo: 'fuel-ccp-installer'
|
scm-repo: 'fuel-ccp-installer'
|
||||||
wrappers:
|
wrappers:
|
||||||
- ng-cleanup
|
- ng-cleanup
|
||||||
|
- fuel-ccp-ci-jenkins
|
||||||
- timeout:
|
- timeout:
|
||||||
timeout: 120
|
timeout: 120
|
||||||
fail: true
|
fail: true
|
||||||
|
|
Loading…
Reference in New Issue