Merge "Add upgrade tests job"

[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 80327f4a8ec1eb7fec56573c8609da43e345faeb..3ae1fb43d05185191b6902f47906aba30bdd75a6 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -301,7 +301,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 +412,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 +513,7 @@
 
     git-url: '$GIT_URL/$PROJECT'
     submodule-recursive: true
+    submodule-timeout: 10
 
     #####################
     # Job Configuration #
@@ -543,6 +544,7 @@
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
           submodule-recursive: '{submodule-recursive}'
+          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: default
 
     wrappers:
@@ -570,11 +572,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
@@ -594,8 +596,8 @@
       - daexim-csit-1node-basic-only-fluorine
       - daexim-csit-3node-clustering-basic-only-fluorine
       - distribution-csit-1node-userfeatures-all-fluorine
-      - genius-csit-1node-upstream-all-fluorine
-      - genius-csit-3node-upstream-all-fluorine
+      - genius-csit-1node-upstream-only-fluorine
+      - genius-csit-3node-upstream-only-fluorine
       - lispflowmapping-csit-1node-msmr-all-fluorine
       - netconf-csit-1node-callhome-only-fluorine
       - netconf-csit-1node-userfeatures-all-fluorine
@@ -634,8 +636,8 @@
       - daexim-csit-1node-basic-only-neon
       - daexim-csit-3node-clustering-basic-only-neon
       - distribution-csit-1node-userfeatures-all-neon
-      - genius-csit-1node-upstream-all-neon
-      - genius-csit-3node-upstream-all-neon
+      - genius-csit-1node-upstream-only-neon
+      - genius-csit-3node-upstream-only-neon
       - lispflowmapping-csit-1node-msmr-all-neon
       - netconf-csit-1node-callhome-only-neon
       - netconf-csit-1node-userfeatures-all-neon