Refactor: Cleanup for pre-commit

[ci-management.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 d328e25..b8168c2 100644 (file)
--- a/jjb/openci/openci-onap-daily-jobs.yaml
+++ b/jjb/openci/openci-onap-daily-jobs.yaml
@@ -2,68 +2,61 @@
 - project:
     name: openci-onap
 
-    project: '{name}'
+    project: "{name}"
 
     stream:
       - master:
-          branch: '{stream}'
-          gs-pathname: ''
+          branch: "{stream}"
+          gs-pathname: ""
           disabled: false
 
     jobs:
-      - 'openci-onap-autorelease-daily-{stream}'
-      - 'openci-onap-promote-daily-{stream}'
+      - "openci-onap-autorelease-daily-{stream}"
+      - "openci-onap-promote-daily-{stream}"
 
 # This job gets triggered manually for the demo purposes.
 #
 # In prototype, either what this job does needs to be integrated to
 # ONAP autorelease job or triggered by the upstream autorelease job.
 - job-template:
-    name: 'openci-onap-autorelease-daily-{stream}'
+    name: "openci-onap-autorelease-daily-{stream}"
 
-    disabled: '{obj:disabled}'
+    disabled: "{obj:disabled}"
 
     concurrent: false
 
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
     parameters:
       - string:
           name: PUBLISH_EVENT_TYPE
           default: ArtifactPublishedEvent
-          description: 'The type of the event this job publishes'
+          description: "The type of the event this job publishes"
       - string:
           name: PUBLISH_EVENT_ORIGIN
           default: ONAP
-          description: 'Originating community'
+          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'
+          description: "The location of the artifact on ONAP Nexus"
       - string:
           name: CONFIDENCE_LEVEL
           default: "'autorelease': 'SUCCESS'"
-          description: 'The confidence level the published artifact gained'
+          description: "The confidence level the published artifact gained"
+
+    wrappers:
+      - credentials-binding:
+          - username-password-separated:
+              credential-id: openci-connect-activemq
+              username: ACTIVEMQ_USER
+              password: ACTIVEMQ_PASSWORD
+      - workspace-cleanup
 
     builders:
-      # first build step in the job executes create-ape.sh to construct the
-      # ArtifactPublishedEvent (ape)
-      - shell:
-          !include-raw-escape: ./create-ape.sh
-      # constructed event gets injected into environment so JME Messaging
-      # plugin can publish the event and its properties in post-build step
-      - inject:
-          properties-file: "$WORKSPACE/event.properties"
-
-    publishers:
-      - jms-messaging:
-          provider-name: openci.activemq
-          msg-type: Custom
-          msg-props: |
-            type=$type
-            origin=$origin
-          msg-content:
-            $eventBody
+      # this build step in the job executes create-ape.sh to construct the
+      # ArtifactPublishedEvent (ape) and publish it using the python utility
+      - 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.
@@ -71,25 +64,19 @@
 # This job is created for the demo purposes and might not be there for
 # the prototype.
 - job-template:
-    name: 'openci-onap-promote-daily-{stream}'
+    name: "openci-onap-promote-daily-{stream}"
 
-    disabled: '{obj:disabled}'
+    disabled: "{obj:disabled}"
 
     concurrent: false
 
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
     triggers:
       - jms-messaging:
           provider-name: openci.activemq
-          selector: CI_TYPE = 'custom'
-          checks:
-            - field: origin
-              expected-value: 'OPNFV'
-            - field: type
-              expected-value: 'ConfidenceLevelModifiedEvent'
-            - field: scenario
-              expected-value: 'k8-nosdn-onap'
+          # yamllint disable-line rule:line-length
+          selector: JMSType = 'ConfidenceLevelModifiedEvent' and JMSOrigin = 'OPNFV' and JMSScenario = 'k8-nosdn-onap-ha'
 
     builders:
       - shell: |