Updated software upgrade job versions and pipeline

Change-Id: I7dc2feefa728dcd15a594c1eccb48965efeed70d
diff --git a/jjb/pipeline/voltha/master/software-upgrades.groovy b/jjb/pipeline/voltha/master/software-upgrades.groovy
index f3e7a4c..524d9ca 100755
--- a/jjb/pipeline/voltha/master/software-upgrades.groovy
+++ b/jjb/pipeline/voltha/master/software-upgrades.groovy
@@ -89,7 +89,7 @@
          split = onosImg.split(':')
         extraHelmFlags = extraHelmFlags + " --set onos-classic.image.repository=" + split[0] +",onos-classic.image.tag=" + split[1] + " "
       }
-      def olts = 1
+      Integer olts = 1
       if ("${name}" == "onu-image-dwl-simultaneously") {
           olts = 2
       }