summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYujun Zhang <zhang.yujunz@zte.com.cn>2017-04-20 03:43:07 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-04-20 03:43:07 +0000
commit0e64642d1a62b4b0f319d2cfa0baa011b07c7520 (patch)
tree27d82e8f4712d19543431abb20cc5e3881375fce
parente1dbb6e7fb1830882f8ab376632bed521a6ad1bf (diff)
parent88f4e7f34bda4fbfc4ee6d513ffbec772037be1f (diff)
Merge "Use different folder for cached data"
-rw-r--r--.gitignore1
-rw-r--r--resources/metric/nDPI.yaml8
-rw-r--r--tests/integration/group_vars/all1
3 files changed, 6 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index a098d85d..298e4d8c 100644
--- 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 0391302a..41bedc3d 100644
--- 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 a84ab51f..251b1420 100644
--- 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