Merge "Adding ONOS chart parameter in scale test"
diff --git a/jjb/pipeline/voltha-scale-test.groovy b/jjb/pipeline/voltha-scale-test.groovy
index a23beb3..a83d44f 100644
--- a/jjb/pipeline/voltha-scale-test.groovy
+++ b/jjb/pipeline/voltha-scale-test.groovy
@@ -62,6 +62,7 @@
VOLTHA_BBSIM_CHART="${bbsimChart}"
VOLTHA_ADAPTER_OPEN_OLT_CHART="${openoltAdapterChart}"
VOLTHA_ADAPTER_OPEN_ONU_CHART="${openonuAdapterChart}"
+ ONOS_CLASSIC_CHART="${onosChart}"
APPS_TO_LOG="etcd kafka onos-onos-classic adapter-open-onu adapter-open-olt rw-core ofagent bbsim radius"
LOG_FOLDER="$WORKSPACE/logs"
diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index a40d7fe..04e01f9 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -458,6 +458,11 @@
description: 'Custom image selection for Openonu Adapter (repo:tag)'
- string:
+ name: onosChart
+ default: '{onosChart}'
+ description: 'ONOS chart name (or location on file system)'
+
+ - string:
name: volthaSystemTestsChange
default: '{volthaSystemTestsChange}'
description: 'Download a change for gerrit in the voltha-system-tests repo, example value: "refs/changes/79/18779/13"'
@@ -513,6 +518,7 @@
volthaChart: onf/voltha
openoltAdapterChart: onf/voltha-adapter-openolt
openonuAdapterChart: onf/voltha-adapter-openonu
+ onosChart: onos/onos-classic
olts: 2
pons: 2
@@ -588,6 +594,7 @@
volthaChart: onf/voltha
openoltAdapterChart: onf/voltha-adapter-openolt
openonuAdapterChart: onf/voltha-adapter-openonu
+ onosChart: onos/onos-classic
olts: 2
pons: 2