commit b4bb577cca7729f60caf4c9084cea235def834bb
author Matteo Scandolo <teo@opennetworking.org> Tue Dec 15 04:13:32 2020 +0000
committer Gerrit Code Review <gerrit@opencord.org> Tue Dec 15 04:13:32 2020 +0000
tree 67c0e9b4c579c8c0c6a545113f176167a7a33d97
parent 968cb015052769f00f708007ba64180dae422c99
parent 358bf5c760dd57e5228b311d80378265f9360655

Merge "Moving kind-voltha sanity test from 2.5 to 2.6"

jjb/defaults.yaml

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index d887d32..a67c32c 100644
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -79,7 +79,7 @@
     # regexp for gerrit triggers
     # list of supported branches, for branch-regexp
     all-branches-regexp: '.*'
-    supported-branches-regexp: '^(master|cord-7.0|cord-6.1|seba-1.0|voltha-2.3|voltha-2.4|voltha-2.5)$'
+    supported-branches-regexp: '^(master|cord-7.0|cord-6.1|seba-1.0|voltha-2.[0-9]+)$'
     legacy-branches-regexp: '^(cord-5.0|cord-4.1|cord-4.0)$'
     modern-branches-regexp: '^(master|cord-7.0|cord-6.1|cord-6.0|seba-1.0|voltha-2.3|voltha-2.4)$'
     platform-branches-regexp: '^(master|cord-7.0|cord-6.1)$'

jjb/verify/kind-voltha.yaml

diff --git a/jjb/verify/kind-voltha.yaml b/jjb/verify/kind-voltha.yaml
index 0958d9f..e66be45 100644
--- a/jjb/verify/kind-voltha.yaml
+++ b/jjb/verify/kind-voltha.yaml
@@ -21,5 +21,5 @@
           pipeline-script: 'voltha-bbsim-tests.groovy'
       - 'voltha-patch-test':
           pipeline-script: 'voltha-bbsim-tests.groovy'
-          name-extension: '-2.5'
-          override-branch: 'voltha-2.5'
+          name-extension: '-2.6'
+          override-branch: 'voltha-2.6'