From bf5220ce4c3bac6f570b23b94d96f9079ddda988 Mon Sep 17 00:00:00 2001 From: Vijayendra Radhakrishna Date: Fri, 28 Apr 2017 14:55:28 +0530 Subject: 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 --- functest/ci/config_aarch64_patch.yaml | 8 ++++++++ functest/ci/config_functest.yaml | 6 ++++++ 2 files changed, 14 insertions(+) (limited to 'functest') diff --git a/functest/ci/config_aarch64_patch.yaml b/functest/ci/config_aarch64_patch.yaml index b43b5a76..cd395ab8 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 f291cf1f..96dd6212 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: -- cgit 1.2.3-korg