Add scenario to publisher and filter

Change-Id: I52d4ecb5f305f190a9e06c13407fd0927bc45a29
Signed-off-by: Yolanda Robla <yroblamo@redhat.com>

diff --git a/jjb/openci/create-cde.sh b/jjb/openci/create-cde.sh
index ae50b3d..8fb9f00 100755 (executable)
--- a/jjb/openci/create-cde.sh
+++ b/jjb/openci/create-cde.sh
@@ -31,6 +31,7 @@ cat <<EOF > ./json_body.txt
     "buildUrl": "$BUILD_URL",
     "branch": "master",
     "origin": "$PUBLISH_EVENT_ORIGIN",
+    "scenario": "$DEPLOY_SCENARIO",
     "compositionName": "$DEPLOY_SCENARIO",
     "compositionMetadataUrl": "$SCENARIO_METADATA_LOCATION"
 }

diff --git a/jjb/openci/openci-opnfv-daily-jobs.yaml b/jjb/openci/openci-opnfv-daily-jobs.yaml
index 0093a3e..2be30ce 100644 (file)
--- a/jjb/openci/openci-opnfv-daily-jobs.yaml
+++ b/jjb/openci/openci-opnfv-daily-jobs.yaml
@@ -112,7 +112,7 @@
     triggers:
       - jms-messaging:
           provider-name: openci.activemq
-          selector: JMSType = 'CompositionDefinedEvent' and JMSOrigin = 'OPNFV'
+          selector: JMSType = 'CompositionDefinedEvent' and JMSOrigin = 'OPNFV' and JMSScenario = '{scenario}'
 
     builders:
       - shell: |