Fix distribution patch differences script

[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 43fa3a267b97b23369038d120615bb979df1bf23..b1b6c24d74f9c3cd2ef342cdfd9ebc3925d511ec 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -196,6 +196,11 @@
               BUNDLE_URL=$BUNDLE_URL
               KARAF_VERSION=$KARAF_VERSION
 
+    wrappers:
+      - lf-infra-wrappers:
+          build-timeout: 1440
+          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+
     publishers:
       - opendaylight-infra-generate-csit-status-report
       - email-notification:
@@ -301,7 +306,7 @@
     builders:
       - integration-rebase-gerrit-patch
       - wipe-org-opendaylight-repo
-      - provide-maven-settings:
+      - lf-provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: 'integration-settings'
       - maven-target:
@@ -412,7 +417,7 @@
       - wipe-org-opendaylight-repo
       - lf-maven-install:
           mvn-version: '{mvn-version}'
-      - provide-maven-settings:
+      - lf-provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: 'integration-distribution-settings'
       - integration-multipatch-builder
@@ -513,6 +518,7 @@
 
     git-url: '$GIT_URL/$PROJECT'
     submodule-recursive: true
+    submodule-timeout: 10
 
     #####################
     # Job Configuration #
@@ -543,6 +549,7 @@
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
           submodule-recursive: '{submodule-recursive}'
+          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: default
 
     wrappers:
@@ -570,11 +577,11 @@
     publishers:
       - lf-infra-publish
 
-- view:
-    name: integration
-    description: 'List of integration jobs'
-    regex: '^integration-.*'
-    <<: *releng_view_common
+- project:
+    name: integration-view
+    views:
+      - project-view
+    project-name: integration
 
 - view:
     name: csit-stable-f
@@ -582,7 +589,7 @@
     job-name:
       - aaa-csit-1node-authn-all-fluorine
       - bgpcep-csit-1node-throughpcep-all-fluorine
-      - coe-csit-1node-container-networking-all-fluorine
+      - coe-csit-1node-container-networking-only-fluorine
       - controller-csit-1node-akka1-all-fluorine
       - controller-csit-1node-benchmark-all-fluorine
       - controller-csit-1node-notifications-longevity-only-fluorine
@@ -622,7 +629,7 @@
     job-name:
       - aaa-csit-1node-authn-all-neon
       - bgpcep-csit-1node-throughpcep-all-neon
-      - coe-csit-1node-container-networking-all-neon
+      - coe-csit-1node-container-networking-only-neon
       - controller-csit-1node-akka1-all-neon
       - controller-csit-1node-benchmark-all-neon
       - controller-csit-1node-notifications-longevity-only-neon