From 2026f1825bb12b8460d40061f29208e5a4d15581 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Mon, 20 Apr 2020 13:47:51 +0200 Subject: [PATCH] Use main.yaml, not .yml There are over 490 .yaml files but only a few .yml, let's rename to be consistent. Add a test to block .yml files. Change-Id: I2f1354de82f231154d926b51d9812b1e9c1a6202 --- roles/add-build-sshkey/vars/{main.yml => main.yaml} | 0 roles/copy-build-sshkey/vars/{main.yml => main.yaml} | 0 roles/ensure-docker/handlers/{main.yml => main.yaml} | 0 roles/ensure-tox/defaults/{main.yml => main.yaml} | 0 roles/remove-build-sshkey/tasks/{main.yml => main.yaml} | 0 roles/remove-build-sshkey/vars/{main.yml => main.yaml} | 0 tox.ini | 2 ++ 7 files changed, 2 insertions(+) rename roles/add-build-sshkey/vars/{main.yml => main.yaml} (100%) rename roles/copy-build-sshkey/vars/{main.yml => main.yaml} (100%) rename roles/ensure-docker/handlers/{main.yml => main.yaml} (100%) rename roles/ensure-tox/defaults/{main.yml => main.yaml} (100%) rename roles/remove-build-sshkey/tasks/{main.yml => main.yaml} (100%) rename roles/remove-build-sshkey/vars/{main.yml => main.yaml} (100%) diff --git a/roles/add-build-sshkey/vars/main.yml b/roles/add-build-sshkey/vars/main.yaml similarity index 100% rename from roles/add-build-sshkey/vars/main.yml rename to roles/add-build-sshkey/vars/main.yaml diff --git a/roles/copy-build-sshkey/vars/main.yml b/roles/copy-build-sshkey/vars/main.yaml similarity index 100% rename from roles/copy-build-sshkey/vars/main.yml rename to roles/copy-build-sshkey/vars/main.yaml diff --git a/roles/ensure-docker/handlers/main.yml b/roles/ensure-docker/handlers/main.yaml similarity index 100% rename from roles/ensure-docker/handlers/main.yml rename to roles/ensure-docker/handlers/main.yaml diff --git a/roles/ensure-tox/defaults/main.yml b/roles/ensure-tox/defaults/main.yaml similarity index 100% rename from roles/ensure-tox/defaults/main.yml rename to roles/ensure-tox/defaults/main.yaml diff --git a/roles/remove-build-sshkey/tasks/main.yml b/roles/remove-build-sshkey/tasks/main.yaml similarity index 100% rename from roles/remove-build-sshkey/tasks/main.yml rename to roles/remove-build-sshkey/tasks/main.yaml diff --git a/roles/remove-build-sshkey/vars/main.yml b/roles/remove-build-sshkey/vars/main.yaml similarity index 100% rename from roles/remove-build-sshkey/vars/main.yml rename to roles/remove-build-sshkey/vars/main.yaml diff --git a/tox.ini b/tox.ini index b10fad675..662b8e116 100644 --- a/tox.ini +++ b/tox.ini @@ -48,6 +48,8 @@ commands = ansible-playbook --syntax-check -i {toxinidir}/tests/inventory \{\} + > /dev/null" {toxinidir}/tools/check_jobs_documented.py {toxinidir}/tools/update-test-platforms.py + bash -c "(( $(find playbooks -name *.yml | wc -l) == 0)) || \{ echo 'Use .yaml'; exit 1; \}" + bash -c "(( $(find roles -name *.yml | wc -l) == 0)) || \{ echo 'Use .yaml'; exit 1; \}" bash -c "git diff --quiet || \{ echo 'ERROR: git in dirty status, reporting as failure'; exit 1; \}" [testenv:venv]