ci(molecule): Change path to requirements in molecule actions (arista…

…networks#830) * ci(molecule): Change path to requirements * ci(actions): Move to Molecule action in v1.1 * ci(molecule): Update CI artifacts
CyrielRct · Mar 29, 2021 · c7f4823 · c7f4823
1 parent 115922a
commit c7f4823
Show file tree

Hide file tree

Showing 100 changed files with 224 additions and 39 deletions.
diff --git a/.github/workflows/molecule-cli-config-gen.yml b/.github/workflows/molecule-cli-config-gen.yml
@@ -28,11 +28,12 @@ jobs:
       - uses: actions/checkout@v1
 
       - name: Run molecule action
-        uses: arista-netdevops-community/action-molecule-avd@v1.0
+        uses: arista-netdevops-community/action-molecule-avd@v1.1
         with:
           molecule_parentdir: 'ansible_collections/arista/avd'
           molecule_command: 'converge'
           molecule_args: '--scenario-name ${{ matrix.avd_scenario }}'
-          pip_file: development/requirements.txt
+          pip_file: ansible_collections/arista/avd/requirements.txt
+          ansible: "ansible==2.9.6"
           check_git: true
           check_git_enforced: true
diff --git a/.github/workflows/molecule-cvp-deployment.yml b/.github/workflows/molecule-cvp-deployment.yml
@@ -30,11 +30,12 @@ jobs:
       - uses: actions/checkout@v1
 
       - name: Run molecule action
-        uses: arista-netdevops-community/action-molecule-avd@v1.0
+        uses: arista-netdevops-community/action-molecule-avd@v1.1
         with:
           molecule_parentdir: 'ansible_collections/arista/avd'
           molecule_command: 'converge'
           molecule_args: '--scenario-name ${{ matrix.avd_scenario }}'
-          pip_file: development/requirements.txt
+          pip_file: ansible_collections/arista/avd/requirements.txt
+          ansible: "ansible==2.9.6"
           check_git: true
           check_git_enforced: true
diff --git a/.github/workflows/molecule-dhcp.yml b/.github/workflows/molecule-dhcp.yml
@@ -30,11 +30,12 @@ jobs:
       - uses: actions/checkout@v1
 
       - name: Run molecule action
-        uses: arista-netdevops-community/action-molecule-avd@v1.0
+        uses: arista-netdevops-community/action-molecule-avd@v1.1
         with:
           molecule_parentdir: 'ansible_collections/arista/avd'
           molecule_command: 'converge'
           molecule_args: '--scenario-name ${{ matrix.avd_scenario }}'
-          pip_file: development/requirements.txt
+          pip_file: ansible_collections/arista/avd/requirements.txt
+          ansible: "ansible==2.9.6"
           check_git: true
           check_git_enforced: true
diff --git a/.github/workflows/molecule-eos-designs.yml b/.github/workflows/molecule-eos-designs.yml
@@ -30,11 +30,12 @@ jobs:
       - uses: actions/checkout@v1
 
       - name: Run molecule action
-        uses: arista-netdevops-community/action-molecule-avd@v1.0
+        uses: arista-netdevops-community/action-molecule-avd@v1.1
         with:
           molecule_parentdir: 'ansible_collections/arista/avd'
           molecule_command: 'converge'
           molecule_args: '--scenario-name ${{ matrix.avd_scenario }}'
-          pip_file: development/requirements.txt
+          pip_file: ansible_collections/arista/avd/requirements.txt
+          ansible: "ansible==2.9.6"
           check_git: true
           check_git_enforced: true
diff --git a/.github/workflows/molecule-new-release.yml b/.github/workflows/molecule-new-release.yml
@@ -25,12 +25,13 @@ jobs:
       - uses: actions/checkout@v1
 
       - name: Run molecule action
-        uses: arista-netdevops-community/action-molecule-avd@v1.0
+        uses: arista-netdevops-community/action-molecule-avd@v1.1
         with:
           molecule_parentdir: 'ansible_collections/arista/avd'
           molecule_command: 'test'
           molecule_args: '--scenario-name ${{ matrix.avd_scenario }}'
-          pip_file: development/requirements.txt
+          pip_file: ansible_collections/arista/avd/requirements.txt
+          ansible: "ansible==2.9.6"
           check_git: true
           check_git_enforced: true
 

diff --git a/.gitignore b/.gitignore
@@ -104,6 +104,7 @@ venv.bak/
 .mypy_cache/
 
 .vscode/*
+**/.vscode/*
 
 # Installation path for CVP example
 examples/evpn-l3ls-cvp-deployment/collections

diff --git a/ansible_collections/arista/avd/molecule/MOLECULE_SCENARIOS.txt b/ansible_collections/arista/avd/molecule/MOLECULE_SCENARIOS.txt
@@ -0,0 +1,11 @@
+eos_cli_config_gen
+eos_config_deploy_cvp
+eos_config_deploy_cvp_list
+eos_designs-twodc-5stage-clos
+eos_l3ls_evpn-twodc-5stage-clos
+eos_l3ls_evpn_deprecation_test
+evpn_underlay_ebgp_overlay_ebgp
+evpn_underlay_isis_overlay_ibgp
+evpn_underlay_ospf_overlay_ebgp
+evpn_underlay_rfc5549_overlay_ebgp
+upgrade_v1.0_to_v1.1
diff --git a/ansible_collections/arista/avd/molecule/Makefile b/ansible_collections/arista/avd/molecule/Makefile
@@ -21,20 +21,20 @@ converge: ## Execute molecule CONVERGE sequence. By default eos_cli_config_gen.
 
 .PHONY: refresh-facts
 refresh-facts: ## Run all molecule scenarios
-	@for MOLECULE_SCENARIO in * ; do \
-        if [ -d "$$MOLECULE_SCENARIO" ]; then\
-        echo "Run scenrario for "$$MOLECULE_SCENARIO && \
-		cd .. ; \
-		molecule converge --scenario-name $$MOLECULE_SCENARIO ; \
-		cd ./molecule ; \
-        fi \
-    done
+	@while read -r MOLECULE_SCENARIO; do \
+		if [ -d "$$MOLECULE_SCENARIO" ]; then\
+			echo "Run scenrario for "$$MOLECULE_SCENARIO && \
+			cd .. ; \
+			molecule converge --scenario-name $$MOLECULE_SCENARIO ; \
+			cd ./molecule ; \
+		fi \
+	done <MOLECULE_SCENARIOS.txt
 
 .PHONY: commit-facts
 commit-facts: ## Commit updated facts for CI
 	git status --short
 	git add .
-	git commit --no-verify -m 'Update CI artifacts' ./
+	git commit --no-verify -m 'ci(molecule): Update CI artifacts' ./
 
 .PHONY: test-git-status
 test-git-status: ## Run post molecule script to check git status

diff --git a/...ctions/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-BL1A.yml b/...ctions/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-BL1A.yml
@@ -1,5 +1,6 @@
 l3leaf_node_group: DC1_BL1
 switch_platform: vEOS-LAB
+switch_rack: null
 switch_bgp_as: 65104
 leaf_id: 6
 switch_mgmt_ip: 192.168.200.110/24
@@ -71,6 +72,7 @@ ntp_server:
   nodes:
   - 192.168.200.5
 redundancy: null
+snmp_server: null
 spanning_tree:
   mode: mstp
   mst_instances:

diff --git a/...ctions/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-BL1B.yml b/...ctions/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-BL1B.yml
@@ -1,5 +1,6 @@
 l3leaf_node_group: DC1_BL1
 switch_platform: vEOS-LAB
+switch_rack: null
 switch_bgp_as: 65104
 leaf_id: 7
 switch_mgmt_ip: 192.168.200.111/24
@@ -71,6 +72,7 @@ ntp_server:
   nodes:
   - 192.168.200.5
 redundancy: null
+snmp_server: null
 spanning_tree:
   mode: mstp
   mst_instances:

diff --git a/...ns/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-L2LEAF1A.yml b/...ns/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-L2LEAF1A.yml
@@ -1,5 +1,6 @@
 l2leaf_node_group: DC1_L2LEAF1
 switch_platform: vEOS-LAB
+switch_rack: null
 leaf_id: 8
 switch_mgmt_ip: 192.168.200.112/24
 switch_inband_management_ip: null
@@ -65,6 +66,7 @@ ntp_server:
   nodes:
   - 192.168.200.5
 redundancy: null
+snmp_server: null
 spanning_tree:
   mode: mstp
   mst_instances:

diff --git a/...ns/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-L2LEAF2A.yml b/...ns/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-L2LEAF2A.yml
@@ -1,5 +1,6 @@
 l2leaf_node_group: DC1_L2LEAF2
 switch_platform: vEOS-LAB
+switch_rack: null
 leaf_id: 9
 switch_mgmt_ip: 192.168.200.113/24
 switch_inband_management_ip: null
@@ -93,6 +94,7 @@ ntp_server:
   nodes:
   - 192.168.200.5
 redundancy: null
+snmp_server: null
 spanning_tree:
   mode: mstp
   mst_instances:

diff --git a/...ns/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-L2LEAF2B.yml b/...ns/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-L2LEAF2B.yml
@@ -1,5 +1,6 @@
 l2leaf_node_group: DC1_L2LEAF2
 switch_platform: vEOS-LAB
+switch_rack: null
 leaf_id: 10
 switch_mgmt_ip: 192.168.200.114/24
 switch_inband_management_ip: null
@@ -93,6 +94,7 @@ ntp_server:
   nodes:
   - 192.168.200.5
 redundancy: null
+snmp_server: null
 spanning_tree:
   mode: mstp
   mst_instances:

diff --git a/...ions/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-LEAF1A.yml b/...ions/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-LEAF1A.yml
@@ -1,5 +1,6 @@
 l3leaf_node_group: DC1_LEAF1
 switch_platform: vEOS-LAB
+switch_rack: null
 switch_bgp_as: 65101
 leaf_id: 1
 switch_mgmt_ip: 192.168.200.105/24
@@ -67,6 +68,7 @@ ntp_server:
   nodes:
   - 192.168.200.5
 redundancy: null
+snmp_server: null
 spanning_tree:
   mode: mstp
   mst_instances:

diff --git a/...ions/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-LEAF2A.yml b/...ions/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-LEAF2A.yml
@@ -1,5 +1,6 @@
 l3leaf_node_group: DC1_LEAF2
 switch_platform: vEOS-LAB
+switch_rack: null
 switch_bgp_as: 65102
 leaf_id: 2
 switch_mgmt_ip: 192.168.200.106/24
@@ -99,6 +100,7 @@ ntp_server:
   nodes:
   - 192.168.200.5
 redundancy: null
+snmp_server: null
 spanning_tree:
   mode: mstp
   mst_instances:

diff --git a/...ions/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-LEAF2B.yml b/...ions/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-LEAF2B.yml
@@ -1,5 +1,6 @@
 l3leaf_node_group: DC1_LEAF2
 switch_platform: vEOS-LAB
+switch_rack: null
 switch_bgp_as: 65102
 leaf_id: 3
 switch_mgmt_ip: 192.168.200.107/24
@@ -99,6 +100,7 @@ ntp_server:
   nodes:
   - 192.168.200.5
 redundancy: null
+snmp_server: null
 spanning_tree:
   mode: mstp
   mst_instances:

diff --git a/...ions/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-SPINE1.yml b/...ions/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-SPINE1.yml
@@ -1,4 +1,5 @@
 switch_platform: vEOS-LAB
+switch_rack: null
 switch_mgmt_ip: 192.168.200.101/24
 switch_bgp_as: 65001
 switch_router_id: 192.168.255.1
@@ -48,6 +49,7 @@ ntp_server:
   nodes:
   - 192.168.200.5
 redundancy: null
+snmp_server: null
 spanning_tree:
   mode: none
 aaa_authorization: null

diff --git a/...ions/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-SPINE2.yml b/...ions/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-SPINE2.yml
@@ -1,4 +1,5 @@
 switch_platform: vEOS-LAB
+switch_rack: null
 switch_mgmt_ip: 192.168.200.102/24
 switch_bgp_as: 65001
 switch_router_id: 192.168.255.2
@@ -48,6 +49,7 @@ ntp_server:
   nodes:
   - 192.168.200.5
 redundancy: null
+snmp_server: null
 spanning_tree:
   mode: none
 aaa_authorization: null

diff --git a/...ions/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-SPINE3.yml b/...ions/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-SPINE3.yml
@@ -1,4 +1,5 @@
 switch_platform: vEOS-LAB
+switch_rack: null
 switch_mgmt_ip: 192.168.200.103/24
 switch_bgp_as: 65001
 switch_router_id: 192.168.255.3
@@ -48,6 +49,7 @@ ntp_server:
   nodes:
   - 192.168.200.5
 redundancy: null
+snmp_server: null
 spanning_tree:
   mode: none
 aaa_authorization: null

diff --git a/...ions/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-SPINE4.yml b/...ions/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-SPINE4.yml
@@ -1,4 +1,5 @@
 switch_platform: vEOS-LAB
+switch_rack: null
 switch_mgmt_ip: 192.168.200.104/24
 switch_bgp_as: 65001
 switch_router_id: 192.168.255.4
@@ -48,6 +49,7 @@ ntp_server:
   nodes:
   - 192.168.200.5
 redundancy: null
+snmp_server: null
 spanning_tree:
   mode: none
 aaa_authorization: null

diff --git a/...tions/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-SVC3A.yml b/...tions/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-SVC3A.yml
@@ -1,5 +1,6 @@
 l3leaf_node_group: DC1_SVC3
 switch_platform: vEOS-LAB
+switch_rack: null
 switch_bgp_as: 65103
 leaf_id: 4
 switch_mgmt_ip: 192.168.200.108/24
@@ -109,6 +110,7 @@ ntp_server:
   nodes:
   - 192.168.200.5
 redundancy: null
+snmp_server: null
 spanning_tree:
   mode: mstp
   mst_instances:

diff --git a/...tions/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-SVC3B.yml b/...tions/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-SVC3B.yml
@@ -1,5 +1,6 @@
 l3leaf_node_group: DC1_SVC3
 switch_platform: vEOS-LAB
+switch_rack: null
 switch_bgp_as: 65103
 leaf_id: 5
 switch_mgmt_ip: 192.168.200.109/24
@@ -109,6 +110,7 @@ ntp_server:
   nodes:
   - 192.168.200.5
 redundancy: null
+snmp_server: null
 spanning_tree:
   mode: mstp
   mst_instances:

diff --git a/...s/arista/avd/molecule/eos_config_deploy_cvp_list/intended/structured_configs/DC1-BL1A.yml b/...s/arista/avd/molecule/eos_config_deploy_cvp_list/intended/structured_configs/DC1-BL1A.yml
@@ -1,5 +1,6 @@
 l3leaf_node_group: DC1_BL1
 switch_platform: vEOS-LAB
+switch_rack: null
 switch_bgp_as: 65104
 leaf_id: 6
 switch_mgmt_ip: 192.168.200.110/24
@@ -71,6 +72,7 @@ ntp_server:
   nodes:
   - 192.168.200.5
 redundancy: null
+snmp_server: null
 spanning_tree:
   mode: mstp
   mst_instances:

diff --git a/...s/arista/avd/molecule/eos_config_deploy_cvp_list/intended/structured_configs/DC1-BL1B.yml b/...s/arista/avd/molecule/eos_config_deploy_cvp_list/intended/structured_configs/DC1-BL1B.yml
@@ -1,5 +1,6 @@
 l3leaf_node_group: DC1_BL1
 switch_platform: vEOS-LAB
+switch_rack: null
 switch_bgp_as: 65104
 leaf_id: 7
 switch_mgmt_ip: 192.168.200.111/24
@@ -71,6 +72,7 @@ ntp_server:
   nodes:
   - 192.168.200.5
 redundancy: null
+snmp_server: null
 spanning_tree:
   mode: mstp
   mst_instances:

diff --git a/...ista/avd/molecule/eos_config_deploy_cvp_list/intended/structured_configs/DC1-L2LEAF1A.yml b/...ista/avd/molecule/eos_config_deploy_cvp_list/intended/structured_configs/DC1-L2LEAF1A.yml
@@ -1,5 +1,6 @@
 l2leaf_node_group: DC1_L2LEAF1
 switch_platform: vEOS-LAB
+switch_rack: null
 leaf_id: 8
 switch_mgmt_ip: 192.168.200.112/24
 switch_inband_management_ip: null
@@ -65,6 +66,7 @@ ntp_server:
   nodes:
   - 192.168.200.5
 redundancy: null
+snmp_server: null
 spanning_tree:
   mode: mstp
   mst_instances:

diff --git a/...ista/avd/molecule/eos_config_deploy_cvp_list/intended/structured_configs/DC1-L2LEAF2A.yml b/...ista/avd/molecule/eos_config_deploy_cvp_list/intended/structured_configs/DC1-L2LEAF2A.yml
@@ -1,5 +1,6 @@
 l2leaf_node_group: DC1_L2LEAF2
 switch_platform: vEOS-LAB
+switch_rack: null
 leaf_id: 9
 switch_mgmt_ip: 192.168.200.113/24
 switch_inband_management_ip: null
@@ -93,6 +94,7 @@ ntp_server:
   nodes:
   - 192.168.200.5
 redundancy: null
+snmp_server: null
 spanning_tree:
   mode: mstp
   mst_instances: