X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-test-jobs.yaml;h=327257c3f42a3f426946632cc738d505d74fbc4e;hb=d6fed519e46b9f2956a28c030aa46bbb071ca176;hp=f7e41ee30e08d1af3c939a2bd6f1ac3e2b97c7ac;hpb=5a1af97d6c177ba6534e04dc62249d21e3417bb3;p=releng%2Fbuilder.git

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index f7e41ee30..327257c3f 100644
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -1,13 +1,14 @@
 - project:
     name: integration-test
     jobs:
-        - '{name}-verify-python-{stream}'
+        - '{project-name}-verify-python-{stream}'
         - 'integration-csit-verify-1node-library'
         - 'integration-distribution-test-{stream}'
         - 'integration-patch-test-{stream}'
         - 'integration-multipatch-test-{stream}'
 
     project: integration/test
+    project-name: integration-test
 
     stream:
         - boron:
@@ -59,6 +60,7 @@
                 usc-csit-1node-tcp-only-{stream},
                 usc-csit-1node-tcp-all-{stream},
                 vtn-csit-1node-manager-only-{stream},
+                vtn-csit-1node-manager-all-{stream},
                 vtn-csit-1node-coordinator-only-{stream}
 
         - beryllium:
@@ -174,7 +176,7 @@
     name: 'integration-csit-verify-1node-library'
 
     project-type: freestyle
-    node: dynamic_robot
+    node: centos7-robot-2c-2g
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -183,8 +185,11 @@
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
-        - project-parameter:
+        - opendaylight-infra-parameters:
             project: 'integration/test'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
         - integration-branch:
             branch: 'stable/beryllium'
         - integration-distribution-stream:
@@ -214,21 +219,18 @@
 
     scm:
         - integration-gerrit-scm:
-            credentials-id: '{ssh-credentials}'
             basedir: 'test'
             refspec: '$PATCHREFSPEC'
             branch: 'master'
 
     wrappers:
-        - build-timeout
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
         - integration-openstack-controller-mininet:
             controller-image: '{controller-image}'
             controller-vms: 1
             mininet-image: '{mininet-image}'
             mininet-vms: '{mininet-vms}'
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
 
     triggers:
         - integration-trigger-patch-submitted:
@@ -237,6 +239,7 @@
             pattern: 'csit/libraries/*'
 
     builders:
+        - integration-copy-ssh-keys
         - integration-cleanup-workspace
         - integration-install-robotframework
         - inject:
@@ -268,7 +271,7 @@
     name: 'integration-distribution-test-{stream}'
 
     project-type: freestyle
-    node: dynamic_verify
+    node: centos7-java-builder-2c-8g
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -305,7 +308,7 @@
     name: 'integration-patch-test-{stream}'
 
     project-type: maven
-    node: dynamic_verify
+    node: centos7-java-builder-2c-8g
     jdk: '{jdk}'
 
     logrotate:
@@ -315,31 +318,26 @@
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
-        - gerrit-parameters:
+        - opendaylight-infra-parameters:
             project: '$GERRIT_PROJECT'
             branch: '{branch}'
             refspec: '$GERRIT_REFSPEC'
-        - project-parameter:
-            project: '$GERRIT_PROJECT'
+            artifacts: '{archive-artifacts} **/dependency_tree.txt'
         - integration-branch:
             branch: '{branch}'
         - integration-distribution-git-url
 
     scm:
         - integration-gerrit-scm:
-            credentials-id: '{ssh-credentials}'
             basedir: '$GERRIT_PROJECT'
             refspec: '$GERRIT_REFSPEC'
             branch: '{branch}'
         - integration-distribution-scm:
-            credentials-id: '{ssh-credentials}'
             branch: '{branch}'
 
     wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - gerrit:
@@ -371,7 +369,7 @@
         - maven-target:
             maven-version: '{mvn33}'
             pom: '$GERRIT_PROJECT/pom.xml'
-            goals: 'clean install -V -B -Djenkins -DskipTests -Dcheckstyle.skip=true -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -DgenerateReports=false -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dstream={stream}'
+            goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt -V -B -Pq -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dstream={stream}'
             java-opts:
                 - '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
             settings: 'integration-settings'
@@ -382,7 +380,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'distribution/pom.xml'
-        goals: 'clean install -V -B -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt -V -B -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
         settings: 'integration-settings'
         settings-type: cfp
@@ -399,6 +397,8 @@
                   BUNDLEURL=$BUNDLEURL
 
     publishers:
+        - archive-build:
+            maven-version: '{mvn33}'
         - email-notification:
             email-prefix: '[$GERRIT_PROJECT]'
 
@@ -412,7 +412,7 @@
     name: 'integration-multipatch-test-{stream}'
 
     project-type: maven
-    node: dynamic_verify
+    node: centos7-java-builder-8c-8g
     jdk: '{jdk}'
 
     logrotate:
@@ -426,12 +426,11 @@
             patches_to_build: '$PATCHES_TO_BUILD'
         - integration-branch:
             branch: '{branch}'
-
-    wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-parameters:
+            project: 'integration/distribution'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts} **/dependency_tree.txt'
 
     prebuilders:
         - wipe-org-opendaylight-repo
@@ -442,12 +441,16 @@
             global-settings-file: 'odl-global-settings'
             settings-file: 'yangtools-settings'
 
+    wrappers:
+        - opendaylight-infra-wrappers:
+            build-timeout: '1200'
+
     maven:
         maven-name: '{mvn33}'
         root-pom: 'patch_tester/pom.xml'
         # TODO: Make Maven options configurable. Currently tests are not skipped, everything else is.
-        goals: 'clean install -f patch_tester/pom.xml -V -B -Djenkins -Dcheckstyle.skip=true -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -DgenerateReports=false -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dstream={stream}'
-        maven-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
+        goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt -f patch_tester/pom.xml -V -B -Pq -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dstream={stream}'
+        maven-opts: '-Xmx7168m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
         settings: 'yangtools-settings'
         settings-type: cfp
         global-settings: 'odl-global-settings'
@@ -462,5 +465,7 @@
                   BUNDLEURL=$BUNDLEURL
 
     publishers:
+        - archive-build:
+            maven-version: '{mvn33}'
         - email-notification:
-            email-prefix: '[integration]'
+            email-prefix: '[int/dist]'