C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rework idempotency checks for CI

Browse source 
Shorten idempotency checks run time and split its
coverage over ha, default, separate CI modes:
* Do not reset docker images, controlled by tags
* Limit redeploy to master groups (it still covers
  etcd and minions for later default/ha CI cases)
  and skip download tags.

Signed-off-by: Bogdan Dobrelya <bogdando@mail.ru>
This commit is contained in:
Bogdan Dobrelya 2017-01-20 10:03:39 +01:00
parent 1bdf34e7dc
commit c693602c50
4 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.gitlab-ci.yml
View file

@ -127,7 +127,7 @@ before_script:
## Advanced DNS checks ## Advanced DNS checks
- 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 tests/testcases/040_check-network-adv.yml $LOG_LEVEL - 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 tests/testcases/040_check-network-adv.yml $LOG_LEVEL
## Idempotency checks 1/5 (repeat deployment) ## Idempotency checks 1/4 (partial repeat deployment)
- > - >
if [ "${IDEMPOT_CHECK}" = "true" ]; then if [ "${IDEMPOT_CHECK}" = "true" ]; then
ansible-playbook -i inventory/inventory.ini -u $SSH_USER -e ansible_ssh_user=$SSH_USER $SSH_ARGS ansible-playbook -i inventory/inventory.ini -u $SSH_USER -e ansible_ssh_user=$SSH_USER $SSH_ARGS
@ -142,7 +142,7 @@ before_script:
-e local_release_dir=${PWD}/downloads -e local_release_dir=${PWD}/downloads
-e etcd_deployment_type=${ETCD_DEPLOYMENT} -e etcd_deployment_type=${ETCD_DEPLOYMENT}
-e kubelet_deployment_type=${KUBELET_DEPLOYMENT} -e kubelet_deployment_type=${KUBELET_DEPLOYMENT}
cluster.yml; cluster.yml --skip-tags=download --limit=k8s-cluster:kube-master;
fi fi
## Idempotency checks 2/5 (Advanced DNS checks) ## Idempotency checks 2/5 (Advanced DNS checks)
@ -161,7 +161,7 @@ before_script:
--private-key=${HOME}/.ssh/id_rsa --private-key=${HOME}/.ssh/id_rsa
-e bootstrap_os=${BOOTSTRAP_OS} -e bootstrap_os=${BOOTSTRAP_OS}
-e ansible_python_interpreter=${PYPATH} -e ansible_python_interpreter=${PYPATH}
reset.yml; reset.yml --skip-tags=reset_images;
fi fi
## Idempotency checks 4/5 (redeploy after reset) ## Idempotency checks 4/5 (redeploy after reset)

1
docs/ansible.md
View file

@ -135,6 +135,7 @@ The following tags are defined in playbooks:
| nginx | Configuring LB for kube-apiserver instances | nginx | Configuring LB for kube-apiserver instances
| node | Configuring K8s minion (compute) node role | node | Configuring K8s minion (compute) node role
| openstack | Cloud-provider OpenStack | openstack | Cloud-provider OpenStack
| reset_images | Controls if the reset role purges images as well
| preinstall | Preliminary configuration steps | preinstall | Preliminary configuration steps
| resolvconf | Configuring /etc/resolv.conf for hosts/apps | resolvconf | Configuring /etc/resolv.conf for hosts/apps
| upgrade | Upgrading, f.e. container images/binaries | upgrade | Upgrading, f.e. container images/binaries

1
roles/reset/tasks/main.yml
View file

@ -31,6 +31,7 @@
- name: reset | remove all containers - name: reset | remove all containers
shell: "{{ docker_bin_dir }}/docker ps -aq | xargs -r docker rm -fv" shell: "{{ docker_bin_dir }}/docker ps -aq | xargs -r docker rm -fv"
tags: [reset_images]
- name: reset | restart docker if needed - name: reset | restart docker if needed
service: name=docker state=restarted service: name=docker state=restarted

2
scripts/gen_tags.sh
View file

@ -2,7 +2,7 @@
#Generate MD formatted tags from roles and cluster yaml files #Generate MD formatted tags from roles and cluster yaml files
printf "|%25s |%9s\n" "Tag name" "Used for" printf "|%25s |%9s\n" "Tag name" "Used for"
echo "|--------------------------|---------" echo "|--------------------------|---------"
tags=$(grep -r tags: . | perl -ne '/tags:\s\[?(([\w\-_]+,?\s?)+)/ && printf "%s ", "$1"'|\ tags=$(grep -Pro 'tags:\s\[.*\]?' . | perl -ne '/tags:\s\[?(([\w\-_]+,?\s?)+)/ && printf "%s ", "$1"'|\
perl -ne 'print join "\n", split /\s|,/' | sort -u) perl -ne 'print join "\n", split /\s|,/' | sort -u)
for tag in $tags; do for tag in $tags; do
match=$(cat docs/ansible.md | perl -ne "/^\|\s+${tag}\s\|\s+((\S+\s?)+)/ && printf \$1") match=$(cat docs/ansible.md | perl -ne "/^\|\s+${tag}\s\|\s+((\S+\s?)+)/ && printf \$1")