diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e41f5da37..1a33beef5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -51,6 +51,7 @@ before_script: ANSIBLE_CONFIG: ./tests/ansible.cfg BOOTSTRAP_OS: none IDEMPOT_CHECK: "false" + RESET_CHECK: "false" UPGRADE_TEST: "false" RESOLVCONF_MODE: docker_dns LOG_LEVEL: "-vv" @@ -195,7 +196,7 @@ before_script: ## Idempotency checks 3/5 (reset deployment) - > - if [ "${IDEMPOT_CHECK}" = "true" ]; then + if [ "${IDEMPOT_CHECK}" = "true" AND "${RESET_CHECK}" = "true" ]; then ansible-playbook -i inventory/inventory.ini -u $SSH_USER -e ansible_ssh_user=$SSH_USER $SSH_ARGS -b --become-user=root -e cloud_provider=gce $LOG_LEVEL -e kube_network_plugin=${KUBE_NETWORK_PLUGIN} --private-key=${HOME}/.ssh/id_rsa @@ -208,7 +209,7 @@ before_script: ## Idempotency checks 4/5 (redeploy after reset) - > - if [ "${IDEMPOT_CHECK}" = "true" ]; then + if [ "${IDEMPOT_CHECK}" = "true" AND "${RESET_CHECK}" = "true" ]; then ansible-playbook -i inventory/inventory.ini -u $SSH_USER -e ansible_ssh_user=$SSH_USER $SSH_ARGS -b --become-user=root -e cloud_provider=gce $LOG_LEVEL -e kube_network_plugin=${KUBE_NETWORK_PLUGIN} --private-key=${HOME}/.ssh/id_rsa @@ -227,7 +228,7 @@ before_script: ## Idempotency checks 5/5 (Advanced DNS checks) - > - if [ "${IDEMPOT_CHECK}" = "true" ]; then + if [ "${IDEMPOT_CHECK}" = "true" AND "${RESET_CHECK}" = "true" ]; then ansible-playbook -i inventory/inventory.ini -e ansible_python_interpreter=${PYPATH} -u $SSH_USER -e ansible_ssh_user=$SSH_USER $SSH_ARGS -b --become-user=root --limit "all:!fake_hosts"