Merge "Fix nested trigger_jobs (A)"

diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
index 9278734..d075f52 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
+++ b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
@@ -19,7 +19,7 @@
       - '{project-name}-{stream}-verify-java':
       - '{project-name}-{stream}-merge-java':
       - '{project-name}-{stream}-docker-java-shell-daily':
-          mvn-goals: 'clean deploy'
+          mvn-goals: 'clean deploy docker:build -DpushImage'
           # No-op
           script: '/bin/true'
 

diff --git a/jjb/dmaap/dmaap-kafka.yaml b/jjb/dmaap/dmaap-kafka.yaml
new file mode 100644 (file)
index 0000000..0a15b18
--- /dev/null
+++ b/jjb/dmaap/dmaap-kafka.yaml
@@ -0,0 +1,25 @@
+---
+- project:
+    name: dmaap-kafka
+    project-name: 'dmaap-kafka'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+    project: 'dmaap/kafka11aaf'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'dmaap-kafka11aaf-settings'
+
+- project:
+    name: dmaap-kafka-sonar
+    jobs:
+      - gerrit-maven-sonar
+    cron: 'H 11 * * *'
+    build-node: ubuntu1604-builder-4c-4g
+    project: 'dmaap/kafka11aaf'
+    project-name: 'dmaap-kafka'
+    branch: 'master'
+    mvn-settings: 'dmaap-kafka11aaf-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/openci/create-ape.sh b/jjb/openci/create-ape.sh
index c54e0ef..5bd3a06 100755 (executable)
--- a/jjb/openci/create-ape.sh
+++ b/jjb/openci/create-ape.sh
@@ -37,11 +37,11 @@ cat <<EOF > ./json_body.txt
 }
 EOF
 
-python openci_publish -H 129.192.69.55 -U ${ACTIVEMQ_USER} -p ${ACTIVEMQ_PASSWORD} -n openci.prototype -B ./json_body.txt
-
 echo "Constructed $PUBLISH_EVENT_TYPE"
 echo "--------------------------------------------"
 cat  ./json_body.txt
 echo "--------------------------------------------"
 
+python openci_publish -H 129.192.69.55 -U ${ACTIVEMQ_USER} -p ${ACTIVEMQ_PASSWORD} -n openci.prototype -B ./json_body.txt
+
 deactivate

diff --git a/jjb/openci/openci-onap-daily-jobs.yaml b/jjb/openci/openci-onap-daily-jobs.yaml
index bf6afde..b956da7 100644 (file)
--- a/jjb/openci/openci-onap-daily-jobs.yaml
+++ b/jjb/openci/openci-onap-daily-jobs.yaml
@@ -45,6 +45,14 @@
           default: "'autorelease': 'SUCCESS'"
           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:
       # this build step in the job executes create-ape.sh to construct the
       # ArtifactPublishedEvent (ape) and publish it using the python utility