From 1daeb9c62cda1d1c21b462dbad69ee79eb5c8107 Mon Sep 17 00:00:00 2001
From: Musee Ullah <lae@lae.is>
Date: Wed, 4 Nov 2020 23:01:57 -0600
Subject: [PATCH 1/2] Fix idempotency test false positive on partial failures

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ed7e497..7400350 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -41,8 +41,8 @@ script:
 - ansible-playbook -i inventory deploy.yml
 - 'ANSIBLE_STDOUT_CALLBACK=debug ANSIBLE_DISPLAY_SKIPPED_HOSTS=no ANSIBLE_DISPLAY_OK_HOSTS=no
   unbuffer ansible-playbook -vvi inventory deploy.yml &>play.log; printf "Idempotence: ";
-  grep -A1 "PLAY RECAP" play.log | grep -qP "changed=0 .*failed=0 .*"
-  && (echo "PASS"; exit 0) || (echo "FAIL"; cat play.log; exit 1)'
+  sed -ne "/PLAY RECAP/,/^$/{/PLAY RECAP/d;/^$/d;p}" /tmp/h | grep -vqP "changed=0 .*failed=0 .*"
+  && (echo "FAIL"; cat play.log; exit 1) || (echo "PASS"; exit 0)'
 - ANSIBLE_STDOUT_CALLBACK=debug ansible-playbook -i inventory -v test.yml
 notifications:
   webhooks:

From dc6440b2af6e284edd716d587531e3b908bdcb05 Mon Sep 17 00:00:00 2001
From: Musee Ullah <lae@lae.is>
Date: Wed, 4 Nov 2020 23:02:26 -0600
Subject: [PATCH 2/2] Test Ansible 2.10 in CI

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 7400350..712e657 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,7 @@ services:
 addons:
   postgresql: "9.6"
 env:
-- ANSIBLE_VERSION='~=2.9.0'
+- ANSIBLE_VERSION='~=2.10.0'
 matrix:
   fast_finish: true
 # FIXME: Ansible 2.10.x going through major restructuring.