X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng-templates-java.yaml;h=c6af80ec2fde9d7385bfcf1002e1a2360ea4a4c2;hb=b5be33b878d75af8df189ee55974405b9a08dff1;hp=08b29ee7fa5a50b3866f0cfc0719fcffcfe6bb0f;hpb=c1db70fe1b5a1263a19b4b3e0e2ea196f1700482;p=releng%2Fbuilder.git

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index 08b29ee7f..c6af80ec2 100644
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -19,6 +19,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -43,12 +44,10 @@
       - maven-target:
           maven-version: 'mvn33'
           pom: 'pom.xml'
-          goals: >
+          goals: |
               clean install dependency:tree com.sonatype.clm:clm-maven-plugin:index
-              -V -B -Pq
-              -Djenkins
-              -Dmaven.repo.local=/tmp/r
-              -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
+              -Pq
+              {opendaylight-infra-mvn-opts}
           java-opts:
             - '-Xmx4096m -XX:MaxPermSize=512m'
           settings: '{mvn-settings}'
@@ -87,6 +86,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -118,149 +118,17 @@
           files: '**'
 
     builders:
-      # Step zero: Wipe file repositories up front.
-      - shell: |
-          echo "wipe r: the local Maven repository"
-          rm -rfv /tmp/r
-          echo "wipe n: the fake remote (Nexus) repository"
-          rm -rfv /tmp/n
-          echo "wipe t: the transient repository used in some manipulations"
-          rm -rfv /tmp/t
-      # Step one: Online build of the project, using local repository /tmp/r/ and deploying artifacts to /tmp/n/.
-      # Ordinary SingleFeatureTest failures are detected in the verify job, so we can use "q" profile here.
-      - maven-target:
-          maven-version: 'mvn33'
+      - distribution-check-wipe
+      - distribution-check-build-project:
           pom: '$GERRIT_PROJECT/pom.xml'
-          goals: >
-              clean deploy dependency:tree
-              -DoutputFile=dependency_tree.txt
-              -V -B -Pq
-              -Djenkins
-              -Dstream={stream}
-              -DaltDeploymentRepository=fake-nexus::default::file:///tmp/n/
-              -Dmaven.repo.local=/tmp/r
-              -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
-          java-opts:
-            - '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
-          settings: '{mvn-settings}'
-          settings-type: cfp
-          global-settings: 'odl-global-settings'
-          global-settings-type: cfp
-      # Step two: Verify all deployed artifacts belong to the project's groupId.
-      # This is done by moving the allowed directories out of /tmp/n and checking no files remained there.
-      # The correct directory is derived from $GERRIT_PROJECT.
-      - shell: |
-          mkdir -p /tmp/t/org/opendaylight/$GERRIT_PROJECT
-          mv /tmp/n/org/opendaylight/$GERRIT_PROJECT/* /tmp/t/org/opendaylight/$GERRIT_PROJECT/
-          test -z "`find /tmp/n/ -type f`" || ( echo "ERROR: Mismatched groupId detected (see above)." && false )
-          rm -rf /tmp/n
-          mv /tmp/t /tmp/n
-      # Step three: Online build of integration distribution.
-      # This step is mainly used for downloading other project artifacts.
-      # Running SingleFeaturesTest here does not seem to be required, so -Pq is used again.
-      - maven-target:
-          maven-version: 'mvn33'
-          pom: 'distribution/pom.xml'
-          goals: >
-              clean install dependency:tree
-              -DoutputFile=dependency_tree.txt
-              -V -B -Pq
-              -Djenkins
-              -Dstream={stream}
-              -Dmaven.repo.local=/tmp/r
-              -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
-          java-opts:
-            - '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
-          settings: '{mvn-settings}'
-          settings-type: cfp
-          global-settings: 'odl-global-settings'
-          global-settings-type: cfp
-      # Step four: Delete snapshot artifacts from the local repository.
-      # This is critical to detect orphaned artifacts or missing project-internal dependency declarations.
-      # Also other files related to maven repository resolution are removed,
-      # and then empty directories are removed, in order to simplify debugging.
-      - shell: !include-raw-escape: integration-distribution-delete-snaphot-artifacts.sh
-      # Now the ugly part. It seems that the only way to tell Maven 2+
-      # which remote repositories to use is via settings.xml file.
-      # So we create such a file here, but it needs most of odlparent:settings.xml
-      - shell: |
-          echo '
-          <settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
-            https://maven.apache.org/xsd/settings-1.0.0.xsd">
-            <profiles>
-              <profile>
-                <id>opendaylight-release</id>
-                <repositories>
-                  <repository>
-                    <id>opendaylight-mirror</id>
-                    <name>opendaylight</name>
-                    <url>https://nexus.opendaylight.org/content/repositories/public/</url>
-                    <releases><updatePolicy>never</updatePolicy></releases>
-                    <snapshots><enabled>false</enabled></snapshots>
-                  </repository>
-                </repositories>
-                <pluginRepositories>
-                  <pluginRepository>
-                    <id>opendaylight-plugin-mirror</id>
-                    <name>opendaylight-plugin</name>
-                    <url>https://nexus.opendaylight.org/content/repositories/public/</url>
-                    <releases><updatePolicy>never</updatePolicy></releases>
-                    <snapshots><enabled>false</enabled></snapshots>
-                  </pluginRepository>
-                </pluginRepositories>
-              </profile>
-              <profile>
-                <id>file-snapshots</id>
-                <repositories>
-                  <repository>
-                    <id>file-snapshots</id>
-                    <name>file</name>
-                    <url>file:///tmp/n/</url>
-                    <releases><enabled>false</enabled></releases>
-                  </repository>
-                </repositories>
-                <pluginRepositories>
-                  <pluginRepository>
-                    <id>file-plugin-snapshots</id>
-                    <name>file-plugin</name>
-                    <url>file:///tmp/n/</url>
-                    <releases><enabled>false</enabled></releases>
-                  </pluginRepository>
-                </pluginRepositories>
-              </profile>
-            </profiles>
-            <activeProfiles>
-              <activeProfile>file-snapshots</activeProfile>
-              <activeProfile>opendaylight-release</activeProfile>
-            </activeProfiles>
-          </settings>
-          ' > fake_remotes.xml
-      # # Notes: The settings are minimal in order to detect breakage scenarios while allowing for the following quirks:
-      # # * Some plugins seem to have hardcoded repos, for example check-license looks at repository.apache.org
-      # # * Some plugin artifacts (related to surefire) are not downloaded when tests are skipped.
-      # # * populate-local-repo looks at oss.sonatype.org and does not store things (like guava) to /tmp/r
-      # Step five: Repeat the distribution build but with the new settings.
-      # Here, only the project snapshot artifacts deployed to /tmp/n are available,
-      # which faithfully reproduces conditions in later verify-like job runs.
-      # We cannot use --offline, because: "Cannot access file (file:///tmp/n) in offline mode"
-      # This is where SingleFeatureTest is not skipped.
-      - maven-target:
-          maven-version: 'mvn33'
-          pom: 'distribution/pom.xml'
-          goals: >
-              clean install dependency:tree
-              -DoutputFile=dependency_tree.txt -s fake_remotes.xml
-              -V -B -Pq
-              -DskipTests=false
-              -Djenkins
-              -Dstream={stream}
-              -Dmaven.repo.local=/tmp/r
-              -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
-          java-opts:
-            - '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
-      # Step six: Run Karaf and verify no critical failures are present.
+      - distribution-check-verify-groupid:
+          gerrit-project: '$GERRIT_PROJECT'
+      - distribution-check-download-deps:
+          dist-pom: 'distribution/pom.xml'
+      - distribution-check-delete-snapshots
+      - distribution-check-configure-remotes
+      - distribution-check-repeat-build:
+          dist-pom: 'distribution/pom.xml'
       - integration-distribution-check
 
     publishers:
@@ -304,6 +172,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -330,7 +199,9 @@
           settings-file: '{mvn-settings}'
       - maven-target:
           maven-version: 'mvn33'
-          goals: '{mvn-goals} -V -B -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+          goals: |
+              {mvn-goals}
+              {opendaylight-infra-mvn-opts}
           java-opts:
             - '{mvn-opts}'
           settings: '{mvn-settings}'
@@ -373,6 +244,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -405,12 +277,9 @@
       maven-name: 'mvn33'
       goals: >
           {mvn-goals}
-          -V -B
-          -Djenkins
           -Dmerge
           -Dstream={stream}
-          -Dmaven.repo.local=/tmp/r
-          -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
+          {opendaylight-infra-mvn-opts}
       maven-opts: '{mvn-opts}'
       settings: '{mvn-settings}'
       settings-type: cfp
@@ -484,6 +353,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -512,13 +382,10 @@
           settings-file: '{mvn-settings}'
       - maven-target:
           maven-version: 'mvn33'
-          goals: >
+          goals: |
               {mvn-goals}
-              -V -B
-              -Djenkins
               -Dsonar
-              -Dmaven.repo.local=/tmp/r
-              -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
+              {opendaylight-infra-mvn-opts}
           maven-opts:
             - '{mvn-opts}'
           settings: '{mvn-settings}'
@@ -530,13 +397,11 @@
           # We should switch to the recommended configuration of sonar once
           # JJB adds support for configurating the Sonar wrapper:
           #    http://docs.sonarqube.org/display/SCAN/Analyzing+with+SonarQube+Scanner+for+Jenkins
-          goals: >
+          goals: |
               sonar:sonar
-              -V -B -Djenkins
               -Dsonar
               -Dsonar.host.url=https://sonar.opendaylight.org
-              -Dmaven.repo.local=/tmp/r
-              -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
+              {opendaylight-infra-mvn-opts}
           maven-opts:
             - '{mvn-opts}'
           settings: '{mvn-settings}'
@@ -568,6 +433,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -616,12 +482,11 @@
       - maven-target:
           maven-version: 'mvn33'
           pom: validate-pom.xml
-          goals: >
+          goals: |
               clean install dependency:tree
-              -V -B -T1.5C -Pq
-              -Djenkins
-              -Dmaven.repo.local=/tmp/r
-              -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
+              -T1.5C
+              -Pq
+              {opendaylight-infra-mvn-opts}
           java-opts:
             - '-Xmx8g'
           settings: 'autorelease-settings'
@@ -631,12 +496,10 @@
       - maven-target:
           maven-version: 'mvn33'
           pom: 'pom.xml'
-          goals: >
+          goals: |
               clean validate
-              -V -B -Pq
-              -Djenkins
-              -Dmaven.repo.local=/tmp/r
-              -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
+              -Pq
+              {opendaylight-infra-mvn-opts}
           java-opts:
             - '-Xmx8g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
           settings: 'autorelease-settings'
@@ -674,6 +537,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -702,12 +566,10 @@
           settings-file: '{mvn-settings}'
       - maven-target:
           maven-version: '{mvn-version}'
-          goals: >
-              {mvn-goals} -V -B
-              -Djenkins
+          goals: |
+              {mvn-goals}
               -Dstream={stream}
-              -Dmaven.repo.local=/tmp/r
-              -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
+              {opendaylight-infra-mvn-opts}
           java-opts:
             - '{mvn-opts}'
           settings: '{mvn-settings}'