Merge "Update Centos7 devstack ocata images"

[releng/builder.git] / jjb / integration / integration-test-jobs.yaml

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 8ce41700b3652bf26eff84611a546fd830d0c5c2..ad523e6ce8145028568809eeb89d625ba883e764 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -18,12 +18,11 @@
     stream:
       - nitrogen:
           branch: 'master'
-          karaf-version: karaf3
           jre: 'openjdk8'
           csit-list: '{csit-list-nitrogen}'
           csit-sanity-list: '{csit-sanity-list-nitrogen}'
           csit-weekly-list: '{csit-weekly-list-nitrogen}'
-          schedule-weekly: 'H 12 * * 0'
+          schedule-weekly: 'H 23 * * 6'
           csit-high-frequency-list: ''
           schedule-high-frequency: ''
 
@@ -35,7 +34,7 @@
           csit-list: '{csit-list-carbon}'
           csit-sanity-list: '{csit-sanity-list-carbon}'
           csit-weekly-list: '{csit-weekly-list-carbon}'
-          schedule-weekly: 'H 12 * * 0'
+          schedule-weekly: 'H 23 * * 6'
           csit-high-frequency-list: '{csit-high-frequency-list-carbon}'
           schedule-high-frequency: 'H H/4 * * *'
 
@@ -47,12 +46,12 @@
           csit-list: '{csit-list-boron}'
           csit-sanity-list: '{csit-sanity-list-boron}'
           csit-weekly-list: '{csit-weekly-list-boron}'
-          schedule-weekly: 'H 12 * * 0'
+          schedule-weekly: 'H 23 * * 6'
           csit-high-frequency-list: ''
           schedule-high-frequency: ''
 
     # tools system image
-    tools_system_image: Ubuntu 14.04 - mininet-ovs-25 - 20170210-0300
+    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170808-0158
 
 # Template: integration-csit-verify-1node-library
 # Goal: Verify changes in csit folder not covered by projects suite verify jobs (e.g. libraries or variables)
@@ -246,7 +245,7 @@
           project: '$GERRIT_PROJECT'
           branch: '{branch}'
           refspec: '$GERRIT_REFSPEC'
-          artifacts: '{archive-artifacts} **/dependency_tree.txt'
+          artifacts: '{archive-artifacts}'
       - integration-distribution-branch:
           branch: '{branch}'
       - distribution-karaf-version:
@@ -290,7 +289,7 @@
       - integration-rebase-gerrit-patch
       - wipe-org-opendaylight-repo
       - provide-maven-settings:
-          global-settings-file: 'odl-global-settings'
+          global-settings-file: 'global-settings'
           settings-file: 'integration-settings'
       - maven-target:
           maven-version: 'mvn33'
@@ -304,7 +303,7 @@
             - '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
           settings: integration-settings
           settings-type: cfp
-          global-settings: odl-global-settings
+          global-settings: global-settings
           global-settings-type: cfp
       - maven-target:
           maven-version: mvn33
@@ -316,7 +315,7 @@
             - '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
           settings: integration-settings
           settings-type: cfp
-          global-settings: odl-global-settings
+          global-settings: global-settings
           global-settings-type: cfp
       - integration-upload-distribution:
           dist-pom: distribution/pom.xml
@@ -381,7 +380,7 @@
           project: 'integration/distribution'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts} **/dependency_tree.txt'
+          artifacts: '{archive-artifacts}'
       - maven-exec:
           maven-version: mvn33
 
@@ -393,7 +392,7 @@
       - wipe-org-opendaylight-repo
       - integration-multipatch-builder
       - provide-maven-settings:
-          global-settings-file: 'odl-global-settings'
+          global-settings-file: 'global-settings'
           settings-file: 'yangtools-settings'
       - maven-target:
           maven-version: mvn33
@@ -405,10 +404,10 @@
               -Dstream={stream}
               {opendaylight-infra-mvn-opts}
           java-opts:
-            - '-Xmx7168m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
+            - '-Xmx3072m -Dmaven.compile.fork=true'
           settings: integration-settings
           settings-type: cfp
-          global-settings: odl-global-settings
+          global-settings: global-settings
           global-settings-type: cfp
       - integration-upload-distribution:
           dist-pom: patch_tester/distribution/pom.xml