Skip to content

Commit

Permalink
Test: Fix v1 molecule tests (#710)
Browse files Browse the repository at this point in the history
Co-authored-by: Carl Buchmann <[email protected]>
  • Loading branch information
sugetha24 and carlbuchmann authored Aug 9, 2024
1 parent 31802e8 commit 89faa8d
Show file tree
Hide file tree
Showing 16 changed files with 16 additions and 52 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ scenario:
test_sequence:
- converge
driver:
name: delegated
name: default
platforms:
- name: dummy
managed: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ scenario:
- converge
# - verify
driver:
name: delegated
name: default
platforms:
- name: cv_server
image: avdteam/base:3.6-v1.0
Expand All @@ -32,15 +32,3 @@ provisioner:
- --check
verifier:
name: ansible
inventory:
links:
hosts: 'inventory/hosts.yml'
group_vars: 'inventory/group_vars/'
host_vars: 'inventory/host_vars/'
ansible_args:
- --inventory=inventory/hosts.yml
config_options:
defaults:
jinja2_extensions: 'jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n'
gathering: explicit
command_warnings: False
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ scenario:
- converge
# - verify
driver:
name: delegated
name: default
platforms:
- name: cv_server
image: avdteam/base:3.6-v1.0
Expand All @@ -32,15 +32,3 @@ provisioner:
- --check
verifier:
name: ansible
inventory:
links:
hosts: 'inventory/hosts.yml'
group_vars: 'inventory/group_vars/'
host_vars: 'inventory/host_vars/'
ansible_args:
- --inventory=inventory/hosts.yml
config_options:
defaults:
jinja2_extensions: 'jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n'
gathering: explicit
command_warnings: False
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ scenario:
test_sequence:
- converge
driver:
name: delegated
name: default
platforms:
- name: dummy
managed: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ scenario:
test_sequence:
- converge
driver:
name: delegated
name: default
platforms:
- name: dummy
managed: false
Expand Down
14 changes: 1 addition & 13 deletions ansible_collections/arista/cvp/molecule/cv_device/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ scenario:
- converge
# - verify
driver:
name: delegated
name: default
platforms:
- name: cv_server
image: avdteam/base:3.6-v1.0
Expand All @@ -32,15 +32,3 @@ provisioner:
- --check
verifier:
name: ansible
inventory:
links:
hosts: 'inventory/hosts.yml'
group_vars: 'inventory/group_vars/'
host_vars: 'inventory/host_vars/'
ansible_args:
- --inventory=inventory/hosts.yml
config_options:
defaults:
jinja2_extensions: 'jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n'
gathering: explicit
command_warnings: False
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ scenario:
test_sequence:
- converge
driver:
name: delegated
name: default
platforms:
- name: dummy
managed: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

# Setting variables
RECONCILE = 'RECONCILE_' # Prefix for the configlet name
fixture_file = 'molecule/fixtures/cv_device_v3.yaml'
fixture_file = '../fixtures/cv_device_v3.yaml'

with open(fixture_file, encoding="utf-8") as f:
dut = yaml.safe_load(f)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
register: CV_DEVICE_V3_RESULT

- name: Run Python script to reconcile the device
ansible.builtin.command: python3 molecule/cv_device_v3/reconcile.py
ansible.builtin.command: python3 reconcile.py

- name: Execute Task for detach configlet
arista.cvp.cv_task_v3:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ scenario:
test_sequence:
- converge
driver:
name: delegated
name: default
platforms:
- name: dummy
managed: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ scenario:
test_sequence:
- converge
driver:
name: delegated
name: default
platforms:
- name: dummy
managed: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ scenario:
test_sequence:
- converge
driver:
name: delegated
name: default
platforms:
- name: dummy
managed: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ scenario:
test_sequence:
- converge
driver:
name: delegated
name: default
platforms:
- name: dummy
managed: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ scenario:
- converge
# - verify
driver:
name: delegated
name: default
platforms:
- name: dummy
managed: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ scenario:
dependency:
name: galaxy
driver:
name: delegated
name: default
platforms:
- name: dhcp_server01
image: avdteam/base:3.6
Expand Down
2 changes: 1 addition & 1 deletion ansible_collections/arista/cvp/requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ pre-commit>=2.9.2
pre-commit-hooks>=3.3.0
identify>=1.4.20
docker
molecule>=3.2.0,<6.0
molecule>6.0
molecule-docker>=0.2.4
mitogen
pytest
Expand Down

0 comments on commit 89faa8d

Please sign in to comment.