using block-rescue instead of ignore errors

aristanetworks · Oct 7, 2024 · 1da3eec · 1da3eec
1 parent f6a2e0f
commit 1da3eec
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 24 deletions.
diff --git a/ansible_collections/arista/avd/molecule/cv_deploy/cc_false.yml b/ansible_collections/arista/avd/molecule/cv_deploy/cc_false.yml
@@ -52,7 +52,7 @@
 
     - name: Cleanup orphan CC
       run_once: true
-      uri:
+      ansible.legacy.uri:
         url: https://{{ cv_server }}/api/resources/changecontrol/v1/ChangeControlConfig?key.id={{ cv_deploy_results.change_control.id }}
         validate_certs: yes
         return_content: yes

diff --git a/ansible_collections/arista/avd/molecule/cv_deploy/workspace_force_false.yml b/ansible_collections/arista/avd/molecule/cv_deploy/workspace_force_false.yml
@@ -30,35 +30,31 @@
 
     - name: Dynamically add inactive device avd-ci-core1 to group INACTIVE
       run_once: true
-      add_host:
+      ansible.legacy.add_host:
         name: avd-ci-core1
         groups: INACTIVE
 
     - name: Provision with cv_submit_workspace_force = false
       run_once: true
       delegate_to: localhost
-      ansible.builtin.import_role:
-        name: arista.avd.cv_deploy
-      vars:
-        cv_devices: [ avd-ci-leaf2, avd-ci-core1 ]
-        cv_submit_workspace_force: false
-      ignore_errors: yes
-
-    - name: Display CVP result
-      run_once: true
-      ansible.builtin.debug:
-        msg: '{{ cv_deploy_results }}'
-
-    - name: Check CVP returns
-      run_once: true
-      ansible.builtin.assert:
-        that:
-          # errors and warnings
-          - "'Failed to submit workspace' in cv_deploy_results.errors[0]"
+      block:
+        - name: Trigger errors
+          ansible.builtin.import_role:
+            name: arista.avd.cv_deploy
+          vars:
+            cv_devices: [ avd-ci-leaf2, avd-ci-core1 ]
+            cv_submit_workspace_force: false
+      rescue:
+        - name: Check CVP returns
+          run_once: true
+          ansible.builtin.assert:
+            that:
+              # errors and warnings
+              - "'Failed to submit workspace' in cv_deploy_results.errors[0]"
 
     - name: Cleanup orphan workspace
       run_once: true
-      uri:
+      ansible.legacy.uri:
         url: https://{{ cv_server }}/api/resources/workspace/v1/WorkspaceConfig/some
         validate_certs: yes
         return_content: yes

diff --git a/ansible_collections/arista/avd/molecule/cv_deploy/workspace_force_true.yml b/ansible_collections/arista/avd/molecule/cv_deploy/workspace_force_true.yml
@@ -30,7 +30,7 @@
 
     - name: Dynamically add inactive device avd-ci-core1 to group INACTIVE
       run_once: true
-      add_host:
+      ansible.legacy.add_host:
         name: avd-ci-core1
         groups: INACTIVE
 
@@ -57,7 +57,7 @@
 
     - name: Cleanup orphan CC
       run_once: true
-      uri:
+      ansible.legacy.uri:
         url: https://{{ cv_server }}/api/resources/changecontrol/v1/ChangeControlConfig?key.id={{ cv_deploy_results.change_control.id }}
         validate_certs: yes
         return_content: yes

diff --git a/ansible_collections/arista/avd/molecule/cv_deploy/workspace_pending.yml b/ansible_collections/arista/avd/molecule/cv_deploy/workspace_pending.yml
@@ -46,7 +46,7 @@
 
     - name: Cleanup orphan workspace
       run_once: true
-      uri:
+      ansible.legacy.uri:
         url: https://{{ cv_server }}/api/resources/workspace/v1/WorkspaceConfig/some
         validate_certs: yes
         return_content: yes