Merge "Collecting bbsim-sadis-server logs in scale test"
diff --git a/jjb/pipeline/voltha-scale-multi-stack.groovy b/jjb/pipeline/voltha-scale-multi-stack.groovy
index 6f053c7..22b1549 100644
--- a/jjb/pipeline/voltha-scale-multi-stack.groovy
+++ b/jjb/pipeline/voltha-scale-multi-stack.groovy
@@ -62,7 +62,7 @@
ONOS_CLASSIC_CHART="${onosChart}"
RADIUS_CHART="${radiusChart}"
- APPS_TO_LOG="etcd kafka onos-onos-classic adapter-open-onu adapter-open-olt rw-core ofagent bbsim radius"
+ APPS_TO_LOG="etcd kafka onos-onos-classic adapter-open-onu adapter-open-olt rw-core ofagent bbsim radius bbsim-sadis-server"
LOG_FOLDER="$WORKSPACE/logs"
GERRIT_PROJECT="${GERRIT_PROJECT}"
diff --git a/jjb/pipeline/voltha-scale-test-etcd-kafka-bitnami.groovy b/jjb/pipeline/voltha-scale-test-etcd-kafka-bitnami.groovy
index e605443..5327012 100644
--- a/jjb/pipeline/voltha-scale-test-etcd-kafka-bitnami.groovy
+++ b/jjb/pipeline/voltha-scale-test-etcd-kafka-bitnami.groovy
@@ -65,7 +65,7 @@
ONOS_CLASSIC_CHART="${onosChart}"
RADIUS_CHART="${radiusChart}"
- APPS_TO_LOG="etcd kafka onos-onos-classic adapter-open-onu adapter-open-olt rw-core ofagent bbsim radius"
+ APPS_TO_LOG="etcd kafka onos-onos-classic adapter-open-onu adapter-open-olt rw-core ofagent bbsim radius bbsim-sadis-server"
LOG_FOLDER="$WORKSPACE/logs"
GERRIT_PROJECT="${GERRIT_PROJECT}"
diff --git a/jjb/pipeline/voltha-scale-test.groovy b/jjb/pipeline/voltha-scale-test.groovy
index 76fa65a..4dc58ae 100644
--- a/jjb/pipeline/voltha-scale-test.groovy
+++ b/jjb/pipeline/voltha-scale-test.groovy
@@ -65,7 +65,7 @@
ONOS_CLASSIC_CHART="${onosChart}"
RADIUS_CHART="${radiusChart}"
- APPS_TO_LOG="etcd kafka onos-onos-classic adapter-open-onu adapter-open-olt rw-core ofagent bbsim radius"
+ APPS_TO_LOG="etcd kafka onos-onos-classic adapter-open-onu adapter-open-olt rw-core ofagent bbsim radius bbsim-sadis-server"
LOG_FOLDER="$WORKSPACE/logs"
GERRIT_PROJECT="${GERRIT_PROJECT}"
diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index 5ab81a6..aa71574 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -100,8 +100,6 @@
withEapol: false
withDhcp: false
withIgmp: false
- extraHelmFlags: '--set use_openonu_adapter_go=true'
- openonuAdapterReplicas: 1
# jobs for 512 ONUs with a 8 openonu-adapters and clustered ONOS (1 OLT)
@@ -198,7 +196,6 @@
withEapol: false
withDhcp: true
withIgmp: true
- openonuAdapterReplicas: 1
onosReplicas: 3
atomixReplicas: 3
extraHelmFlags: '--set authRetry=true,dhcpRetry=true'
@@ -222,8 +219,6 @@
withEapol: true
withDhcp: true
withIgmp: false
- extraHelmFlags: '--set use_openonu_adapter_go=true'
- openonuAdapterReplicas: 1
- 'voltha-scale-measurements':
name: 'voltha-scale-measurements-master-10-stacks-2-16-32-dt-subscribers'
@@ -243,8 +238,6 @@
withEapol: false
withDhcp: false
withIgmp: false
- extraHelmFlags: '--set use_openonu_adapter_go=true'
- openonuAdapterReplicas: 1
- 'voltha-scale-measurements':
name: 'voltha-scale-measurements-master-10-stacks-2-16-32-tt-subscribers'
@@ -264,8 +257,6 @@
withEapol: false
withDhcp: true
withIgmp: true
- extraHelmFlags: '--set use_openonu_adapter_go=true'
- openonuAdapterReplicas: 1
# voltha-2.6 Jobs
- 'voltha-scale-measurements':
@@ -400,7 +391,6 @@
atomixReplicas: 3
kafkaReplicas: 3
etcdReplicas: 3
- openonuAdapterReplicas: 1
topologies: 1-16-16, 1-16-32, 2-16-32
time-trigger: H 0 * * *