Adjust CircleCI config to make it work on cisco-en-programmability

.circleci/config.yml

@@ -79,7 +79,7 @@ jobs:
   pre:
     docker:
       - image: python:3.8.10
-    resource_class: cisco-en-programmability/dnacenter-ansible
+    resource_class: cisco-en-programmability/catalyst-center-ansible-runner-main
 
     steps:
       - run:
@@ -93,7 +93,7 @@ jobs:
   build:
     docker:
       - image: python:3.8.10
-    resource_class: cisco-en-programmability/dnacenter-ansible
+    resource_class: cisco-en-programmability/catalyst-center-ansible-runner-main
     steps:
       - run:
           name: Debug information
@@ -145,7 +145,7 @@ jobs:
         default: false
     docker:
       - image: python:3.8.10
-    resource_class: cisco-en-programmability/dnacenter-ansible
+    resource_class: cisco-en-programmability/catalyst-center-ansible-runner-main
 
     steps:
       - run:
@@ -269,7 +269,7 @@ jobs:
   sanity-tests:
     docker:
       - image: python:3.8.10
-    resource_class: cisco-en-programmability/dnacenter-ansible
+    resource_class: cisco-en-programmability/catalyst-center-ansible-runner-main
     parallelism: 4
     steps:
       - when:
@@ -343,8 +343,16 @@ jobs:
             chmod 600 ~/id_ssh
             export NO_PROXY=""
             export no_proxy=""
-            ssh $LOGS_MACHINE -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i ~/id_ssh mkdir -p /var/www/html/madhan-logs/$CIRCLE_BUILD_NUM
-            scp -i ~/id_ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null sanity_tests_logs_$CIRCLE_NODE_INDEX $LOGS_MACHINE:/var/www/html/madhan-logs/$CIRCLE_BUILD_NUM
+            ssh $LOGS_MACHINE \
+              -o StrictHostKeyChecking=no \
+              -o UserKnownHostsFile=/dev/null \
+              -i ~/id_ssh \
+              mkdir -p /var/www/html/madhan-logs/$CIRCLE_BUILD_NUM
+            scp \
+              -i ~/id_ssh \
+              -o StrictHostKeyChecking=no \
+              -o UserKnownHostsFile=/dev/null \
+              sanity_tests_logs_$CIRCLE_NODE_INDEX $LOGS_MACHINE:/var/www/html/madhan-logs/$CIRCLE_BUILD_NUM
             echo "LOGS URL: http://10.195.243.37/madhan-logs/$CIRCLE_BUILD_NUM/sanity_tests_logs_$CIRCLE_NODE_INDEX"
             if [[ $(cat rc) != "0" ]]; then exit 1; fi
 
@@ -353,7 +361,7 @@ jobs:
   post_pnp_testing:
     docker:
       - image: python:3.8.10
-    resource_class: cisco-en-programmability/dnacenter-ansible
+    resource_class: cisco-en-programmability/catalyst-center-ansible-runner-main
 
     steps:
       - when:
@@ -366,7 +374,7 @@ jobs:
   main-pr:
     docker:
       - image: maniator/gh:v2.49.2
-    resource_class: cisco-en-programmability/dnacenter-ansible
+    resource_class: cisco-en-programmability/catalyst-center-ansible-runner-main
     steps:
       - run:
           name: Clone repo to workspace
@@ -375,12 +383,16 @@ jobs:
           name: Create release pr to main
           command: |
             gh repo set-default $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME
-            gh pr create --base main --head $CIRCLE_BRANCH --title "Release v<< pipeline.parameters.ansible_cisco_dnac_version >>" --body "Release v<< pipeline.parameters.ansible_cisco_dnac_version >>"
+            gh pr create \
+              --base main \
+              --head $CIRCLE_BRANCH \
+              --title "Release v<< pipeline.parameters.ansible_cisco_dnac_version >>" \
+              --body "Release v<< pipeline.parameters.ansible_cisco_dnac_version >>"
 
   release-job:
     docker:
       - image: python:3.8.10
-    resource_class: cisco-en-programmability/dnacenter-ansible
+    resource_class: cisco-en-programmability/catalyst-center-ansible-runner-main
     steps:
       - run:
           name: Clone repo to workspace
@@ -396,8 +408,12 @@ jobs:
       #       - "KEY_FINGERPRINT"
       - run:
           echo create release
-          # git tag -a v<< pipeline.parameters.ansible_cisco_dnac_version >> -m "Ansible DNACCollection Version v<< pipeline.parameters.ansible_cisco_dnac_version >>"
-          # gh release create "v<< pipeline.parameters.ansible_cisco_dnac_version >>" --title "DNAC Collection Version v<< pipeline.parameters.ansible_cisco_dnac_version >>" --latest
+          # git tag \
+          #   -a v<< pipeline.parameters.ansible_cisco_dnac_version >> \
+          #   -m "Ansible DNACCollection Version v<< pipeline.parameters.ansible_cisco_dnac_version >>"
+          # gh release create "v<< pipeline.parameters.ansible_cisco_dnac_version >>" \
+          #   --title "DNAC Collection Version v<< pipeline.parameters.ansible_cisco_dnac_version >>" \
+          #   --latest
           # ansible-galaxy collection publish workspace/*.tar.gz --api-key=$GALAXYKEY
 
 workflows:
@@ -406,9 +422,9 @@ workflows:
     when:
       and:
         - or:
-          - equal: [run-tests, << pipeline.parameters.GHA_Meta >>]
-          # - equal: [true, << pipeline.parameters.run-setup >>]
-          - not: << pipeline.parameters.continued >>
+            - equal: [run-tests, << pipeline.parameters.GHA_Meta >>]
+            # - equal: [true, << pipeline.parameters.run-setup >>]
+            - not: << pipeline.parameters.continued >>
     jobs:
       - pre
 
@@ -515,4 +531,4 @@ workflows:
             - build
           context:
             - gh-token
-            - galaxy-token
+            - galaxy-token

.github/workflows/automerge.yml

@@ -22,4 +22,4 @@ jobs:
           merge-method: rebase
           do-not-merge-labels: never-merge
 #          pull-request: ${{ github.event.inputs.pull-request }}
-          dry-run: false
+          dry-run: false

.github/workflows/docs.yml

@@ -31,7 +31,9 @@ jobs:
           rm -rf $(basename ${GITHUB_REF})
           mv docs/_build/html $(basename ${GITHUB_REF})
           git show origin/main:docs/_gh_include/header.inc > index.html
-          (echo main; dirname v*/index.html | sort --version-sort --reverse) | xargs -I@@ -n1 echo '<div class="col-md-4 center"><a href="@@/" class="btn-doc btn"><i class="fa fa-newspaper-o"></i><p>@@</p></a></div>' >> index.html
+          (echo main; dirname v*/index.html | sort --version-sort --reverse) \
+            | xargs -I@@ \
+            -n1 echo '<div class="col-md-4 center"><a href="@@/" class="btn-doc btn"><i class="fa fa-newspaper-o"></i><p>@@</p></a></div>' >> index.html
           git show origin/main:docs/_gh_include/footer.inc >> index.html
           git add $(basename ${GITHUB_REF}) index.html
           git commit -m "update docs for $(basename ${GITHUB_REF})" || true

.github/workflows/integration_tests.yml

@@ -8,15 +8,15 @@ jobs:
     runs-on: ubuntu-20.04
     if: github.event.workflow_run.conclusion == 'success'
     steps:
-        - uses: actions/download-artifact@v4
-          with:
-            name: github_ref-${{ github.event.workflow_run.id }}
-            run-id: ${{ github.event.workflow_run.id }}
-            github-token: ${{ secrets.GITHUB_TOKEN }}
-        - name: Trigger circleci
-          run: |
-             printf '{"branch": "%s" ,"parameters": {"GHA_Meta":"run-tests"}}' $(cat github_ref) > req_body
-             curl -X POST --location "https://circleci.com/api/v2/project/gh/${{ github.repository }}/pipeline" \
-                -H "Content-Type: application/json" \
-                -H "Circle-Token: ${{ secrets.CCI_TOKEN }}" \
-                -d "@req_body"
+      - uses: actions/download-artifact@v4
+        with:
+          name: github_ref-${{ github.event.workflow_run.id }}
+          run-id: ${{ github.event.workflow_run.id }}
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Trigger circleci
+        run: |
+            printf '{"branch": "%s" ,"parameters": {"GHA_Meta":"run-tests"}}' $(cat github_ref) > req_body
+            curl -X POST --location "https://circleci.com/api/v2/project/gh/${{ github.repository }}/pipeline" \
+              -H "Content-Type: application/json" \
+              -H "Circle-Token: ${{ secrets.CCI_TOKEN }}" \
+              -d "@req_body"

.github/workflows/main.yml

@@ -12,4 +12,4 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: github_ref-${{ github.run_id }}
-          path: github_ref
+          path: github_ref

.github/workflows/release-prep.yml

@@ -3,7 +3,7 @@
 #   push:
 #     branches:
 #       - '**-rc'
-      
+
 # jobs:
 #   trigger-circleci:
 #     runs-on: ubuntu-20.04
@@ -14,4 +14,4 @@
 #         with:
 #           GHA_Meta: "run-release-prep"
 #         env:
-#           CCI_TOKEN: ${{ secrets.CCI_TOKEN }}
+#           CCI_TOKEN: ${{ secrets.CCI_TOKEN }}

.github/workflows/release.yml

@@ -13,4 +13,4 @@
 #         with:
 #           GHA_Meta: "run-release"
 #         env:
-#           CCI_TOKEN: ${{ secrets.CCI_TOKEN }}
+#           CCI_TOKEN: ${{ secrets.CCI_TOKEN }}

.github/workflows/sanity_tests.yml

@@ -1,14 +1,13 @@
 name: CI
 on:
   push:
-    branches: [ main ]
-  pull_request:
+    branches: [main]
   schedule:
     - cron: '0 6 * * *'
   workflow_dispatch:
 env:
   NAMESPACE: cisco
-  COLLECTION_NAME: dnac 
+  COLLECTION_NAME: dnac
 jobs:
   # https://docs.ansible.com/ansible/latest/reference_appendices/release_and_maintenance.html#ansible-core-support-matrix
   # 2.14 supports Python 3.9-3.11
@@ -44,3 +43,7 @@ jobs:
       - name: Run sanity tests
         run: ansible-test sanity --docker -v --color
         working-directory: ./ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
+      - name: Install yamllint
+        run: pip install --user yamllint
+      - name: Rum yamllint
+        run: yamllint -c .yamllint.yml .

.github/workflows/sanity_tests_devel.yml

@@ -1,9 +1,10 @@
 name: CI Devel
 on:
   workflow_dispatch:
+  pull_request:
 env:
   NAMESPACE: cisco
-  COLLECTION_NAME: dnac 
+  COLLECTION_NAME: dnac
 jobs:
   sanity:
     name: Sanity (Ⓐ${{ matrix.ansible }})
@@ -30,3 +31,7 @@ jobs:
       - name: Run sanity tests
         run: ansible-test sanity --docker -v --color
         working-directory: ./ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
+      - name: Install yamllint
+        run: pip install --user yamllint
+      - name: Rum yamllint
+        run: yamllint -c .yamllint.yml .

.yamllint.yml

@@ -0,0 +1,10 @@
+---
+extends: default
+rules:
+  line-length:
+    max: 160
+ignore:
+  - tests
+  - changelogs/changelog.yaml
+  - playbooks
+level: warning

meta/runtime.yml

@@ -1,2 +1,2 @@
 ---
-requires_ansible: '>=2.15.0'
+requires_ansible: '>=2.15.0'

plugins/module_utils/exceptions.py

@@ -11,3 +11,4 @@ class AnsibleDNACException(Exception):
 class InconsistentParameters(AnsibleDNACException):
     """Provided parameters are not consistent."""
     pass
+

run_tests.sh

@@ -21,4 +21,4 @@ do
     echo "    - $role" >> ccc_test_roles.yml
 done
 
-ansible-playbook -i hosts ccc_test_roles.yml > "sanity_tests_logs_$CIRCLE_NODE_INDEX"
+ansible-playbook -i hosts ccc_test_roles.yml #> "sanity_tests_logs_$CIRCLE_NODE_INDEX"