Fix pyavd

aristanetworks · Nov 2, 2023 · 41f17aa · 41f17aa
1 parent f278609
commit 41f17aa
Show file tree

Hide file tree

Showing 3 changed files with 298 additions and 99 deletions.
diff --git a/python-avd/pyavd/__init__.py b/python-avd/pyavd/__init__.py
@@ -17,7 +17,7 @@
 __author__ = "Arista Networks"
 __copyright__ = "Copyright 2023 Arista Networks"
 __license__ = "Apache 2.0"
-__version__ = "4.4.0b2"
+__version__ = "4.5.0b2"
 
 __all__ = [
     "get_avd_facts",

diff --git a/python-avd/scripts/export_test_vars.yml b/python-avd/scripts/export_test_vars.yml
@@ -31,27 +31,29 @@
         - vars
         - configs
         - structured_configs
+        - documentation
       delegate_to: localhost
 
     - name: Copy structured_configs
       ansible.builtin.shell:
-        cmd: "cp -rT {{ scenario_dir }}/intended/structured_configs/ {{ pyavd_test_artifacts_dir }}/{{ testdir }}/structured_configs/"
+        cmd: "cp {{ scenario_dir }}/intended/structured_configs/*.yml {{ pyavd_test_artifacts_dir }}/{{ testdir }}/structured_configs/"
       run_once: true
       delegate_to: localhost
-      when: lookup("ansible.builtin.first_found", scenario_dir ~ "/intended/structured_configs", skip=true)
+      when: lookup("ansible.builtin.fileglob", scenario_dir ~ "/intended/structured_configs/*.yml", skip=true)
 
     - name: Copy configs
       ansible.builtin.shell:
-        cmd: "cp -rT {{ scenario_dir }}/intended/configs/ {{ pyavd_test_artifacts_dir }}/{{ testdir }}/configs/"
+        cmd: "cp {{ scenario_dir }}/intended/configs/*.cfg {{ pyavd_test_artifacts_dir }}/{{ testdir }}/configs/"
       run_once: true
       delegate_to: localhost
+      when: lookup("ansible.builtin.fileglob", scenario_dir ~ "/intended/configs/*.cfg", skip=true)
 
     - name: Copy documentation
       ansible.builtin.shell:
-        cmd: "cp -rT {{ scenario_dir }}/documentation/devices/ {{ pyavd_test_artifacts_dir }}/{{ testdir }}/documentation/"
+        cmd: "cp {{ scenario_dir }}/documentation/devices/*.md {{ pyavd_test_artifacts_dir }}/{{ testdir }}/documentation/"
       run_once: true
       delegate_to: localhost
-      when: lookup("ansible.builtin.first_found", scenario_dir ~ "/documentation/devices", skip=true)
+      when: lookup("ansible.builtin.fileglob", scenario_dir ~ "/documentation/devices/*.md", skip=true)
 
     - name: Set fact with hostvars to force templating
       ansible.builtin.set_fact: