Merge branch 'devel' into samplePRBranch

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -64,7 +64,7 @@ body:
     id: terms
     attributes:
       label: Contributing Guide
-      description: By submitting this issue, you agree to follow our [Contributing Guide](https://avd.sh/en/latest/docs/contribution/overview.html)
+      description: By submitting this issue, you agree to follow our [Contributing Guide](https://avd.arista.com/devel/docs/contribution/overview.html)
       options:
         - label: I agree to follow this project's Code of Conduct
           required: true

.github/ISSUE_TEMPLATE/feature-request.yml

@@ -71,7 +71,7 @@ body:
     id: terms
     attributes:
       label: Contributing Guide
-      description: By submitting this issue, you agree to follow our [Contributing Guide](https://avd.sh/en/latest/docs/contribution/overview.html)
+      description: By submitting this issue, you agree to follow our [Contributing Guide](https://avd.arista.com/devel/docs/contribution/overview.html)
       options:
         - label: I agree to follow this project's Code of Conduct
           required: true

.github/PULL_REQUEST_TEMPLATE/pull_request_template.md

@@ -30,6 +30,6 @@ Fixes #<ISSUE ID>
 <!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
 <!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
 - [ ] My code has been rebased from devel before I start
-- [ ] I have read the [**CONTRIBUTING**](https://avd.sh/en/latest/docs/contribution/overview.html) document.
+- [ ] I have read the [**CONTRIBUTING**](https://avd.arista.com/devel/docs/contribution/overview.html) document.
 - [ ] My change requires a change to the documentation and documentation have been updated accordingly.
 - [ ] I have updated [molecule CI](https://github.com/aristanetworks/avd/tree/devel/ansible_collections/arista/avd/molecule) testing accordingly. (check the box if not applicable)

.github/PULL_REQUEST_TEMPLATE/schema_eos_cli_config_gen.md

@@ -10,7 +10,7 @@
   - README.md is most complete with all keys. README_v4.0 includes partial data models after conversion to lists.
   - Schema fragment path is `roles/eos_cli_config_gen/schemas/schema_fragments/<data_model_key>.schema.yml`.
   - Copy line 1-5 from another schema (comments and outer type:dict).
-  - Refer to [schema documentation](https://avd.sh/en/devel/docs/input-variable-validation.html) for syntax and/or use YAML Lint plugin from Redhat in VSCode.
+  - Refer to [schema documentation](https://avd.arista.com/devel/docs/contribution/input-variable-validation.html) for syntax and/or use YAML Lint plugin from Redhat in VSCode.
   - Use `convert_types` on value that could be mixed type or misinterpreted like integers and numeric strings.
 - [ ] If the data model has been converted from wildcard dicts:
   - Add `convert_types: ['dict']` to the schema.

.github/dependabot.yml

@@ -2,41 +2,33 @@
 version: 2
 updates:
   # Maintain dependencies for Python
-  # Need one per directory until the following issue is fixed - Beta in April 2024
-  # https://github.com/dependabot/dependabot-core/issues/2178
-  # This first entry for pip should cover python-avd
   - package-ecosystem: "pip"
-    directory: "/"
-    schedule:
-      interval: "daily"
-    reviewers:
-      - "aristanetworks/avd-maintainers"
-    pull-request-branch-name:
-      separator: "/"
-    commit-message:
-      prefix: "Bump(requirements): "
-    # Allow up to 10 open pull requests for pip dependencies
-    open-pull-requests-limit: 10
-  # This second entry for pip covers the requirements file in the ansible collection
-  - package-ecosystem: "pip"
-    directory: "/ansible_collections/arista/avd/"
+    directories:
+      - "/"
+      - "/python-avd/"
+      - "/ansible_collections/arista/avd/"
     schedule:
-      interval: "daily"
+      interval: "weekly"
+      day: "monday"
     reviewers:
       - "aristanetworks/avd-maintainers"
+    groups:
+      prod:
+        dependency-type: "production"
+      dev:
+        dependency-type: "development"
     pull-request-branch-name:
       separator: "/"
     commit-message:
       prefix: "Bump(requirements): "
-    # Allow up to 10 open pull requests for pip dependencies
-    open-pull-requests-limit: 10
+      prefix-development: "CI(requirements):"
   # Maintain dependencies for GitHub Actions
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
       interval: "weekly"
+      day: "monday"
     reviewers:
       - "aristanetworks/avd-maintainers"
     commit-message:
       prefix: "CI: "
-    open-pull-requests-limit: 10

.github/labeler.yml

@@ -121,7 +121,7 @@
       - any-glob-to-any-file:
           - development/requirements-dev.txt
           - development/requirements.txt
-          - ansible_collections/arista/avd/docs/requirements.txt
+          - docs/requirements.txt
 
 "state: CI Updated":
   - changed-files:

.github/pull_request_template.md

@@ -30,6 +30,6 @@ Fixes #<ISSUE ID>
 <!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
 <!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
 - [ ] My code has been rebased from devel before I start
-- [ ] I have read the [**CONTRIBUTING**](https://avd.sh/en/latest/docs/contribution/overview.html) document.
+- [ ] I have read the [**CONTRIBUTING**](https://avd.arista.com/stable/docs/contribution/overview.html) document.
 - [ ] My change requires a change to the documentation and documentation have been updated accordingly.
 - [ ] I have updated [molecule CI](https://github.com/aristanetworks/avd/tree/devel/ansible_collections/arista/avd/molecule) testing accordingly. (check the box if not applicable)

.github/workflows/new-cvp-integration.yml

@@ -26,20 +26,20 @@ jobs:
       fail-fast: true
       matrix:
         avd_scenario:
-          - 'cv_workflow'
+          - "cv_workflow"
         ansible_version:
-          - 'ansible-core<2.19.0 --upgrade'
+          - "ansible-core<2.19.0 --upgrade"
     steps:
       - uses: actions/checkout@v4
       - name: Run molecule action
         env:
           CVAAS_AAWG_CI: ${{ secrets.CVAAS_AAWG_CI }}
         uses: arista-netdevops-community/[email protected]
         with:
-          molecule_parentdir: 'ansible_collections/arista/avd'
-          molecule_command: 'test'
-          molecule_args: '--scenario-name ${{ matrix.avd_scenario }}'
-          pip_file: .github/requirements-ci.txt
+          molecule_parentdir: "ansible_collections/arista/avd"
+          molecule_command: "test"
+          molecule_args: "--scenario-name ${{ matrix.avd_scenario }}"
+          pip_file: .github/requirements-ci-dev.txt
           galaxy_file: "ansible_collections/arista/avd/collections.yml"
           ansible: ${{ matrix.ansible_version }}
           check_git: true
@@ -55,20 +55,20 @@ jobs:
       fail-fast: true
       matrix:
         avd_scenario:
-          - 'cv_deploy'
+          - "cv_deploy"
         ansible_version:
-          - 'ansible-core<2.19.0 --upgrade'
+          - "ansible-core<2.19.0 --upgrade"
     steps:
       - uses: actions/checkout@v4
       - name: Run molecule action
         env:
           CVAAS_AAWG_CI: ${{ secrets.CVAAS_AAWG_CI }}
         uses: arista-netdevops-community/[email protected]
         with:
-          molecule_parentdir: 'ansible_collections/arista/avd'
-          molecule_command: 'test'
-          molecule_args: '--scenario-name ${{ matrix.avd_scenario }}'
-          pip_file: .github/requirements-ci.txt
+          molecule_parentdir: "ansible_collections/arista/avd"
+          molecule_command: "test"
+          molecule_args: "--scenario-name ${{ matrix.avd_scenario }}"
+          pip_file: .github/requirements-ci-dev.txt
           galaxy_file: "ansible_collections/arista/avd/collections.yml"
           ansible: ${{ matrix.ansible_version }}
           check_git: true