Fixup build

Update skeleton files to make the build go brrrrr.

Signed-off-by: SuperQ <superq@gmail.com>

.circleci/config.yml

@@ -4,7 +4,7 @@ version: 2.1
 executors:
   python:
     docker:
-      - image: cimg/python:3.9
+      - image: cimg/python:3.10
   publisher:
     docker:
       - image: quay.io/cloudalchemy/publisher:latest
@@ -15,7 +15,6 @@ jobs:
     steps:
       - checkout
       - run: pip install ansible ansible-lint yamllint flake8
-      - run: mkdir -p .cache/roles && ln -s ../.. .cache/roles/${CIRCLE_PROJECT_REPONAME}
       - run: ansible-lint
       - run: yamllint .
       - run: flake8
@@ -25,25 +24,21 @@ jobs:
     parameters:
       ansible:
         type: string
+      scenario:
+        type: string
     steps:
       - checkout
       - setup_remote_docker
-      - run: ln -s ~/project ~/${CIRCLE_PROJECT_REPONAME}
-      - run: pip install "ansible~=<<parameters.ansible >>.0"
+      - run: pip install "ansible~=<< parameters.ansible >>.0"
       - run: pip install -r test-requirements.txt
-      - run: molecule test -s default --destroy always
-      - run: |
-         if [[ -d 'molecule/alternative' ]]; then
-           molecule test -s alternative --destroy always
-         else
-           echo 'No alternative test'
-         fi
-      - run: |
-         if [[ -z "${CIRCLE_PULL_REQUEST}" ]] && [[ -d 'molecule/latest' ]]; then
-           molecule test -s latest --destroy always
-         else
-           echo 'Not running latest on PR'
-         fi
+      - run:
+          no_output_timeout: 60m
+          command: |
+            if [[ -n "${CIRCLE_PULL_REQUEST}" ]] && [[ '<< parameters.scenario >>' == 'latest' ]]; then
+              echo 'Not running latest on PR'
+            else
+              molecule test -s '<< parameters.scenario >>' --destroy always
+            fi
   release:
     executor: publisher
     steps:
@@ -74,6 +69,12 @@ workflows:
               ansible:
                 - "2.9"
                 - "2.10"
+                - "4.10"
+                - "5.1"
+              scenario:
+                - default
+                - alternative
+                - latest
           filters:
             tags:
               only: /.*/

.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

meta/main.yml

@@ -1,8 +1,8 @@
 ---
 galaxy_info:
-  author: Pawel Krupa, Ben Kochie
-  description: CoreDNS installation
+  author: cloudalchemy
   role_name: coredns
+  description: CoreDNS installation
   license: MIT
   company: none
   min_ansible_version: 2.7

molecule/alternative/playbook.yml

@@ -3,7 +3,7 @@
   hosts: all
   any_errors_fatal: true
   roles:
-    - ansible-coredns
+    - cloudalchemy.coredns
   vars:
     coredns_binary_local_dir: "/tmp"
     coredns_config_file: "Corefile.example.j2"

molecule/default/playbook.yml

@@ -2,6 +2,6 @@
 - hosts: all
   any_errors_fatal: true
   roles:
-    - ansible-coredns
+    - cloudalchemy.coredns
   vars:
     coredns_config_file: "Corefile.example.j2"

test-requirements.txt

@@ -1,4 +1,6 @@
-molecule>=3.0.0
+# temporarily lock versions of molecule and ansible-compat to avoid a bug:
+ansible-compat==0.5.0
+molecule==3.5.2
 molecule-docker
 docker
 ansible-lint>=3.4.0