From c64e749a8f8d2c48059fcc11b1a2f633030a7982 Mon Sep 17 00:00:00 2001
From: Chris Croome <chris@webarchitects.co.uk>
Date: Tue, 16 Nov 2021 15:57:44 +0000
Subject: [PATCH] Linting updated
---
.gitlab-ci.yml | 3 +--
molecule/default/molecule.yml | 7 ++++---
tasks/checks.yml | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 51a54c9..1d636c3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,5 @@
---
-image: registry.git.coop/webarch/containers/images/ansible:0.7.0
+image: registry.git.coop/webarch/containers/images/ansible:0.8.0
variables:
PY_COLORS: "1"
ANSIBLE_FORCE_COLOR: "1"
@@ -10,7 +10,6 @@ stages:
lint:
stage: lint
script:
- - yamllint .
- molecule lint
# vim: syntax=yaml
...
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index f29aeee..b27fbc3 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -3,13 +3,14 @@ dependency:
name: galaxy
platforms:
- name: instance
- image: registry.git.coop/webarch/containers/images/ansible:0.5.0
+ image: registry.git.coop/webarch/containers/images/ansible:0.8.0
pre_build_image: true
provisioner:
name: ansible
lint: |
- set -e
- yamllint -c .yamllint .
+ set -e
+ find -type f -name '*.j2' -exec ansiblej2lint.py {} +
+ yamllint -f colored -c .yamllint .
ansible-lint -c .ansible-lint --force-color .
# vim: syntax=yaml
...
diff --git a/tasks/checks.yml b/tasks/checks.yml
index 1a816da..8514337 100644
--- a/tasks/checks.yml
+++ b/tasks/checks.yml
@@ -193,7 +193,7 @@
- name: Check PHP version
block:
- - name: Run phpquery to get the PHP version NOTE that currently having one one version installed is supported
+ - name: Run phpquery to get the PHP version NOTE that currently having only one PHP version installed is supported
command: phpquery -V
args:
strip_empty_ends: true
--
GitLab