diff --git a/jjb/verify/bbsim-sadis-server.yaml b/jjb/verify/bbsim-sadis-server.yaml
index 4abebd2..0cc823b 100644
--- a/jjb/verify/bbsim-sadis-server.yaml
+++ b/jjb/verify/bbsim-sadis-server.yaml
@@ -8,8 +8,8 @@
     jobs:
       - 'verify-bbsim-sadis-server-jobs':
           branch-regexp: '{all-branches-regexp}'
-      - 'verify-bbsim-sadis-server-jobs-voltha-2.6':
-          name-extension: '-voltha-2.6'
+      - 'verify-bbsim-sadis-server-jobs-voltha-2.7':
+          name-extension: '-voltha-2.7'
           branch-regexp: '{kind-voltha-regexp}'
       - 'verify-bbsim-sadis-server-jobs-master':
           branch-regexp: '^master$'
@@ -29,10 +29,10 @@
           unit-test-keep-going: 'true'
 
 - job-group:
-    name: 'verify-bbsim-sadis-server-jobs-voltha-2.6'
+    name: 'verify-bbsim-sadis-server-jobs-voltha-2.7'
     jobs:
       - 'voltha-patch-test':
-          pipeline-script: 'voltha-bbsim-tests.groovy'
+          pipeline-script: 'voltha/voltha-2.7/bbsim-tests.groovy'
 
 - job-group:
     name: 'verify-bbsim-sadis-server-jobs-master'
diff --git a/jjb/verify/bbsim.yaml b/jjb/verify/bbsim.yaml
index b492f0e..19b9c69 100644
--- a/jjb/verify/bbsim.yaml
+++ b/jjb/verify/bbsim.yaml
@@ -8,9 +8,9 @@
     jobs:
       - 'verify-bbsim-jobs':
           branch-regexp: '{all-branches-regexp}'
-      - 'verify-bbsim-jobs-voltha-2.6':
-          name-extension: '-voltha-2.6'
-          override-branch: 'voltha-2.6'
+      - 'verify-bbsim-jobs-voltha-2.7':
+          name-extension: '-voltha-2.7'
+          override-branch: 'voltha-2.7'
           branch-regexp: '{kind-voltha-regexp}'
       - 'verify-bbsim-jobs-master':
           branch-regexp: '^master$'
@@ -30,10 +30,10 @@
           unit-test-keep-going: 'true'
 
 - job-group:
-    name: 'verify-bbsim-jobs-voltha-2.6'
+    name: 'verify-bbsim-jobs-voltha-2.7'
     jobs:
       - 'voltha-patch-test':
-          pipeline-script: 'voltha-bbsim-tests.groovy'
+          pipeline-script: 'voltha/voltha-2.7/bbsim-tests.groovy'
 
 - job-group:
     name: 'verify-bbsim-jobs-master'
diff --git a/jjb/verify/kind-voltha.yaml b/jjb/verify/kind-voltha.yaml
index 952b1c0..f90f16f 100644
--- a/jjb/verify/kind-voltha.yaml
+++ b/jjb/verify/kind-voltha.yaml
@@ -22,5 +22,5 @@
           pipeline-script: 'voltha-bbsim-tests.groovy'
       - 'voltha-patch-test':
           pipeline-script: 'voltha-bbsim-tests.groovy'
-          name-extension: '-2.6'
-          override-branch: 'voltha-2.6'
+          name-extension: '-2.7'
+          override-branch: 'voltha-2.7'
diff --git a/jjb/verify/ofagent-go.yaml b/jjb/verify/ofagent-go.yaml
index 1b01917..458e030 100644
--- a/jjb/verify/ofagent-go.yaml
+++ b/jjb/verify/ofagent-go.yaml
@@ -8,9 +8,9 @@
     jobs:
       - 'verify-ofagent-go-jobs':
           branch-regexp: '{all-branches-regexp}'
-      - 'verify-ofagent-jobs-voltha-2.6':
-          name-extension: '-voltha-2.6'
-          override-branch: 'voltha-2.6'
+      - 'verify-ofagent-jobs-voltha-2.7':
+          name-extension: '-voltha-2.7'
+          override-branch: 'voltha-2.7'
           branch-regexp: '{kind-voltha-regexp}'
       - 'verify-ofagent-jobs-master':
           branch-regexp: '^master$'
@@ -31,10 +31,10 @@
           junit-allow-empty-results: true
 
 - job-group:
-    name: 'verify-ofagent-jobs-voltha-2.6'
+    name: 'verify-ofagent-jobs-voltha-2.7'
     jobs:
       - 'voltha-patch-test':
-          pipeline-script: 'voltha-bbsim-tests.groovy'
+          pipeline-script: 'voltha/voltha-2.7/bbsim-tests.groovy'
 
 - job-group:
     name: 'verify-ofagent-jobs-master'
diff --git a/jjb/verify/ofagent-py.yaml b/jjb/verify/ofagent-py.yaml
index 733cbf7..59a231a 100644
--- a/jjb/verify/ofagent-py.yaml
+++ b/jjb/verify/ofagent-py.yaml
@@ -22,7 +22,7 @@
           unit-test-keep-going: 'true'
           junit-allow-empty-results: true
       - 'voltha-patch-test':
-          pipeline-script: 'voltha-bbsim-tests.groovy'
+          pipeline-script: 'voltha/voltha-2.7/bbsim-tests.groovy'
 
 - job-group:
     name: 'publish-ofagent-py-jobs'
diff --git a/jjb/verify/voltha-api-server.yaml b/jjb/verify/voltha-api-server.yaml
index a0dea40..58982e2 100644
--- a/jjb/verify/voltha-api-server.yaml
+++ b/jjb/verify/voltha-api-server.yaml
@@ -26,7 +26,7 @@
           unit-test-keep-going: 'true'
           junit-allow-empty-results: true
       - 'voltha-patch-test':
-          pipeline-script: 'voltha-bbsim-tests.groovy'
+          pipeline-script: 'voltha/voltha-2.7/bbsim-tests.groovy'
 
 - job-group:
     name: 'publish-voltha-api-server-jobs'
diff --git a/jjb/verify/voltha-go.yaml b/jjb/verify/voltha-go.yaml
index fa58daa..d3db340 100644
--- a/jjb/verify/voltha-go.yaml
+++ b/jjb/verify/voltha-go.yaml
@@ -8,9 +8,9 @@
     jobs:
       - 'verify-voltha-go-jobs':
           branch-regexp: '{all-branches-regexp}'
-      - 'verify-voltha-go-jobs-voltha-2.6':
-          name-extension: '-voltha-2.6'
-          override-branch: 'voltha-2.6'
+      - 'verify-voltha-go-jobs-voltha-2.7':
+          name-extension: '-voltha-2.7'
+          override-branch: 'voltha-2.7'
           branch-regexp: '{kind-voltha-regexp}'
       - 'verify-voltha-go-jobs-master':
           branch-regexp: '^master$'
@@ -39,10 +39,10 @@
           unit-test-keep-going: 'true'
 
 - job-group:
-    name: 'verify-voltha-go-jobs-voltha-2.6'
+    name: 'verify-voltha-go-jobs-voltha-2.7'
     jobs:
       - 'voltha-patch-test':
-          pipeline-script: 'voltha-bbsim-tests.groovy'
+          pipeline-script: 'voltha/voltha-2.7/bbsim-tests.groovy'
 
 - job-group:
     name: 'verify-voltha-go-jobs-master'
diff --git a/jjb/verify/voltha-helm-charts.yaml b/jjb/verify/voltha-helm-charts.yaml
index 77b8dc4..ebe7c50 100644
--- a/jjb/verify/voltha-helm-charts.yaml
+++ b/jjb/verify/voltha-helm-charts.yaml
@@ -8,9 +8,9 @@
     jobs:
       - 'verify-voltha-helm-charts-jobs':
           branch-regexp: '{all-branches-regexp}'
-      - 'verify-voltha-helm-charts-jobs-voltha-2.6':
-          name-extension: '-voltha-2.6'
-          override-branch: 'voltha-2.6'
+      - 'verify-voltha-helm-charts-jobs-voltha-2.7':
+          name-extension: '-voltha-2.7'
+          override-branch: 'voltha-2.7'
           branch-regexp: '{kind-voltha-regexp}'
       - 'verify-voltha-helm-charts-jobs-master':
           branch-regexp: '^master$'
@@ -25,10 +25,10 @@
           dependency-jobs: 'verify_voltha-helm-charts_tag-collision'
 
 - job-group:
-    name: 'verify-voltha-helm-charts-jobs-voltha-2.6'
+    name: 'verify-voltha-helm-charts-jobs-voltha-2.7'
     jobs:
       - 'voltha-patch-test':
-          pipeline-script: 'voltha-bbsim-tests.groovy'
+          pipeline-script: 'voltha/voltha-2.7/bbsim-tests.groovy'
 
 - job-group:
     name: 'verify-voltha-helm-charts-jobs-master'
diff --git a/jjb/verify/voltha-onos.yaml b/jjb/verify/voltha-onos.yaml
index 5d5dd88..7c7bd07 100644
--- a/jjb/verify/voltha-onos.yaml
+++ b/jjb/verify/voltha-onos.yaml
@@ -8,9 +8,9 @@
     jobs:
       - 'verify-voltha-onos-jobs':
           branch-regexp: '{all-branches-regexp}'
-      - 'verify-voltha-onos-jobs-voltha-2.6':
-          name-extension: '-voltha-2.6'
-          override-branch: 'voltha-2.6'
+      - 'verify-voltha-onos-jobs-voltha-2.7':
+          name-extension: '-voltha-2.7'
+          override-branch: 'voltha-2.7'
           branch-regexp: '{kind-voltha-regexp}'
       - 'verify-voltha-onos-jobs-master':
           branch-regexp: '^master$'
@@ -25,10 +25,10 @@
           dependency-jobs: 'verify_voltha-onos_licensed'
 
 - job-group:
-    name: 'verify-voltha-onos-jobs-voltha-2.6'
+    name: 'verify-voltha-onos-jobs-voltha-2.7'
     jobs:
       - 'voltha-patch-test':
-          pipeline-script: 'voltha-bbsim-tests.groovy'
+          pipeline-script: 'voltha/voltha-2.7/bbsim-tests.groovy'
 
 - job-group:
     name: 'verify-voltha-onos-jobs-master'
diff --git a/jjb/verify/voltha-openolt-adapter.yaml b/jjb/verify/voltha-openolt-adapter.yaml
index 91ff3df..f19edc7 100644
--- a/jjb/verify/voltha-openolt-adapter.yaml
+++ b/jjb/verify/voltha-openolt-adapter.yaml
@@ -8,9 +8,9 @@
     jobs:
       - 'verify-voltha-openolt-adapter-jobs':
           branch-regexp: '{all-branches-regexp}'
-      - 'verify-voltha-openolt-adapter-jobs-voltha-2.6':
-          name-extension: '-voltha-2.6'
-          override-branch: 'voltha-2.6'
+      - 'verify-voltha-openolt-adapter-jobs-voltha-2.7':
+          name-extension: '-voltha-2.7'
+          override-branch: 'voltha-2.7'
           branch-regexp: '{kind-voltha-regexp}'
       - 'verify-voltha-openolt-adapter-jobs-master':
           branch-regexp: '^master$'
@@ -39,10 +39,10 @@
           build-node: 'ubuntu16.04-basebuild-2c-4g'
 
 - job-group:
-    name: 'verify-voltha-openolt-adapter-jobs-voltha-2.6'
+    name: 'verify-voltha-openolt-adapter-jobs-voltha-2.7'
     jobs:
       - 'voltha-patch-test':
-          pipeline-script: 'voltha-bbsim-tests.groovy'
+          pipeline-script: 'voltha/voltha-2.7/bbsim-tests.groovy'
 
 - job-group:
     name: 'verify-voltha-openolt-adapter-jobs-master'
diff --git a/jjb/verify/voltha-openonu-adapter-go.yaml b/jjb/verify/voltha-openonu-adapter-go.yaml
index 3561490..4746e97 100644
--- a/jjb/verify/voltha-openonu-adapter-go.yaml
+++ b/jjb/verify/voltha-openonu-adapter-go.yaml
@@ -8,9 +8,9 @@
     jobs:
       - 'verify-voltha-openonu-adapter-go-jobs':
           branch-regexp: '{all-branches-regexp}'
-      - 'verify-voltha-openonu-adapter-go-jobs-voltha-2.6':
-          name-extension: '-voltha-2.6'
-          override-branch: 'voltha-2.6'
+      - 'verify-voltha-openonu-adapter-go-jobs-voltha-2.7':
+          name-extension: '-voltha-2.7'
+          override-branch: 'voltha-2.7'
           branch-regexp: '{kind-voltha-regexp}'
       - 'verify-voltha-openonu-adapter-go-jobs-master':
           branch-regexp: '^master$'
@@ -38,10 +38,10 @@
           build-node: 'ubuntu16.04-basebuild-2c-4g'
 
 - job-group:
-    name: 'verify-voltha-openonu-adapter-go-jobs-voltha-2.6'
+    name: 'verify-voltha-openonu-adapter-go-jobs-voltha-2.7'
     jobs:
       - 'voltha-patch-test':
-          pipeline-script: 'voltha-bbsim-tests.groovy'
+          pipeline-script: 'voltha/voltha-2.7/bbsim-tests.groovy'
 
 - job-group:
     name: 'verify-voltha-openonu-adapter-go-jobs-master'
diff --git a/jjb/verify/voltha-openonu-adapter.yaml b/jjb/verify/voltha-openonu-adapter.yaml
index 65afee2..fe18d4d 100644
--- a/jjb/verify/voltha-openonu-adapter.yaml
+++ b/jjb/verify/voltha-openonu-adapter.yaml
@@ -1,5 +1,6 @@
 ---
 # verification jobs for 'voltha-openonu-adapter' repo
+# NOTE this component is deprecated, should we keep running the tests?
 
 - project:
     name: voltha-openonu-adapter
@@ -8,9 +9,9 @@
     jobs:
       - 'verify-voltha-openonu-adapter-jobs':
           branch-regexp: '{all-branches-regexp}'
-      - 'verify-voltha-openonu-adapter-jobs-voltha-2.6':
-          name-extension: '-voltha-2.6'
-          override-branch: 'voltha-2.6'
+      - 'verify-voltha-openonu-adapter-jobs-voltha-2.7':
+          name-extension: '-voltha-2.7'
+          override-branch: 'voltha-2.7'
           branch-regexp: '{kind-voltha-regexp}'
       - 'verify-voltha-openonu-adapter-jobs-master':
           branch-regexp: '^master$'
@@ -35,10 +36,10 @@
           build-timeout: 15
 
 - job-group:
-    name: 'verify-voltha-openonu-adapter-jobs-voltha-2.6'
+    name: 'verify-voltha-openonu-adapter-jobs-voltha-2.7'
     jobs:
       - 'voltha-patch-test':
-          pipeline-script: 'voltha-bbsim-tests.groovy'
+          pipeline-script: 'voltha/voltha-2.7/bbsim-tests.groovy'
 
 - job-group:
     name: 'verify-voltha-openonu-adapter-jobs-master'
diff --git a/jjb/verify/voltha-system-tests.yaml b/jjb/verify/voltha-system-tests.yaml
index 937c388..f7efbab 100644
--- a/jjb/verify/voltha-system-tests.yaml
+++ b/jjb/verify/voltha-system-tests.yaml
@@ -8,9 +8,9 @@
     jobs:
       - 'verify-voltha-system-tests-jobs':
           branch-regexp: '{all-branches-regexp}'
-      - 'verify-voltha-system-tests-jobs-voltha-2.6':
-          name-extension: '-voltha-2.6'
-          override-branch: 'voltha-2.6'
+      - 'verify-voltha-system-tests-jobs-voltha-2.7':
+          name-extension: '-voltha-2.7'
+          override-branch: 'voltha-2.7'
           branch-regexp: '{kind-voltha-regexp}'
       - 'verify-voltha-system-tests-jobs-master':
           branch-regexp: '^master$'
@@ -27,10 +27,10 @@
           junit-allow-empty-results: true
 
 - job-group:
-    name: 'verify-voltha-system-tests-jobs-voltha-2.6'
+    name: 'verify-voltha-system-tests-jobs-voltha-2.7'
     jobs:
       - 'voltha-patch-test':
-          pipeline-script: 'voltha-bbsim-tests.groovy'
+          pipeline-script: 'voltha/voltha-2.7/bbsim-tests.groovy'
 
 - job-group:
     name: 'verify-voltha-system-tests-jobs-master'