From 67082ccafe7d8a5b58d17367f9422be0e869b4d3 Mon Sep 17 00:00:00 2001 From: Sergei Antipov Date: Mon, 26 Feb 2018 16:07:56 +0700 Subject: [PATCH] Idempotence tests returned back --- meta/main.yml | 5 +++-- tests/scripts/test.sh | 26 +++++++++++++------------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/meta/main.yml b/meta/main.yml index ab3dd94a..cb124304 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -11,11 +11,12 @@ galaxy_info: platforms: - name: Ubuntu versions: - - precise - trusty + - xenial - name: Debian versions: - - wheezy + - jessie + - stretch - name: EL versions: - 6 diff --git a/tests/scripts/test.sh b/tests/scripts/test.sh index fa03cb22..e5f1bdf4 100644 --- a/tests/scripts/test.sh +++ b/tests/scripts/test.sh @@ -2,7 +2,7 @@ # -*- mode: sh; -*- # File: test.sh -# Time-stamp: <2018-02-23 00:52:02> +# Time-stamp: <2018-02-26 16:04:24> # Copyright (C) 2018 Sergei Antipov # Description: @@ -14,9 +14,9 @@ set -o errexit echo "ansible-playbook -i tests/hosts tests/site.yml -e target=mongo1 -e mongodb_version=${MONGODB_VERSION} -e image_name=${DISTRIBUTION}:${DIST_VERSION}" ansible-playbook -i tests/hosts tests/site.yml -e target=mongo1 -e mongodb_version=${MONGODB_VERSION} -e image_name=${DISTRIBUTION}:${DIST_VERSION} # Idempotence test -#ansible-playbook -i tests/hosts tests/site.yml -e target=mongo1 -e mongodb_version=${MONGODB_VERSION} -e image_name=${DISTRIBUTION}:${DIST_VERSION} | \ -# grep -q 'changed=0.*failed=0' && \ -# (echo 'Idempotence test: pass' && exit 0) || (echo 'Idempotence test: fail' && exit 1) +ansible-playbook -i tests/hosts tests/site.yml -e target=mongo1 -e mongodb_version=${MONGODB_VERSION} -e image_name=${DISTRIBUTION}:${DIST_VERSION} | \ + grep -q 'changed=0.*failed=0' && \ + (echo 'Idempotence test: pass' && exit 0) || (echo 'Idempotence test: fail' && exit 1) # Delete all containers docker kill mongo{1,2,3} && docker rm mongo{1,2,3} @@ -24,9 +24,9 @@ docker kill mongo{1,2,3} && docker rm mongo{1,2,3} echo "ansible-playbook -i tests/hosts tests/site.yml -e target=mongo1 -e image_name=${DISTRIBUTION}:${DIST_VERSION} -e mongodb_version=${MONGODB_VERSION} -e mongodb_security_authorization='enabled'" ansible-playbook -i tests/hosts tests/site.yml -e target=mongo1 -e image_name=${DISTRIBUTION}:${DIST_VERSION} -e mongodb_version=${MONGODB_VERSION} -e mongodb_security_authorization='enabled' # Idempotence test -#ansible-playbook -i tests/hosts tests/site.yml -e target=mongo1 -e image_name=${DISTRIBUTION}:${DIST_VERSION} -e mongodb_version=${MONGODB_VERSION} -e mongodb_security_authorization='enabled' \ -# | grep -q 'changed=0.*failed=0' \ -# && (echo 'Idempotence test: pass' && exit 0) || (echo 'Idempotence test: fail' && exit 1) +ansible-playbook -i tests/hosts tests/site.yml -e target=mongo1 -e image_name=${DISTRIBUTION}:${DIST_VERSION} -e mongodb_version=${MONGODB_VERSION} -e mongodb_security_authorization='enabled' \ + | grep -q 'changed=0.*failed=0' \ + && (echo 'Idempotence test: pass' && exit 0) || (echo 'Idempotence test: fail' && exit 1) # Delete all containers docker kill mongo{1,2,3} && docker rm mongo{1,2,3} @@ -34,9 +34,9 @@ docker kill mongo{1,2,3} && docker rm mongo{1,2,3} echo "ansible-playbook -i tests/hosts tests/site.yml -e target=mongo -e image_name=${DISTRIBUTION}:${DIST_VERSION} -e mongodb_version=${MONGODB_VERSION} -e mongodb_replication_replset='testrs'" ansible-playbook -i tests/hosts tests/site.yml -e target=mongo -e image_name=${DISTRIBUTION}:${DIST_VERSION} -e mongodb_version=${MONGODB_VERSION} -e mongodb_replication_replset='testrs' # Idempotence test -#ansible-playbook -i tests/hosts tests/site.yml -e target=mongo -e image_name=${DISTRIBUTION}:${DIST_VERSION} -e mongodb_version=${MONGODB_VERSION} -e mongodb_replication_replset='testrs' \ -# | grep -q 'changed=0.*failed=0' \ -# && (echo 'Idempotence test: pass' && exit 0) || (echo 'Idempotence test: fail' && exit 1) +ansible-playbook -i tests/hosts tests/site.yml -e target=mongo -e image_name=${DISTRIBUTION}:${DIST_VERSION} -e mongodb_version=${MONGODB_VERSION} -e mongodb_replication_replset='testrs' \ + | grep -q 'changed=0.*failed=0' \ + && (echo 'Idempotence test: pass' && exit 0) || (echo 'Idempotence test: fail' && exit 1) # Delete all containers docker kill mongo{1,2,3} && docker rm mongo{1,2,3} @@ -44,6 +44,6 @@ docker kill mongo{1,2,3} && docker rm mongo{1,2,3} echo "ansible-playbook -i tests/hosts tests/site.yml -e target=mongo -e image_name=${DISTRIBUTION}:${DIST_VERSION} -e mongodb_version=${MONGODB_VERSION} -e mongodb_replication_replset='testrs' -e mongodb_security_authorization='enabled'" ansible-playbook -i tests/hosts tests/site.yml -e target=mongo -e image_name=${DISTRIBUTION}:${DIST_VERSION} -e mongodb_version=${MONGODB_VERSION} -e mongodb_replication_replset='testrs' -e mongodb_security_authorization='enabled' # Idempotence test -#ansible-playbook -i tests/hosts tests/site.yml -e target=mongo -e image_name=${DISTRIBUTION}:${DIST_VERSION} -e mongodb_version=${MONGODB_VERSION} -e mongodb_replication_replset='testrs' -e mongodb_security_authorization='enabled' \ -# | grep -q 'changed=0.*failed=0' \ -# && (echo 'Idempotence test: pass' && exit 0) || (echo 'Idempotence test: fail' && exit 1) +ansible-playbook -i tests/hosts tests/site.yml -e target=mongo -e image_name=${DISTRIBUTION}:${DIST_VERSION} -e mongodb_version=${MONGODB_VERSION} -e mongodb_replication_replset='testrs' -e mongodb_security_authorization='enabled' \ + | grep -q 'changed=0.*failed=0' \ + && (echo 'Idempotence test: pass' && exit 0) || (echo 'Idempotence test: fail' && exit 1)