Merge "VNFRQTS - Modify for initial build"

diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml
index 8fb8f4d..ac8aade 100644 (file)
--- a/jjb/dmaap/dmaap-datarouter.yaml
+++ b/jjb/dmaap/dmaap-datarouter.yaml
@@ -19,6 +19,29 @@
     stream:
       - 'master':
           branch: 'master'
+    mvn-settings: 'dmaap-datarouter-settings'
+    files: '**'
+    archive-artifacts: ''
+
+- project:
+    name: dmaap-datarouter-casablanca
+    project-name: 'dmaap-datarouter'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+      #
+      # see DMAAP-334 for more details, but
+      #     - '{project-name}-{stream}-docker-java-daily':
+      # doesn't support mvn-goals override, so trying this...
+      - '{project-name}-{stream}-docker-java-shell-daily':
+            mvn-goals: 'clean package -P docker docker:build -DpushImage'
+            # No-op
+            script: '/bin/true'
+            build-node: 'ubuntu1604-docker-8c-8g'
+
+    project: 'dmaap/datarouter'
+    stream:
       - 'casablanca':
           branch: 'casablanca'
     mvn-settings: 'dmaap-datarouter-settings'

diff --git a/jjb/sdnc/sdnc-csit.yaml b/jjb/sdnc/sdnc-csit.yaml
index dbbfb7c..b6fc80b 100644 (file)
--- a/jjb/sdnc/sdnc-csit.yaml
+++ b/jjb/sdnc/sdnc-csit.yaml
@@ -13,5 +13,7 @@
     functionality:
       - 'healthcheck':
           trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle'
+      - 'sdnc_netconf_tls_post_deploy':
+          trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle'
     robot-options: ''
     branch: 'master'