From 3bd0ca74f49d41706b40acb565d49851cc231520 Mon Sep 17 00:00:00 2001
From: cloudalchemybot <cloudalchemybot@gmail.com>
Date: Fri, 30 Sep 2022 14:22:40 +0000
Subject: [PATCH] :robot: sync with cloudalchemy/skeleton (SHA: fc18c382):
ansible-lint 5+ fixes (#13)
---
.circleci/config.yml | 8 ++++++--
.mergify.yml | 33 ++++++++++++++++++++++++++-------
README.md | 4 ++--
test-requirements.txt | 5 ++++-
4 files changed, 38 insertions(+), 12 deletions(-)
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1c7ecb5..12fc8a2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -5,6 +5,10 @@ executors:
python:
docker:
- image: cimg/python:3.10
+ python_large:
+ docker:
+ - image: cimg/python:3.9
+ resource_class: large
publisher:
docker:
- image: quay.io/cloudalchemy/publisher:latest
@@ -15,12 +19,12 @@ jobs:
steps:
- checkout
- run: pip install ansible ansible-lint yamllint flake8
- - run: ansible-lint
+ - run: ansible-lint .
- run: yamllint .
- run: flake8
test:
- executor: python
+ executor: python_large
parameters:
ansible:
type: string
diff --git a/.mergify.yml b/.mergify.yml
index b739105..4cd4c01 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,16 +1,35 @@
---
+queue_rules:
+ - name: default
+ conditions:
+ # These need to stay in sync with auto-maintenance/.github/settings.yml.
+ - "check-success=/circleci: lint"
+ - "check-success=/circleci: test-2.9-default"
+ - "check-success=/circleci: test-2.9-alternative"
+ - "check-success=/circleci: test-2.10-default"
+ - "check-success=/circleci: test-2.10-alternative"
+ - "check-success=/circleci: test-4.10-default"
+ - "check-success=/circleci: test-4.10-alternative"
+ - "check-success=/circleci: test-5.1-default"
+ - "check-success=/circleci: test-5.1-alternative"
+
pull_request_rules:
- name: automatic merge and new release from cloudalchemybot
conditions:
- - "status-success=Travis CI - Pull Request"
- status-success=WIP
- head~=autoupdate|skeleton
- author=cloudalchemybot
+ # These need to stay in sync with auto-maintenance/.github/settings.yml.
+ - "check-success=/circleci: lint"
+ - "check-success=/circleci: test-2.9-default"
+ - "check-success=/circleci: test-2.9-alternative"
+ - "check-success=/circleci: test-2.10-default"
+ - "check-success=/circleci: test-2.10-alternative"
+ - "check-success=/circleci: test-4.10-default"
+ - "check-success=/circleci: test-4.10-alternative"
+ - "check-success=/circleci: test-5.1-default"
+ - "check-success=/circleci: test-5.1-alternative"
actions:
- merge:
+ queue:
method: squash
- strict: true
- - name: delete head branch after merge
- conditions: []
- actions:
- delete_head_branch: {}
+ name: default
diff --git a/README.md b/README.md
index f8a8e8a..c04f77d 100644
--- a/README.md
+++ b/README.md
@@ -85,11 +85,11 @@ We provide an example site that demonstrates a full monitoring solution based on
## Local Testing
-The preferred way of locally testing the role is to use Docker and [molecule](https://github.com/ansible-community/molecule) (v3.x). You will have to install Docker on your system. See "Get started" for a Docker package suitable for your system. Running your tests is as simple as executing `molecule test`.
+The preferred way of locally testing the role is to use Docker and [molecule](https://github.com/ansible-community/molecule) (v3.x). You will have to install Docker on your system. See "Get started" for a Docker package suitable to for your system. Running your tests is as simple as executing `molecule test`.
## Continuous Integration
-Combining molecule and circle CI allows us to test how new PRs will behave when used with multiple ansible versions and multiple operating systems. This also allows use to create test scenarios for different role configurations. As a result we have quite a large test matrix which can take more time than local testing, so please be patient.
+Combining molecule and circle CI allows us to test how new PRs will behave when used with multiple ansible versions and multiple operating systems. This also allows use to create test scenarios for different role configurations. As a result we have a quite large test matrix which can take more time than local testing, so please be patient.
## Contributing
diff --git a/test-requirements.txt b/test-requirements.txt
index 1b6e9a9..3cd7124 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,4 +1,7 @@
-molecule>=3.0.0
+# temporarily lock versions of molecule and ansible-compat to avoid a bug:
+# https://github.com/ansible-community/ansible-compat/issues/114
+ansible-compat==0.5.0
+molecule==3.5.2
molecule-docker
docker
ansible-lint>=3.4.0
--
GitLab