commit 251613a80abf057f3c6293aa60460822d155d9a2
author Andy Bavier <andy@opennetworking.org> Mon Mar 30 21:32:18 2020 +0000
committer Gerrit Code Review <gerrit@opencord.org> Mon Mar 30 21:32:18 2020 +0000
tree def3d6800a475ab013193aefbaa84928718e600e
parent 6972f1e6a91d2e086585e1d6897462c088f2c641
parent b567af7956f625bfcbfcaa615b21ba4baf3d219d

Merge "VOL-2827 Fix error in pipeline"

jjb/cord-macros.yaml

diff --git a/jjb/cord-macros.yaml b/jjb/cord-macros.yaml
index 5a0f123..cc12b36 100644
--- a/jjb/cord-macros.yaml
+++ b/jjb/cord-macros.yaml
@@ -151,6 +151,12 @@
                 - type: JSONPath
                   key: merged
                   value: $.pull_request.merged
+                - type: JSONPath
+                  key: branchName
+                  value: $.pull_request.base.ref
+                - type: JSONPath
+                  key: gitRef
+                  value: $.pull_request.base.ref
             regex-filter-text: $action,$merged
             regex-filter-expression: ^(closed,true)$
             cause: Generic Cause

jjb/cord-test/voltha.yaml

diff --git a/jjb/cord-test/voltha.yaml b/jjb/cord-test/voltha.yaml
index d1344cb..cbc57ac 100644
--- a/jjb/cord-test/voltha.yaml
+++ b/jjb/cord-test/voltha.yaml
@@ -118,6 +118,7 @@
           config-pod: 'flex-ocp-cord'
           release: '2.3'
           branch: 'voltha-2.3'
+          power-switch: True
           test-repo: 'voltha-system-tests'
           profile: '1T4GEM'