From c567dec3d386bd236d75b4441513ad91f7434e97 Mon Sep 17 00:00:00 2001
From: nocturnalastro <micosta@redhat.com>
Date: Thu, 20 Feb 2025 16:47:05 +0000
Subject: [PATCH 1/2] oran o2ims compliance: replace command with shell and
 move logs to artifacts after runnning playbooks

---
 .../tasks/main.yml                            | 40 ++++++++++++++-----
 1 file changed, 31 insertions(+), 9 deletions(-)

diff --git a/roles/exec_oran_o2ims_compliance_tests/tasks/main.yml b/roles/exec_oran_o2ims_compliance_tests/tasks/main.yml
index bb4cd5f..f560828 100644
--- a/roles/exec_oran_o2ims_compliance_tests/tasks/main.yml
+++ b/roles/exec_oran_o2ims_compliance_tests/tasks/main.yml
@@ -11,34 +11,56 @@
     version: "{{ eco_validation_repo_version | default(omit) }}"
     force: true
 
+
+- name: Remove artifacts_dir  # noqa:ignore-errors
+  ansible.builtin.file:
+    path: "{{ item }}"
+    state: absent
+  loop:
+    - "{{ remote_artifacts_dir }}"
+    - "{{ ansible_env.HOME }}/redeploy_operators.log"
+    - "{{ ansible_env.HOME }}/test_automation.log"
+
 - name: Run redeploy operators  # noqa:ignore-errors
-  ansible.builtin.command:
-    cmd: |
+  ansible.builtin.shell:
+    cmd: >-
       ansible-playbook
       -i ~/inventory.yml playbooks/redeploy_oran_o2ims_operators.yml
       -e artifacts_dir={{ remote_artifacts_dir }}
-      > {{ artifacts_dir }}/redeploy_operators.log"
+      -vv
+      > {{ ansible_env.HOME }}/redeploy_operators.log 2>&1
     chdir: "eco-validation"
   changed_when: false
-  ignore_errors: true
 
 - name: Run tests  # noqa:ignore-errors
-  ansible.builtin.command:
-    cmd: |
+  ansible.builtin.shell:
+    cmd: >-
       ansible-playbook
       -i ~/inventory.yml playbooks/run_compliance_tests.yml
       -e artifacts_dir={{ remote_artifacts_dir }}
-      > {{ artifacts_dir }}/test_automation.log"
+      -vv
+      > {{ ansible_env.HOME }}/test_automation.log 2>&1
     chdir: "eco-validation"
   changed_when: false
   ignore_errors: true
 
+- name: Run tests  # noqa:ignore-errors
+  ansible.builtin.copy:
+    src: "{{ item }}"
+    dest: "{{ remote_artifacts_dir }}"
+    remote_src: true
+    mode: "0644"
+  ignore_errors: true
+  loop:
+    - "{{ ansible_env.HOME }}/redeploy_operators.log"
+    - "{{ ansible_env.HOME }}/test_automation.log"
+
 - name: Copy test results
   ansible.posix.synchronize:
-    src: "{{ remote_artifacts_dir }}"
+    src: "{{ remote_artifacts_dir }}/"
     dest: "{{ artifacts_dir }}"
     rsync_opts:
-      - "--rsh '/usr/bin/ssh {{ hostvars[inventory_hostname]['ansible_ssh_common_args'] }}'"
+      - "--rsh '/usr/bin/ssh {{ hostvars[inventory_hostname]['ansible_ssh_common_args'] | default('') }}'"
     mode: pull
   delegate_to: localhost
 

From 21098d5799abf70a17684ec2a9270d527d072e8e Mon Sep 17 00:00:00 2001
From: nocturnalastro <micosta@redhat.com>
Date: Thu, 20 Feb 2025 17:10:10 +0000
Subject: [PATCH 2/2] oran o2ims compliance: Add tags to vpn plays

---
 playbooks/run_oran_o2ims_compliance_tests.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/playbooks/run_oran_o2ims_compliance_tests.yml b/playbooks/run_oran_o2ims_compliance_tests.yml
index 397cfda..487300e 100644
--- a/playbooks/run_oran_o2ims_compliance_tests.yml
+++ b/playbooks/run_oran_o2ims_compliance_tests.yml
@@ -4,6 +4,8 @@
   gather_facts: true
   roles:
     - setup_vpn
+  tags:
+    - setup_vpn
 
 - name: Run compliance tests
   hosts: robot
@@ -16,3 +18,6 @@
   gather_facts: true
   roles:
     - kill_vpn
+  tags:
+    - setup_vpn
+    - kill_vpn