From eccc16d86e6e19adf5f7771e860ee03227b63dd4 Mon Sep 17 00:00:00 2001
From: Fabian von Feilitzsch <fabian@fabianism.us>
Date: Thu, 20 Aug 2020 12:35:05 -0400
Subject: [PATCH] cleanup, get sanity tests to ignore ci/

---
 ci/incluster_integration.sh  | 12 +++++-------
 tests/sanity/ignore-2.10.txt |  2 ++
 tests/sanity/ignore-2.11.txt |  2 ++
 tests/sanity/ignore-2.9.txt  |  2 ++
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/ci/incluster_integration.sh b/ci/incluster_integration.sh
index 7550a22..8154fa6 100755
--- a/ci/incluster_integration.sh
+++ b/ci/incluster_integration.sh
@@ -35,7 +35,7 @@ spec:
             - make
             - test-integration
       restartPolicy: Never
-  backoffLimit: 3
+  backoffLimit: 2
   completions: 1
   parallelism: 1
 EOF
@@ -53,14 +53,12 @@ completion_pid=$!
 kubectl wait --for=condition=failed job/molecule-integration-test --timeout 5m && exit 1 &
 failure_pid=$!
 
-wait -n $completion_pid $failure_pid
-exit_code=$?
 
-if (( $exit_code == 0 )); then
+if wait -n $completion_pid $failure_pid ; then
   echo "Molecule integration tests ran successfully"
+  exit 0
 else
-  echo "Molecule integration tests failed, see logs for more information..."
   kubectl logs job/molecule-integration-test
+  echo "Molecule integration tests failed, see logs for more information..."
+  exit 1
 fi
-
-exit $exit_code
diff --git a/tests/sanity/ignore-2.10.txt b/tests/sanity/ignore-2.10.txt
index 4880ee6..9e6bee7 100644
--- a/tests/sanity/ignore-2.10.txt
+++ b/tests/sanity/ignore-2.10.txt
@@ -1,2 +1,4 @@
 plugins/modules/k8s.py validate-modules:parameter-type-not-in-doc
 plugins/modules/k8s.py validate-modules:return-syntax-error
+ci/incluster_integration.sh shebang!skip
+ci/incluster_integration.sh shellcheck!skip
diff --git a/tests/sanity/ignore-2.11.txt b/tests/sanity/ignore-2.11.txt
index 4880ee6..9e6bee7 100644
--- a/tests/sanity/ignore-2.11.txt
+++ b/tests/sanity/ignore-2.11.txt
@@ -1,2 +1,4 @@
 plugins/modules/k8s.py validate-modules:parameter-type-not-in-doc
 plugins/modules/k8s.py validate-modules:return-syntax-error
+ci/incluster_integration.sh shebang!skip
+ci/incluster_integration.sh shellcheck!skip
diff --git a/tests/sanity/ignore-2.9.txt b/tests/sanity/ignore-2.9.txt
index bbfafd9..737d1dc 100644
--- a/tests/sanity/ignore-2.9.txt
+++ b/tests/sanity/ignore-2.9.txt
@@ -1 +1,3 @@
 plugins/modules/k8s.py validate-modules:parameter-type-not-in-doc
+ci/incluster_integration.sh shebang!skip
+ci/incluster_integration.sh shellcheck!skip