Use custom images for scale test of ATT 2-16-32 job for storage analysis.
Dump etcd table to etcd metrics collection data folder at the end of the job.

Change-Id: I8bcb2c757eb03235ea9d43187da3548e98d9e802
diff --git a/jjb/pipeline/voltha/master/voltha-scale-test.groovy b/jjb/pipeline/voltha/master/voltha-scale-test.groovy
index 6486ffc..efe964c 100644
--- a/jjb/pipeline/voltha/master/voltha-scale-test.groovy
+++ b/jjb/pipeline/voltha/master/voltha-scale-test.groovy
@@ -704,6 +704,10 @@
         curl -s -X GET -G http://10.90.0.101:31301/api/v1/query --data-urlencode 'query=etcd_disk_backend_commit_duration_seconds_bucket' | jq '.data'  > $WORKSPACE/etcd-metrics/etcd-backend-write-time-bucket.json || true
         curl -s -X GET -G http://10.90.0.101:31301/api/v1/query --data-urlencode 'query=etcd_disk_wal_fsync_duration_seconds_bucket' | jq '.data'  > $WORKSPACE/etcd-metrics/etcd-wal-fsync-time-bucket.json || true
         curl -s -X GET -G http://10.90.0.101:31301/api/v1/query --data-urlencode 'query=etcd_network_peer_round_trip_time_seconds_bucket' | jq '.data'  > $WORKSPACE/etcd-metrics/etcd-network-peer-round-trip-time-seconds.json || true
+        etcd_namespace=\$(kubectl get pods --all-namespaces | grep etcd-0 | awk 'NR==1{print \$1}')
+        etcd_container=\$(kubectl get pods --all-namespaces | grep etcd-0 | awk 'NR==1{print \$2}')
+        kubectl exec -it -n  \$etcd_namespace \$etcd_container -- etcdctl defrag --cluster || true
+        kubectl exec -it -n  \$etcd_namespace \$etcd_container -- etcdctl endpoint status -w table > $WORKSPACE/etcd-metrics/etcd-status-table.txt || true
 
       '''
       // get VOLTHA debug infos
diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index 565e691..ca5fc69 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -64,6 +64,11 @@
           withIgmp: false
           extraHelmFlags: '--set authRetry=true,dhcpRetry=true --set global.log_correlation.enabled=true -f /home/jenkins/voltha-scale/voltha-values.yaml'
           onosImg: andreacampanella/voltha-onos:voltha-onos-2.5
+          bbsimImg: gcgirish/bbsim:etcd
+          rwCoreImg: volthacore/voltha-rw-core:noflows
+          ofAgentImg: volthacore/voltha-ofagent:noflows
+          openoltAdapterImg: gcgirish/voltha-openolt-adapter:etcdNew
+          openonuAdapterGoImg: gcgirish/voltha-openonu-adapter-go:etcdNew
           volthaHelmChartsChange: refs/changes/69/25069/7
 
       - 'voltha-scale-measurements':