From 17e04fb576cbdf43ab43969a199d91c6eb58d2a5 Mon Sep 17 00:00:00 2001
From: Paul Belanger <pabelanger@redhat.com>
Date: Fri, 8 Mar 2019 10:10:34 -0500
Subject: [PATCH] Switch to yamllint for tox -elinters

It was a lot of overhead, with little gain, to run molecule lint.
Switch back to just using yamllint.

Change-Id: Ie4e4d5d77dcb864f7b76cd356cab7adf9516d1b3
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
---
 .yamllint                     | 3 +++
 tests/collect-logs.yaml       | 3 ++-
 tests/playbooks/pre.yaml      | 3 ++-
 tests/playbooks/run-post.yaml | 1 +
 tox.ini                       | 2 +-
 5 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.yamllint b/.yamllint
index a4d53d6..2ceb272 100644
--- a/.yamllint
+++ b/.yamllint
@@ -1,5 +1,8 @@
 extends: default
 
+ignore: |
+  .tox
+
 rules:
   braces:
     max-spaces-inside: 1
diff --git a/tests/collect-logs.yaml b/tests/collect-logs.yaml
index 56cf33d..fcbad80 100644
--- a/tests/collect-logs.yaml
+++ b/tests/collect-logs.yaml
@@ -1,3 +1,4 @@
+---
 - hosts: all
   tasks:
     - name: Ensure journald logs directory exists
@@ -23,7 +24,7 @@
         - "{{ ansible_user_dir }}/{{ zuul.project.src_dir }}/junit.xml"
 
     - name: Prepare nodepool log files
-      become: yes
+      become: true
       synchronize:
         dest: "{{ zuul_output_dir }}/logs/logs"
         rsync_opts:
diff --git a/tests/playbooks/pre.yaml b/tests/playbooks/pre.yaml
index 1237d83..25d7d32 100644
--- a/tests/playbooks/pre.yaml
+++ b/tests/playbooks/pre.yaml
@@ -1,3 +1,4 @@
+---
 - hosts: all
   tasks:
     # TODO(pabelanger): Remove once this lands in our base job in
@@ -7,7 +8,7 @@
         name: ensure-output-dirs
 
     - name: Disable extra wheels mirror
-      become: yes
+      become: true
       lineinfile:
         dest: /etc/pip.conf
         regexp: ^extra-index-url
diff --git a/tests/playbooks/run-post.yaml b/tests/playbooks/run-post.yaml
index 7988287..5779908 100644
--- a/tests/playbooks/run-post.yaml
+++ b/tests/playbooks/run-post.yaml
@@ -1,3 +1,4 @@
+---
 - hosts: all
   tasks:
     - name: Run testinfra validation
diff --git a/tox.ini b/tox.ini
index 07b53ec..8f19d8c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -33,7 +33,7 @@ exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build
 
 [testenv:linters]
 commands =
-  molecule lint
+  yamllint -s .
 
 [testenv:molecule]
 sitepackages = True