Merge "[VOL-3619] Failing the pipeline if the test fail and delete the OLT in ONOS before tearing down VOLTHA"
diff --git a/jjb/pipeline/voltha-scale-test.groovy b/jjb/pipeline/voltha-scale-test.groovy
index a6bc9e9..c4e7a59 100644
--- a/jjb/pipeline/voltha-scale-test.groovy
+++ b/jjb/pipeline/voltha-scale-test.groovy
@@ -336,6 +336,8 @@
kubectl exec \$INSTANCE -- bash /root/onos/${karafHome}/bin/client log:set ${logLevel} org.opencord
kubectl exec \$INSTANCE -- bash /root/onos/${karafHome}/bin/client log:set DEBUG org.opencord.olt
+
+ kubectl exec \$INSTANCE -- bash /root/onos/${karafHome}/bin/client log:set TRACE org.onosproject.net.meter.impl
done
diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index a1f8319..2d8d812 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -43,6 +43,10 @@
withIgmp: false
openonuAdapterReplicas: 1
openonuAdapterImg: voltha/voltha-openonu-adapter-go:master
+ onosImg: andreacampanella/voltha-onos:olt-meter-removal-master
+ ofAgentImg: andreacampanella/voltha-ofagent-go:meter-log
+ rwCoreImg: andreacampanella/voltha-rw-core:meter-log
+ withPcap: true
extraHelmFlags: '--set use_openonu_adapter_go=true'
# this job will be used to test custom images without disrupting tests on master
@@ -128,7 +132,6 @@
withDhcp: true
withIgmp: false
extraHelmFlags: '--set authRetry=true,dhcpRetry=true'
- onosImg: andreacampanella/voltha-onos:olt-queue
- 'voltha-scale-measurements':
name: 'voltha-scale-measurements-master-2-16-32-dt-subscribers'