Add "voltha-2.13" as valid branch for bbsim-tests
This involves a minor tweak to the code, but is preferable to the old
method of completely duplicating the entire file to allow a different
branch to be tested.
Signed-off-by: Eric Ball <eball@linuxfoundation.org>
Change-Id: Ide735b80c9629434e312834663b41f5763664cdc
diff --git a/jjb/pipeline/voltha/bbsim-tests.groovy b/jjb/pipeline/voltha/bbsim-tests.groovy
index bb16bc5..df4ad02 100644
--- a/jjb/pipeline/voltha/bbsim-tests.groovy
+++ b/jjb/pipeline/voltha/bbsim-tests.groovy
@@ -1,5 +1,5 @@
// -----------------------------------------------------------------------
-// Copyright 2021-2024 Open Networking Foundation Contributors
+// Copyright 2021-2025 Open Networking Foundation Contributors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -37,10 +37,10 @@
// as a guarantee release jobs are running in an expected sandbox.
// -----------------------------------------------------------------------
String branchName() {
- String br = 'master'
+ def validBranches = ["master", "voltha-2.13"]
// "${branch}" is assigned by jenkins
- if (br != branch) {
+ if (!validBranches.contains(branch)) {
String err = [
'ERROR: Detected invalid branch',
"(expected=[${br}] != found=[${branch}])"
@@ -48,7 +48,7 @@
throw new Exception(err) // groovylint-disable-line ThrowException
}
- return (br)
+ return (branch)
}
// -----------------------------------------------------------------------