Full distribution build

- Distribution verify and merge will build full distribution.
- Remove old maven site configuration & clean up stuff.

Change-Id: Ifd23e5bd2934840e25b1457dbb87f2ecce12a0d3
Signed-off-by: Luis Gomez <ecelgp@gmail.com>

diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml
index 1ffd0ea7d9d4680920ff929e00d312b5aa9b1f91..75694f5d20f64b55d6ac64b5b2b6e4cb38ea15ef 100644 (file)
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -1,14 +1,11 @@
 ---
-- project:
-    name: distribution-jobs
-
 - job-template:
     name: 'distribution-verify-{stream}'
 
     project-type: freestyle
     node: centos7-builder-8c-8g
     concurrent: true
-    jdk: '{jre}'
+    jdk: '{java-version}'
 
     properties:
       - opendaylight-infra-properties:
@@ -21,12 +18,10 @@
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
           artifacts: '{archive-artifacts}'
-      - integration-patch-refspec:
-          branch: '$GERRIT_REFSPEC'
 
     scm:
       - gerrit-trigger-scm:
-          refspec: '$PATCHREFSPEC'
+          refspec: '$GERRIT_REFSPEC'
           choosing-strategy: 'gerrit'
 
     wrappers:
@@ -52,6 +47,7 @@
               clean install dependency:tree -DoutputFile=dependency_tree.txt
               -Dstream={stream}
               -Dsft.heap.max=4g
+              -Pmanaged -Punmanaged
               {opendaylight-infra-mvn-opts}
           # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
           java-opts:
@@ -67,7 +63,7 @@
       - lf-infra-publish
       - email-notification:
           email-recipients: '{email-recipients}'
-          email-prefix: '[int/dist]'
+          email-prefix: '[{project-name}]'
 
 - job-template:
     name: 'distribution-merge-{stream}'
@@ -79,7 +75,7 @@
 
     project-type: maven
     node: 'centos7-builder-8c-8g'
-    jdk: '{jre}'
+    jdk: '{java-version}'
 
     properties:
       - opendaylight-infra-properties:
@@ -107,7 +103,7 @@
     triggers:
       - gerrit-trigger-patch-merged:
           gerrit-server-name: '{gerrit-server-name}'
-          name: 'integration/distribution'
+          name: '{project}'
           branch: '{branch}'
 
     prebuilders:
@@ -128,45 +124,14 @@
           -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
           -Dsft.heap.max=4g
           -Djenkins -Dmerge -Dstream={stream}
+          -Pmanaged -Punmanaged
       maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-      settings: 'integration-settings'
+      settings: integration-settings
       settings-type: cfp
-      global-settings: 'global-settings'
+      global-settings: global-settings
       global-settings-type: cfp
 
     postbuilders:
-      - conditional-step:
-          condition-kind: file-exists
-          condition-filename: deploy-site.xml
-          condition-basedir: workspace
-
-          # The strategy here is intentional to run Maven site:deploy twice
-          # once using regular pom.xml to produce a staged-site which is
-          # then used by deploy-site.xml to push to Nexus. This is a
-          # workaround to Maven Site's default linking code which creates
-          # incorrect URLs for sites due to auto-detection assuming your
-          # project is configured in a certain way which ODL is not.
-          steps:
-            - maven-target:
-                maven-version: 'mvn33'
-                pom: pom.xml
-                goals: 'site:deploy -V -B -Dstream={stream}'
-                java-opts:
-                  - '-Xmx2g'
-                settings: 'integration-settings'
-                settings-type: cfp
-                global-settings: 'global-settings'
-                global-settings-type: cfp
-            - maven-target:
-                maven-version: 'mvn33'
-                pom: deploy-site.xml
-                goals: 'site:deploy -V -B -Dstream={stream}'
-                java-opts:
-                  - '-Xmx2g'
-                settings: 'integration-settings'
-                settings-type: cfp
-                global-settings: 'global-settings'
-                global-settings-type: cfp
       - integration-compare-distributions
     # TODO: the output of the above command is not *friendly* for the reader because the most important info
     # is listed last. This is fine/best for command line output, but for keeping in a file it would be better
@@ -184,7 +149,7 @@
       - lf-infra-publish
       - email-notification:
           email-recipients: '{email-recipients}'
-          email-prefix: '[int/dist]'
+          email-prefix: '[{project-name}]'
 
 - job-template:
     name: 'distribution-check-{stream}'
@@ -317,7 +282,7 @@
     publishers:
       - email-notification:
           email-recipients: '{email-recipients}'
-          email-prefix: '[int/dist]'
+          email-prefix: '[{project-name}]'
       - integration-csit-archive-build
       - lf-infra-publish
 
@@ -363,6 +328,6 @@
     publishers:
       - email-notification:
           email-recipients: '{email-recipients}'
-          email-prefix: '[int/dist]'
+          email-prefix: '[{project-name}]'
       - integration-csit-archive-build
       - lf-infra-publish