commit ce73b7a2a3393aa9f72a4fa15bd64c625041e403
author Suchitra Vemuri <suchitra@opennetworking.org> Tue Feb 11 22:01:00 2020 -0800
committer Suchitra Vemuri <suchitra@opennetworking.org> Wed Feb 12 07:05:27 2020 +0000
tree af1a5c0417ed621ddb6341b374e90e1ba79c77a7
parent a7e8ad2d5c8cae9c8936e979436c7ad4a48d4870

[VOL-2586] Tests to include ONOS2.2 with latest apps

Change-Id: I393c6fe21e6558d7f305acaba01d37a123da5285

Jenkinsfile-voltha-bal31-build

diff --git a/Jenkinsfile-voltha-bal31-build b/Jenkinsfile-voltha-bal31-build
index f181ce1..cc5dd61 100644
--- a/Jenkinsfile-voltha-bal31-build
+++ b/Jenkinsfile-voltha-bal31-build
@@ -120,7 +120,7 @@
             stage('Push Sadis-config') {
                 timeout(1) {
                     sadis_out = sh returnStatus: true, script: """
-                    if [[ ${onosVersion} == "1.13.10" ]]; then
+                    if [[ "${onosVersion}" == "1.13.10" || "${onosVersion}" == "2.2" ]]; then
                         curl -sSL --user karaf:karaf -X POST -H Content-Type:application/json http://${deployment_config.nodes[0].ip}:30120/onos/v1/network/configuration --data @$WORKSPACE/voltha-system-tests/tests/data/${configFileName}-${onosVersion}-sadis.json
                     else
                         curl -sSL --user karaf:karaf -X POST -H Content-Type:application/json http://${deployment_config.nodes[0].ip}:30120/onos/v1/network/configuration --data @$WORKSPACE/voltha-system-tests/tests/data/${configFileName}-sadis.json
@@ -192,7 +192,7 @@
                             sshpass -p karaf ssh -p 30115 karaf@${deployment_config.nodes[0].ip} "log:set TRACE org.opencord.dhcpl2relay"
                             sshpass -p karaf ssh -p 30115 karaf@${deployment_config.nodes[0].ip} "log:set TRACE org.opencord.aaa"
                             sshpass -p karaf ssh -p 30115 karaf@${deployment_config.nodes[0].ip} "log:set TRACE org.opencord.olt"
-                            if [[ ${onosVersion} == "1.13.10" ]]; then
+                            if [[ "${onosVersion}" == "1.13.10" || "${onosVersion}" == "2.2" ]]; then
                                 sshpass -p karaf ssh -p 30115 karaf@${deployment_config.nodes[0].ip} "cfg set org.opencord.olt.impl.OltFlowService enableDhcpOnProvisioning true"
                                 sshpass -p karaf ssh -p 30115 karaf@${deployment_config.nodes[0].ip} "cfg set org.opencord.olt.impl.OltFlowService enableDhcpV4 true"
                                 sshpass -p karaf ssh -p 30115 karaf@${deployment_config.nodes[0].ip} "cfg set org.opencord.olt.impl.OltFlowService enableEapol true"