[VOL-3999] Using a loop for the port-forward in the software-upgrade jobs so the tests can restart it
Separating master and 2.7 pipeline so we can move to ingresses once
we're ready

Change-Id: I8cd06289c081ad98fbe410caeca5a53194a6052b
diff --git a/jjb/software-upgrades.yaml b/jjb/software-upgrades.yaml
index 1d2b17f..1fced67 100644
--- a/jjb/software-upgrades.yaml
+++ b/jjb/software-upgrades.yaml
@@ -38,7 +38,7 @@
 
       - 'software-upgrades-test':
           name: 'periodic-software-upgrade-test-bbsim-2.7'
-          pipeline-script: 'voltha/master/software-upgrades.groovy'
+          pipeline-script: 'voltha/voltha-2.7/software-upgrades.groovy'
           build-node: 'qct-pod4-node2'
           code-branch: 'voltha-2.7'
           aaa-version: '2.3.0'
@@ -249,4 +249,3 @@
       - timed: |
                  TZ=America/Los_Angeles
                  {time-trigger}
-