From 7b259dc86ae2c7a2d2ea498502a0545a182fe761 Mon Sep 17 00:00:00 2001
From: Timo Makinen <tmakinen@foo.sh>
Date: Sun, 30 Jan 2022 02:33:50 +0200
Subject: [PATCH] Add tests and fix structure to prevent errors

---
 deploy.sh                          | 2 +-
 deploy.yml => playbooks/deploy.yml | 4 ++--
 tests/00-selfsanity.sh             | 7 +++++++
 tests/01-yamllint.sh               | 6 ++++++
 tests/02-ansiblelint.sh            | 6 ++++++
 tests/Makefile                     | 4 ++++
 vars.yml => vars/defaults.yml      | 0
 7 files changed, 26 insertions(+), 3 deletions(-)
 rename deploy.yml => playbooks/deploy.yml (97%)
 create mode 100755 tests/00-selfsanity.sh
 create mode 100755 tests/01-yamllint.sh
 create mode 100755 tests/02-ansiblelint.sh
 create mode 100644 tests/Makefile
 rename vars.yml => vars/defaults.yml (100%)

diff --git a/deploy.sh b/deploy.sh
index 652c22c..857ba54 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -30,4 +30,4 @@ if ! rpm -q ansible > /dev/null; then
 fi
 
 # run playbook
-ansible-playbook deploy.yml
+ansible-playbook playbooks/deploy.yml
diff --git a/deploy.yml b/playbooks/deploy.yml
similarity index 97%
rename from deploy.yml
rename to playbooks/deploy.yml
index be08033..2b1fdaa 100644
--- a/deploy.yml
+++ b/playbooks/deploy.yml
@@ -7,7 +7,7 @@
   become_method: sudo
 
   vars_files:
-    - vars.yml
+    - ../vars/defaults.yml
 
   roles:
     - cups
@@ -45,7 +45,7 @@
                 '/dev/null chars=ascii_lowercase,digits length=4'
               )
             }}
-      when: hostname_check.stdout == ""
+      when: not hostname_check.stdout
 
     - name: remove unneeded packages
       ansible.builtin.package:
diff --git a/tests/00-selfsanity.sh b/tests/00-selfsanity.sh
new file mode 100755
index 0000000..504d2df
--- /dev/null
+++ b/tests/00-selfsanity.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -eu
+
+cd "$(dirname "$0")"
+
+find . -maxdepth 1 -type f -name "*.sh" -print0 | xargs -0 -t -n 1 shellcheck --
diff --git a/tests/01-yamllint.sh b/tests/01-yamllint.sh
new file mode 100755
index 0000000..8f0dfe9
--- /dev/null
+++ b/tests/01-yamllint.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+cd "$(dirname "$0")/.." || exit 1
+
+find . -type f -name "*.yml" -not -path "./roles/*" -print0 | \
+    xargs -0 -t -n 1 yamllint -s --
diff --git a/tests/02-ansiblelint.sh b/tests/02-ansiblelint.sh
new file mode 100755
index 0000000..7696e20
--- /dev/null
+++ b/tests/02-ansiblelint.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+cd "$(dirname "$0")/.." || exit 1
+
+find . -name "*.yml" -not -path "./roles/*" -print0 | \
+    xargs -0 -t -n 1 -- ansible-lint -x meta-no-info --
diff --git a/tests/Makefile b/tests/Makefile
new file mode 100644
index 0000000..ad6107f
--- /dev/null
+++ b/tests/Makefile
@@ -0,0 +1,4 @@
+.PHONY = all
+
+all:
+	@for x in *.sh ; do sh "$$x" || exit 1 ; done
diff --git a/vars.yml b/vars/defaults.yml
similarity index 100%
rename from vars.yml
rename to vars/defaults.yml