diff options
| author |   Fatih Degirmenci <fdegir@gmail.com> | 2018-05-18 18:40:07 +0200 |
|---|---|---|
| committer | Fatih Degirmenci <fdegir@gmail.com> | 2018-05-18 18:40:07 +0200 |
| commit | bf9ae182a238adbffc597123ca34d8aedcb634b9 (patch) | |
| tree | ef0b9a5fa181973a156fdfb667ac3e0d4f972c4b | |
| parent | c36d2b37f572a52217831b6219de80fcd0326602 (diff) | |
openci: bugfix: Fix var names and event headers
Change-Id: I449037e727abed363766ca47a26ea3d2bd6abf4e
Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>
| -rwxr-xr-x | jjb/openci/create-cde.sh | 4 | ||||
| -rwxr-xr-x | jjb/openci/create-clme.sh | 4 | ||||
| -rw-r--r-- | jjb/openci/openci-opnfv-daily-jobs.yaml | 1 |
3 files changed, 5 insertions, 4 deletions
diff --git a/jjb/openci/create-cde.sh b/jjb/openci/create-cde.sh index ac16ab00e..410db50e6 100755 --- 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 85dd06d54..5e8ee10c9 100755 --- 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 e896149cd..cb150148b 100644 --- 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 |