Merge "Changes to jobs - re-install OLT even with in-band configuration"
diff --git a/jjb/pipeline/voltha-scale-test.groovy b/jjb/pipeline/voltha-scale-test.groovy
index 22c5d64..2e9610f 100644
--- a/jjb/pipeline/voltha-scale-test.groovy
+++ b/jjb/pipeline/voltha-scale-test.groovy
@@ -329,6 +329,8 @@
               _TAG=$INSTANCE kubectl exec $INSTANCE -- /usr/bin/tcpdump -nei eth0 port 1812 -w out.pcap&
             done
           fi
+          # set adapter log level to debug
+          voltctl log level set debug adapter-open-olt
         '''
       }
     }
diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index 0f03746..f6f3765 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -65,9 +65,9 @@
           openonuAdapterReplicas: 8
           onosReplicas: 3
           atomixReplicas: 3
-          extraHelmFlags: '--set debug=true,authRetry=true'
+          extraHelmFlags: '--set debug=true'
           withPcap: true
-          onosImg:  matteoscandolo/voltha-onos:timeout-release-identifier-single
+          onosImg:  andreacampanella/voltha-onos:aaa-identifier-cleanup-pier-socket
           openoltAdapterImg:  gcgirish/voltha-openolt-adapter:flowChanPerSub
           radiusChart: /home/cord/helm-charts/freeradius
 
@@ -630,6 +630,22 @@
 
     dsl: !include-raw-escape: pipeline/{pipeline-script}
 
+    triggers:
+      - gerrit:
+          server-name: '{gerrit-server-name}'
+          silent-start: false
+          successful-message: "PASSED scale test"
+          failure-message: "FAILED scale test"
+          unstable-message: "UNSTABLE scale test"
+          trigger-on:
+            - comment-added-contains-event:
+                comment-contains-value: '.*scale test.*'
+          projects:
+            - project-compare-type: REG_EXP
+              project-pattern: '^(voltha-go|voltha-openolt-adapter|voltha-openonu-adapter|ofagent-go|voltha-onos)$'
+              branches:
+                - branch-compare-type: REG_EXP
+                  branch-pattern: '{all-branches-regexp}'
 - job-template:
     id: 'voltha-scale-matrix-dev'
     name: '{name}'