Update vfc-nfvo-driver-ems yaml template

[ci-management.git] / jjb / dcae / apod-analytics.yaml

diff --git a/jjb/dcae/apod-analytics.yaml b/jjb/dcae/apod-analytics.yaml
index 96e9780..234bd2d 100644 (file)
--- a/jjb/dcae/apod-analytics.yaml
+++ b/jjb/dcae/apod-analytics.yaml
@@ -8,6 +8,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'release-1.0.0':
+          branch: 'release-1.0.0'
 
     # apply to all jobs
     project: 'dcae/apod/analytics'
@@ -16,7 +18,7 @@
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
     extra-project: 'dcae/apod/buildtools'
-    extra-branch: 'master'
+    extra-branch: '{branch}'
     extra-refspec: 'refs/heads/{branch}'
     checkout-dir: 'dcae-apod-buildtools'
 
@@ -24,16 +26,22 @@
       - '{project-name}-{stream}-daily-release-2scm-mvn-script':
           mvn-goals-versioning:
             'versions:set versions:update-child-modules versions:commit'
-          mvn-goals: 'clean deploy'
+          mvn-goals: 'clean deploy sonar:sonar -Dsonar.host.url=${{SONAR}}'
           maven-deploy-properties: |
               deployAtEnd=true
-          script:
-            !include-raw-escape: 'script-apod-analytics-daily-release.sh'
+          script: |
+            /bin/bash \
+                './dcae-apod-buildtools/scripts/script-apod-analytics-daily-release.sh'
+      - '{project-name}-{stream}-stage-site-java':
+          site-pom: 'pom.xml'
+          trigger-job: '{project-name}-{stream}-daily-release-2scm-mvn-script'
       - '{project-name}-{stream}-verify-2scm-mvn-script':
           mvn-goals: 'clean install'
-          script:
-            !include-raw-escape: 'script-apod-analytics-verify.sh'
+          script: |
+            /bin/bash \
+                './dcae-apod-buildtools/scripts/script-apod-analytics-verify.sh'
       - '{project-name}-{stream}-merge-2scm-mvn-script':
-          mvn-goals: 'clean install'
-          script:
-              !include-raw-escape: 'script-apod-analytics-merge.sh'
+          mvn-goals: 'clean deploy'
+          script: |
+            /bin/bash \
+                './dcae-apod-buildtools/scripts/script-apod-analytics-merge.sh'