commit 8ca990d388cba4f95aca029c8d908a83e69bdbd4
author You Wang <you@opennetworking.org> Tue Sep 22 02:01:33 2020 +0000
committer Gerrit Code Review <gerrit@opencord.org> Tue Sep 22 02:01:33 2020 +0000
tree 61e66afcf3f146a263e8726cddc19efb35e69bcc
parent a7600f19948a04fab45bc9cfcd3ac26fd10f78c4
parent ae518b5b86c37982c1ef80794c39781ecec54d1a

Merge "Trigger aether post-merge job from omec post-merge job"

jjb/pipeline/voltha-scale-test.groovy

diff --git a/jjb/pipeline/voltha-scale-test.groovy b/jjb/pipeline/voltha-scale-test.groovy
index 46b0074..ee908d3 100644
--- a/jjb/pipeline/voltha-scale-test.groovy
+++ b/jjb/pipeline/voltha-scale-test.groovy
@@ -401,11 +401,11 @@
           fi
 
           # copy the file
-          export OF_AGENT=$(kubectl get pods -l app=ofagent | awk 'NR==2{print $1}')
-          kubectl cp $OF_AGENT:out.pcap $LOG_FOLDER/ofagent.pcap
+          export OF_AGENT=$(kubectl get pods -l app=ofagent | awk 'NR==2{print $1}') || true
+          kubectl cp $OF_AGENT:out.pcap $LOG_FOLDER/ofagent.pcap || true
 
-          export BBSIM=$(kubectl get pods -l app=bbsim | awk 'NR==2{print $1}')
-          kubectl cp $BBSIM:out.pcap $LOG_FOLDER/bbsim.pcap
+          export BBSIM=$(kubectl get pods -l app=bbsim | awk 'NR==2{print $1}') || true
+          kubectl cp $BBSIM:out.pcap $LOG_FOLDER/bbsim.pcap || true
         fi
 
         cd voltha-system-tests
@@ -478,6 +478,7 @@
       // get ONOS debug infos
       sh '''
         sshpass -e ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 8101 karaf@127.0.0.1 ports > $LOG_FOLDER/onos-ports-list.txt || true
+        sshpass -e ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 8101 karaf@127.0.0.1 hosts > $LOG_FOLDER/onos-hosts-list.txt || true
 
         if [ ${withFlows} = true ] ; then
           sshpass -e ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 8101 karaf@127.0.0.1 volt-olts > $LOG_FOLDER/onos-olt-list.txt || true

jjb/voltha-scale.yaml

diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index 7104fbc..a40d7fe 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -97,6 +97,8 @@
           atomixReplicas: 3
           extraHelmFlags: '--set defaults.rw_core.timeout=30s '
           withPcap: true
+          ofAgentImg: 'matteoscandolo/voltha-ofagent-go:flow-chunk'
+          onosImg: 'matteoscandolo/voltha-onos:dhcp'
           logLevel: INFO
 
       # jobs for DT with 512 ONUs with a 8 openonu-adapters and clustered ONOS.