| commit | 57735a89e2dc9f6efe5286c17c0d4e3b79ec45ed | [log] [tgz] |
|---|---|---|
| author | Andrea Campanella <andrea@opennetworking.org> | Tue May 18 13:22:49 2021 +0200 |
| committer | Matteo Scandolo <matteo.scandolo@gmail.com> | Tue May 18 08:50:05 2021 -0700 |
| tree | d662a928cb97189db3779c56bcd21668b36f392f | |
| parent | ef2e99b9357979f1dfd0069e3bc4d32d585d260c [diff] [blame] |
[VOL-4114] Always sourcing the release file before kind-voltha commands Change-Id: I123957db6e1212583c29a8b0c873cfcde721a390
diff --git a/jjb/pipeline/voltha/voltha-2.7/voltha-system-test-bbsim.groovy b/jjb/pipeline/voltha/voltha-2.7/voltha-system-test-bbsim.groovy index 991ecee..d05077d 100644 --- a/jjb/pipeline/voltha/voltha-2.7/voltha-system-test-bbsim.groovy +++ b/jjb/pipeline/voltha/voltha-2.7/voltha-system-test-bbsim.groovy
@@ -149,6 +149,12 @@ extract_errors_python voltha-ofagent >> $WORKSPACE/error-report.log ## shut down kind-voltha + if [ "${branch}" != "master" ]; then + echo "on branch: ${branch}, sourcing kind-voltha/releases/${branch}" + source "$WORKSPACE/kind-voltha/releases/${branch}" + else + echo "on master, using default settings for kind-voltha" + fi cd $WORKSPACE/kind-voltha WAIT_ON_DOWN=y ./voltha down