Use different folder for cached data

- `dump` is for raw testing data and logs from remote
- `cache` for temporary data required for testing

Change-Id: I540338eae2dd7bbd14b359e1a0dbce186ada902b
Signed-off-by: Yujun Zhang <zhang.yujunz@zte.com.cn>

diff --git a/.gitignore b/.gitignore
index a098d85..298e4d8 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -76,6 +76,7 @@ ChangeLog
 
 # integration data
 /tests/integration/*.retry
+/tests/integration/.cache
 /tests/integration/dump
 /tests/integration/hosts
 /tests/integration/reports

diff --git a/resources/metric/nDPI.yaml b/resources/metric/nDPI.yaml
index 0391302..41bedc3 100644 (file)
--- a/resources/metric/nDPI.yaml
+++ b/resources/metric/nDPI.yaml
@@ -10,9 +10,9 @@
 
 - name: prepare sample pcap file
   get_url:
-    url: "https://build.opnfv.org/artifacts.opnfv.org/qtip/utilities/test.pcap"
-    dest: "{{ qtip_dump }}/localhost/{{ nDPI_file }}"
-    validate_certs: no  # required when using proxy for https
+    url: "http://artifacts.opnfv.org/qtip/utilities/test.pcap"
+    dest: "{{ qtip_cache }}/{{ nDPI_file }}"
+    # validate_certs: no  # required when using proxy for https
   run_once: yes
   delegate_to: localhost
 
@@ -60,7 +60,7 @@
 
 - name: copy sample packet file
   copy:
-    src: "{{ qtip_dump }}/localhost/{{ nDPI_file }}"
+    src: "{{ qtip_cache}}/{{ nDPI_file }}"
     dest: "{{ nDPI_cwd }}/example/{{ nDPI_file }}"
 
 - name:

diff --git a/tests/integration/group_vars/all b/tests/integration/group_vars/all
index a84ab51..251b142 100644 (file)
--- a/tests/integration/group_vars/all
+++ b/tests/integration/group_vars/all
@@ -2,3 +2,4 @@ qtip_resources: ../../resources
 qtip_reports: ./reports
 qtip_fixtures: ./fixtures
 qtip_dump: ./dump
+qtip_cache: ./.cache