commit b1ab1505c0ea115df3e3886dbf5aebc3e3b3c927
author Hardik Windlass <hardik@opennetworking.org> Fri Oct 29 04:06:22 2021 +0000
committer Gerrit Code Review <gerrit@opencord.org> Fri Oct 29 04:06:22 2021 +0000
tree e1ab7d216e1ddea944aa7ebf9a6c7f81d275e2b5
parent 1cdfeb5116dae4ad17f689cf6c7866b7e5b18bdf
parent 35ac78290ed3f1cad9458ba4f14a4082cd39b242

Merge "Fixing installVoltctl keyword on soak pod and support log-level setting in ONOS for BBSim based Jobs"

jjb/pipeline/voltha/master/bbsim-tests.groovy

diff --git a/jjb/pipeline/voltha/master/bbsim-tests.groovy b/jjb/pipeline/voltha/master/bbsim-tests.groovy
index 4c88e46..fb24e72 100755
--- a/jjb/pipeline/voltha/master/bbsim-tests.groovy
+++ b/jjb/pipeline/voltha/master/bbsim-tests.groovy
@@ -105,6 +105,12 @@
       done
       ps aux | grep port-forward
       """
+      // setting ONOS log level
+      sh """
+      sshpass -e ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 30115 karaf@127.0.0.1 log:set ${logLevel.toUpperCase()} org.opencord.olt
+      sshpass -e ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 30115 karaf@127.0.0.1 log:set ${logLevel.toUpperCase()} org.opencord.aaa
+      sshpass -e ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 30115 karaf@127.0.0.1 log:set ${logLevel.toUpperCase()} org.opencord.dhcpl2relay
+      """
     }
   }
   stage('Run test ' + testTarget + ' on ' + workflow + ' workFlow') {
@@ -159,6 +165,7 @@
     PATH="$PATH:$WORKSPACE/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
     ROBOT_MISC_ARGS="-e PowerSwitch ${params.extraRobotArgs}"
     DIAGS_PROFILE="VOLTHA_PROFILE"
+    SSHPASS="karaf"
   }
   stages {
     stage('Download Code') {

jjb/pipeline/voltha/voltha-2.8/voltha-physical-soak-dt-tests.groovy

diff --git a/jjb/pipeline/voltha/voltha-2.8/voltha-physical-soak-dt-tests.groovy b/jjb/pipeline/voltha/voltha-2.8/voltha-physical-soak-dt-tests.groovy
index d4a8520..17cb701 100644
--- a/jjb/pipeline/voltha/voltha-2.8/voltha-physical-soak-dt-tests.groovy
+++ b/jjb/pipeline/voltha/voltha-2.8/voltha-physical-soak-dt-tests.groovy
@@ -38,7 +38,7 @@
   environment {
     KUBECONFIG="$WORKSPACE/${configBaseDir}/${configKubernetesDir}/${configFileName}.conf"
     VOLTCONFIG="$HOME/.volt/config-minimal"
-    PATH="$WORKSPACE/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+    PATH="$PATH:$WORKSPACE/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
   }
 
 
@@ -100,7 +100,7 @@
         script {
            deployment_config = readYaml file: "${configBaseDir}/${configDeploymentDir}/${configFileName}-DT.yaml"
         }
-        installvoltctl("${branch}")
+        installVoltctl("${branch}")
         sh returnStdout: false, script: """
         mkdir -p $WORKSPACE/bin
         # download kail