commit e4a54b4cd13cb977a3f31bc9429e8347f994a187
author Daniele Moro <daniele.moro@intel.com> Thu May 19 13:07:25 2022 +0000
committer Gerrit Code Review <gerrit@opencord.org> Thu May 19 13:07:25 2022 +0000
tree 2fccb9ca078cd56bf949b17c3004c248b750864b
parent e46b4b933c707562958460ea45518983a9ac0978
parent cdbc7e9de29159908f7cec0eab29f3c4ef767f63

Merge "Update devel to latest in up4 nightly jobs"

jjb/pipeline/voltha/master/physical-build.groovy

diff --git a/jjb/pipeline/voltha/master/physical-build.groovy b/jjb/pipeline/voltha/master/physical-build.groovy
index 45bf2ff..ab8928d 100755
--- a/jjb/pipeline/voltha/master/physical-build.groovy
+++ b/jjb/pipeline/voltha/master/physical-build.groovy
@@ -330,6 +330,8 @@
                     sshpass -p ${deployment_config.olts[i].pass} ssh -l ${deployment_config.olts[i].user} ${deployment_config.olts[i].sship} 'dpkg --list | grep rlt-1600g-w | wc -l'
                   elif [[ "${deployment_config.olts[i].oltDebVersion}" == *"rlt-3200g-w"* ]]; then
                     sshpass -p ${deployment_config.olts[i].pass} ssh -l ${deployment_config.olts[i].user} ${deployment_config.olts[i].sship} 'dpkg --list | grep rlt-3200g-w | wc -l'
+                  elif [[ "${deployment_config.olts[i].oltDebVersion}" == *"sda3016ss"* ]]; then
+                    sshpass -p ${deployment_config.olts[i].pass} ssh -l ${deployment_config.olts[i].user} ${deployment_config.olts[i].sship} 'dpkg --list | grep sda3016ss | wc -l'
                   else
                     echo Unknown Debian package for openolt
                   fi

jjb/pipeline/voltha/voltha-2.8/physical-build.groovy

diff --git a/jjb/pipeline/voltha/voltha-2.8/physical-build.groovy b/jjb/pipeline/voltha/voltha-2.8/physical-build.groovy
index 774df4b..2ef801f 100644
--- a/jjb/pipeline/voltha/voltha-2.8/physical-build.groovy
+++ b/jjb/pipeline/voltha/voltha-2.8/physical-build.groovy
@@ -323,6 +323,8 @@
                     sshpass -p ${deployment_config.olts[i].pass} ssh -l ${deployment_config.olts[i].user} ${deployment_config.olts[i].sship} 'dpkg --list | grep rlt-1600g-w | wc -l'
                   elif [[ "${deployment_config.olts[i].oltDebVersion}" == *"rlt-3200g-w"* ]]; then
                     sshpass -p ${deployment_config.olts[i].pass} ssh -l ${deployment_config.olts[i].user} ${deployment_config.olts[i].sship} 'dpkg --list | grep rlt-3200g-w | wc -l'
+                  elif [[ "${deployment_config.olts[i].oltDebVersion}" == *"sda3016ss"* ]]; then
+                    sshpass -p ${deployment_config.olts[i].pass} ssh -l ${deployment_config.olts[i].user} ${deployment_config.olts[i].sship} 'dpkg --list | grep sda3016ss | wc -l'
                   else
                     echo Unknown Debian package for openolt
                   fi

jjb/pipeline/voltha/voltha-2.9/physical-build.groovy

diff --git a/jjb/pipeline/voltha/voltha-2.9/physical-build.groovy b/jjb/pipeline/voltha/voltha-2.9/physical-build.groovy
index 0cce069..5d098b4 100644
--- a/jjb/pipeline/voltha/voltha-2.9/physical-build.groovy
+++ b/jjb/pipeline/voltha/voltha-2.9/physical-build.groovy
@@ -332,6 +332,8 @@
                     sshpass -p ${deployment_config.olts[i].pass} ssh -l ${deployment_config.olts[i].user} ${deployment_config.olts[i].sship} 'dpkg --list | grep rlt-1600g-w | wc -l'
                   elif [[ "${deployment_config.olts[i].oltDebVersion}" == *"rlt-3200g-w"* ]]; then
                     sshpass -p ${deployment_config.olts[i].pass} ssh -l ${deployment_config.olts[i].user} ${deployment_config.olts[i].sship} 'dpkg --list | grep rlt-3200g-w | wc -l'
+                  elif [[ "${deployment_config.olts[i].oltDebVersion}" == *"sda3016ss"* ]]; then
+                    sshpass -p ${deployment_config.olts[i].pass} ssh -l ${deployment_config.olts[i].user} ${deployment_config.olts[i].sship} 'dpkg --list | grep sda3016ss | wc -l'
                   else
                     echo Unknown Debian package for openolt
                   fi

jjb/voltha-scale.yaml

diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index 6eec982..537b5b2 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -508,7 +508,7 @@
           pipeline-script: 'voltha/master/voltha-scale-lwc-test.groovy'
           build-node: 'berlin-community-pod-2'
           time-trigger: "H H * * *"
-          disable-job: false
+          disable-job: true
           withMonitoring: true
           olts: 1
           pons: 16
@@ -527,7 +527,7 @@
           pipeline-script: 'voltha/master/voltha-scale-lwc-test.groovy'
           build-node: 'berlin-community-pod-2'
           time-trigger: "H H * * *"
-          disable-job: false
+          disable-job: true
           withMonitoring: true
           olts: 1
           pons: 16