Merge "Fill stable branch details"

[releng.git] / jjb / openci / openci-onap-daily-jobs.yaml

diff --git a/jjb/openci/openci-onap-daily-jobs.yaml b/jjb/openci/openci-onap-daily-jobs.yaml
index 4640eb3..88589d8 100644 (file)
--- a/jjb/openci/openci-onap-daily-jobs.yaml
+++ b/jjb/openci/openci-onap-daily-jobs.yaml
@@ -26,13 +26,27 @@
     concurrent: false
 
     parameters:
+      - string:
+          name: PUBLISH_EVENT_TYPE
+          default: ArtifactPublishedEvent
+          description: 'The type of the event this job publishes'
+      - string:
+          name: PUBLISH_EVENT_ORIGIN
+          default: ONAP
+          description: 'Originating community'
+      - string:
+          name: ARTIFACT_LOCATION
+          default: https://url/to/artifact/on/onap/nexus/$BUILD_NUMBER
+          description: 'The location of the artifact on ONAP Nexus'
+      - string:
+          name: CONFIDENCE_LEVEL
+          default: "'autorelease': 'SUCCESS'"
+          description: 'The confidence level the published artifact gained'
       - 'opnfv-build-defaults'
 
     builders:
-      - shell: |
-          #!/bin/bash
-
-          echo "Will construct and publish an ArtifactPublishedEvent"
+      - shell:
+          !include-raw-escape: ./create-ape.sh
 
 # This job gets triggered by a ConfidenceLevelModifiedEvent published
 # by OPNFV jobs so ONAP can promote the autorelease artifact even further.
@@ -52,19 +66,15 @@
     triggers:
       - jms-messaging:
           provider-name: openci.activemq
-          selector: CI_TYPE = 'custom'
-          checks:
-            - field: origin
-              expected-value: 'OPNFV'
-            - field: type
-              expected-value: 'ConfidenceLevelModifiedEvent'
+          selector: |
+            JMSType = 'ConfidenceLevelModifiedEvent' and JMSOrigin = 'OPNFV' and JMSScenario = 'k8-nosdn-onap-ha'
 
     builders:
       - shell: |
           #!/bin/bash
 
           echo
-          echo "Triggered by an event"
+          echo "Triggered by $type"
           echo "----------------------------------"
           echo $CI_MESSAGE
           echo "----------------------------------"