VOL-2827 Fix minor issues
Change-Id: Ie368def72bd50723e65bf4d46b35de153bc13330
diff --git a/jjb/pipeline/voltha-physical-build-and-tests.groovy b/jjb/pipeline/voltha-physical-build-and-tests.groovy
index ddcd69f..66e09e7 100644
--- a/jjb/pipeline/voltha-physical-build-and-tests.groovy
+++ b/jjb/pipeline/voltha-physical-build-and-tests.groovy
@@ -91,7 +91,7 @@
stage('Get Patch') {
when {
- expression { params.manualBranch != "" }
+ expression { params.manualBranch == "" }
}
steps {
sh returnStdout: false, script: """
@@ -138,7 +138,7 @@
stage('Build and Push Images') {
when {
- expression { params.manualBranch != "" }
+ expression { params.manualBranch == "" }
}
steps {
sh returnStdout: false, script: """
@@ -324,7 +324,7 @@
stage('After-Test Delay') {
when {
- expression { params.manualBranch != "" }
+ expression { params.manualBranch == "" }
}
steps {
sh returnStdout: false, script: """
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index a10fb7d..41b95c2 100644
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -555,7 +555,7 @@
- project-compare-type: REG_EXP
project-pattern: '^(voltha-go|voltha-openolt-adapter|voltha-openonu-adapter|voltha-api-server|voltha-system-tests|ofagent-py|ofagent-go|voltha-onos)$'
branches:
- - branch-compare-type: PLAIN
+ - branch-compare-type: REG_EXP
branch-pattern: '^(master|voltha-2.3)$'