diff --git a/ansible/roles/test/tasks/acl/acl_traffic_test/run_ping_test.yml b/ansible/roles/test/tasks/acl/acl_traffic_test/run_ping_test.yml index 0eabbfed108..33960998e7c 100644 --- a/ansible/roles/test/tasks/acl/acl_traffic_test/run_ping_test.yml +++ b/ansible/roles/test/tasks/acl/acl_traffic_test/run_ping_test.yml @@ -2,6 +2,9 @@ # Execute ping and check the log. #----------------------------------------- +- name: Get an unique timestamp to feed to testname_unique + set_fact: + unique_timestamp: "{{ lookup('pipe','date +%Y-%m-%d-%H:%M:%S') }}" - include_vars: "vars/run_ping_test_vars.yml" - name: Start log analyser diff --git a/ansible/roles/test/tasks/acl/acl_traffic_test/run_ptf_test.yml b/ansible/roles/test/tasks/acl/acl_traffic_test/run_ptf_test.yml index 059652ddaec..43afe816056 100644 --- a/ansible/roles/test/tasks/acl/acl_traffic_test/run_ptf_test.yml +++ b/ansible/roles/test/tasks/acl/acl_traffic_test/run_ptf_test.yml @@ -2,6 +2,9 @@ # Send some TCP packets. #----------------------------------------- +- name: Get an unique timestamp to feed to testname_unique + set_fact: + unique_timestamp: "{{ lookup('pipe','date +%Y-%m-%d-%H:%M:%S') }}" - include_vars: "vars/run_ptf_test_vars.yml" - block: diff --git a/ansible/roles/test/tasks/run_command_with_log_analyzer.yml b/ansible/roles/test/tasks/run_command_with_log_analyzer.yml index f163ef27832..23d884b8dd4 100644 --- a/ansible/roles/test/tasks/run_command_with_log_analyzer.yml +++ b/ansible/roles/test/tasks/run_command_with_log_analyzer.yml @@ -5,6 +5,9 @@ # 3) Run cleanup if needed. #----------------------------------------- +- name: Get an unique timestamp to feed to testname_unique + set_fact: + unique_timestamp: "{{lookup('pipe','date +%Y-%m-%d-%H:%M:%S')}}" - include_vars: "vars/run_config_test_vars.yml" - block: diff --git a/ansible/roles/test/tasks/run_loganalyzer.yml b/ansible/roles/test/tasks/run_loganalyzer.yml index 73f36c582dc..d0b8509004a 100644 --- a/ansible/roles/test/tasks/run_loganalyzer.yml +++ b/ansible/roles/test/tasks/run_loganalyzer.yml @@ -3,6 +3,9 @@ # or analyze-phase of loganalyzer. #----------------------------------------- +- name: Get an unique timestamp to feed to testname_unique + set_fact: + unique_timestamp: "{{lookup('pipe','date +%Y-%m-%d-%H:%M:%S')}}" - include_vars: "vars/run_loganalyzer_vars.yml" - name: Initialize loganalizer. Put start marker to log file. diff --git a/ansible/vars/run_config_test_vars.yml b/ansible/vars/run_config_test_vars.yml index 976aac0f53f..686892092d4 100644 --- a/ansible/vars/run_config_test_vars.yml +++ b/ansible/vars/run_config_test_vars.yml @@ -1,6 +1,6 @@ --- -testname_unique: "{{ testname }}.{{lookup('pipe','date +%Y-%m-%d-%H:%M:%S')}}" +testname_unique: "{{ testname }}.{{ unique_timestamp }}" test_out_dir: "{{ out_dir }}/{{ testname_unique }}" loganalyzer_init: roles/test/files/tools/loganalyzer/loganalyzer_init.yml diff --git a/ansible/vars/run_loganalyzer_vars.yml b/ansible/vars/run_loganalyzer_vars.yml index e0ece566085..e3df78a571e 100644 --- a/ansible/vars/run_loganalyzer_vars.yml +++ b/ansible/vars/run_loganalyzer_vars.yml @@ -1,6 +1,6 @@ --- -testname_unique: "{{ testname }}.{{lookup('pipe','date +%Y-%m-%d-%H:%M:%S')}}" +testname_unique: "{{ testname }}.{{ unique_timestamp }}" test_out_dir: "{{ out_dir }}/{{ testname_unique }}" loganalyzer_init: roles/test/files/tools/loganalyzer/loganalyzer_init.yml diff --git a/ansible/vars/run_ping_test_vars.yml b/ansible/vars/run_ping_test_vars.yml index 7839bcdd198..a4dd27773c4 100644 --- a/ansible/vars/run_ping_test_vars.yml +++ b/ansible/vars/run_ping_test_vars.yml @@ -1,6 +1,6 @@ --- -testname_unique: "{{ testname }}.{{lookup('pipe','date +%Y-%m-%d-%H:%M:%S')}}" +testname_unique: "{{ testname }}.{{ unique_timestamp }}" test_out_dir: "{{ out_dir }}/{{ testname_unique }}" summary_file: "summary.loganalysis.{{ testname_unique }}.log" diff --git a/ansible/vars/run_ptf_test_vars.yml b/ansible/vars/run_ptf_test_vars.yml index 7839bcdd198..a4dd27773c4 100644 --- a/ansible/vars/run_ptf_test_vars.yml +++ b/ansible/vars/run_ptf_test_vars.yml @@ -1,6 +1,6 @@ --- -testname_unique: "{{ testname }}.{{lookup('pipe','date +%Y-%m-%d-%H:%M:%S')}}" +testname_unique: "{{ testname }}.{{ unique_timestamp }}" test_out_dir: "{{ out_dir }}/{{ testname_unique }}" summary_file: "summary.loganalysis.{{ testname_unique }}.log"