Minor Ci cleanups (#78)

* add publishing job to CI * minor CI cleanup
maxhoesel-ansible · Dec 23, 2022 · 5961f5c · 5961f5c
1 parent a91537f
commit 5961f5c
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 13 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,7 +1,7 @@
 version: 2.1
 
 orbs:
-  collection-testing: maxhoesel-ansible/ansible-collection-testing@0.2.1
+  collection-testing: maxhoesel-ansible/ansible-collection-testing@0.3.5
 
 jobs:
   modules-sanity:
@@ -21,17 +21,36 @@ jobs:
       - run:
           command: tests/test-modules-integration
 
+filters: &tagged
+  tags:
+    # Official Semver Regex. Yes, it's LOOOONG
+    only: /^v(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/
+  branches:
+    ignore: /.*/
+
 workflows:
   ci:
     jobs:
       - collection-testing/pre-commit-lint
-      # Uncomment whenever we have modules
-      #- collection-testing/antsibull-docs:
-      #    collection-name: maxhoesel.borgbackup
+      #- collection-testing/antsibull-docs
       - collection-testing/tox-role-scenarios:
-          parallelism: 15
+          parallelism: 8
           resource-class: large
-      # Uncomment whenever we have modules
+      - collection-testing/publish-github:
+          context: collection-publishing
+          filters: *tagged
+          requires:
+            - collection-testing/tox-role-scenarios
+            #- collection-testing/antsibull-docs
+            #- modules-sanity
+            #- modules-integration
+      - collection-testing/publish-galaxy:
+          context: collection-publishing
+          filters: *tagged
+          requires:
+            - collection-testing/tox-role-scenarios
+            #- collection-testing/antsibull-docs
+            #- modules-sanity
+            #- modules-integration
       #- modules-sanity
       #- modules-integration
-# VS Code Extension Version: 1.2.0
diff --git a/roles/borgmatic/molecule/default/molecule.yml b/roles/borgmatic/molecule/default/molecule.yml
@@ -15,20 +15,23 @@ platforms:
     image: "docker.io/geerlingguy/docker-ubuntu2204-ansible"
     override_command: false
     pre_build_image: true
+    systemd: always
 
   - name: borgmatic-ubuntu-20
     groups:
       - ubuntu
     image: "docker.io/geerlingguy/docker-ubuntu2004-ansible"
     override_command: false
     pre_build_image: true
+    systemd: always
 
   - name: borgmatic-debian-11
     groups:
       - debian
     image: "docker.io/geerlingguy/docker-debian11-ansible"
     override_command: false
     pre_build_image: true
+    systemd: always
 
 provisioner:
   name: ansible

diff --git a/tests/test-modules-sanity b/tests/test-modules-sanity
@@ -8,9 +8,8 @@ SCRIPT_DIRECTORY=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null &&
 # shellcheck disable=1091
 source "$SCRIPT_DIRECTORY/constants.sh"
 
-# Uncomment whenever modules are added
-#tox -e sanity -- \
-#    --docker --color -v \
-#    --python "$PYTHON_VERSION" \
-#    `# As we only support py36+, pyupgrade is set to remove the py27 boilerplate. Don't check for that as we don't need it` \
-#    --skip-test metaclass-boilerplate --skip-test future-import-boilerplate
+# As we only support py36+, pyupgrade is set to remove the py27 boilerplate. Don't check for that as we don't need it
+tox -e sanity -- \
+    --docker --color -v \
+    --python "$PYTHON_VERSION" \
+    --skip-test metaclass-boilerplate --skip-test future-import-boilerplate