openci: bugfix: Fix var names and event headers

Change-Id: I449037e727abed363766ca47a26ea3d2bd6abf4e
Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>

diff --git a/jjb/openci/create-cde.sh b/jjb/openci/create-cde.sh
index ac16ab0..410db50 100755 (executable)
--- a/jjb/openci/create-cde.sh
+++ b/jjb/openci/create-cde.sh
@@ -19,9 +19,9 @@ cat << EOF > $WORKSPACE/event.properties
 type=$PUBLISH_EVENT_TYPE
 origin=$PUBLISH_EVENT_ORIGIN
 scenario=$DEPLOY_SCENARIO
-eventBody="{ 'type': '$EVENT_TYPE', 'id': '$(uuidgen)', 'time': '$(date -u +%Y-%m-%d_%H:%M:%SUTC)', 'origin': '$EVENT_ORIGIN', 'buildUrl': '$BUILD_URL', 'branch': 'master', 'compositionName': '$DEPLOY_SCENARIO', 'compositionMetadataUrl': '$SCENARIO_METADATA' }"
+eventBody="{ 'type': '$PUBLISH_EVENT_TYPE', 'id': '$(uuidgen)', 'time': '$(date -u +%Y-%m-%d_%H:%M:%SUTC)', 'origin': '$PUBLISH_EVENT_ORIGIN', 'buildUrl': '$BUILD_URL', 'branch': 'master', 'compositionName': '$DEPLOY_SCENARIO', 'compositionMetadataUrl': '$SCENARIO_METADATA_LOCATION' }"
 EOF
-echo "Constructed $EVENT_TYPE"
+echo "Constructed $PUBLISH_EVENT_TYPE"
 echo "--------------------------------------------"
 cat $WORKSPACE/event.properties
 echo "--------------------------------------------"

diff --git a/jjb/openci/create-clme.sh b/jjb/openci/create-clme.sh
index 85dd06d..5e8ee10 100755 (executable)
--- a/jjb/openci/create-clme.sh
+++ b/jjb/openci/create-clme.sh
@@ -19,9 +19,9 @@ cat << EOF > $WORKSPACE/event.properties
 type=$PUBLISH_EVENT_TYPE
 origin=$PUBLISH_EVENT_ORIGIN
 scenario=$DEPLOY_SCENARIO
-eventBody="{ 'type': '$EVENT_TYPE', 'id': '$(uuidgen)', 'time': '$(date -u +%Y-%m-%d_%H:%M:%SUTC)', 'origin': '$EVENT_ORIGIN', 'buildUrl': '$BUILD_URL', 'branch': 'master', 'compositionName': '$DEPLOY_SCENARIO', 'compositionMetadataUrl': '$SCENARIO_METADATA', 'confidenceLevel': { $CONFIDENCE_LEVEL } }"
+eventBody="{ 'type': '$PUBLISH_EVENT_TYPE', 'id': '$(uuidgen)', 'time': '$(date -u +%Y-%m-%d_%H:%M:%SUTC)', 'origin': '$PUBLISH_EVENT_ORIGIN', 'buildUrl': '$BUILD_URL', 'branch': 'master', 'compositionName': '$DEPLOY_SCENARIO', 'compositionMetadataUrl': '$SCENARIO_METADATA_LOCATION', 'confidenceLevel': { $CONFIDENCE_LEVEL } }"
 EOF
-echo "Constructed $EVENT_TYPE"
+echo "Constructed $PUBLISH_EVENT_TYPE"
 echo "--------------------------------------------"
 cat $WORKSPACE/event.properties
 echo "--------------------------------------------"

diff --git a/jjb/openci/openci-opnfv-daily-jobs.yaml b/jjb/openci/openci-opnfv-daily-jobs.yaml
index e896149..cb15014 100644 (file)
--- a/jjb/openci/openci-opnfv-daily-jobs.yaml
+++ b/jjb/openci/openci-opnfv-daily-jobs.yaml
@@ -77,6 +77,7 @@
           msg-props: |
             type=$type
             origin=$origin
+            scenario=$scenario
           msg-content:
             $eventBody