summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVijayendra Radhakrishna <vradhakrishna@mvista.com>2017-04-28 14:55:28 +0530
committerVijayendra Radhakrishna <vradhakrishna@mvista.com>2017-05-04 11:31:09 +0530
commitbf5220ce4c3bac6f570b23b94d96f9079ddda988 (patch)
treed3ffacac4e705a4cdf7b3f1525c810bbb42f0be5
parent4493eb2b84f5d7f92ed9945f17fa402b3be0d9d4 (diff)
Move few local ODL SFC confs to global functest confs
- Currently ODL SFC maitains image url, name, format in its local config.yaml - This makes it complicated to override some of the params for other architecture - like aarch64. This should help overriding some params during functest env prepare - based on arch Change-Id: I81a62566634e0bd87a53f5d0431492468a5f478c Signed-off-by: Vijayendra Radhakrishna <vradhakrishna@mvista.com>
-rw-r--r--functest/ci/config_aarch64_patch.yaml8
-rw-r--r--functest/ci/config_functest.yaml6
2 files changed, 14 insertions, 0 deletions
diff --git a/functest/ci/config_aarch64_patch.yaml b/functest/ci/config_aarch64_patch.yaml
index b43b5a76c..cd395ab89 100644
--- a/functest/ci/config_aarch64_patch.yaml
+++ b/functest/ci/config_aarch64_patch.yaml
@@ -16,5 +16,13 @@ os:
vping:
image_name: TestVM
+ odl_sfc:
+ image_base_url: "http://artifacts.opnfv.org/sfc/demo"
+ image_name: sfc_nsh_danube
+ image_file_name: sf_nsh_danube_arm64.img
+ image_initrd: sf_nsh_danube_arm64-initrd
+ image_kernel: sf_nsh_danube_arm64-kernel
+ image_format: ami
+ os_cmd_line: 'root=LABEL=cloudimg-rootfs ro'
doctor:
image_name: TestVM
diff --git a/functest/ci/config_functest.yaml b/functest/ci/config_functest.yaml
index f291cf1f6..96dd62129 100644
--- a/functest/ci/config_functest.yaml
+++ b/functest/ci/config_functest.yaml
@@ -98,6 +98,12 @@ onos_sfc:
image_name: TestSfcVm
image_file_name: firewall_block_image.img
+odl_sfc:
+ image_base_url: "http://artifacts.opnfv.org/sfc/images"
+ image_name: sfc_nsh_danube
+ image_file_name: sfc_nsh_danube.qcow2
+ image_format: qcow2
+
tempest:
deployment_name: opnfv-tempest
identity: