CI: Add verify/merge jobs for ODL Helm charts

[releng/builder.git] / jjb / infrautils / infrautils.yaml

diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml
index 98b2fb30e8b99b1cb43ce1a5a1573c12ee91fda0..91391ce82e604f3c260546d1a2b2caa86d4d0b74 100644 (file)
--- a/jjb/infrautils/infrautils.yaml
+++ b/jjb/infrautils/infrautils.yaml
@@ -17,7 +17,6 @@
     branch: "master"
     java-version: "openjdk11"
     mvn-settings: "infrautils-settings"
-    mvn-opts: "-Xmx1024m"
     dependencies: "odlparent-merge-{stream}"
     email-upstream: "[infrautils] [odlparent]"
 
@@ -25,7 +24,7 @@
     staging-profile-id: 96fca0367756c
 
 - project:
-    name: infrautils-1.8.x
+    name: infrautils-2.0.x
     jobs:
       - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
@@ -36,13 +35,12 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: aluminium
+    stream: 2.0.x
     project: "infrautils"
     project-name: "infrautils"
-    branch: "1.8.x"
+    branch: "2.0.x"
     java-version: "openjdk11"
     mvn-settings: "infrautils-settings"
-    mvn-opts: "-Xmx1024m"
     dependencies: "odlparent-merge-{stream}"
     email-upstream: "[infrautils] [odlparent]"
 
@@ -50,10 +48,8 @@
     staging-profile-id: 96fca0367756c
 
 - project:
-    name: infrautils-magnesium
+    name: infrautils-1.9.x
     jobs:
-      - "{project-name}-distribution-check-{stream}"
-      - "{project-name}-maven-javadoc-jobs"
       - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
           doc-dir: .tox/docs/tmp/html
@@ -63,13 +59,12 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: magnesium
+    stream: 1.9.x
     project: "infrautils"
     project-name: "infrautils"
-    branch: "stable/magnesium"
+    branch: "1.9.x"
     java-version: "openjdk11"
     mvn-settings: "infrautils-settings"
-    mvn-opts: "-Xmx1024m"
     dependencies: "odlparent-merge-{stream}"
     email-upstream: "[infrautils] [odlparent]"
 
@@ -86,6 +81,9 @@
 
     build-node: centos7-builder-2c-1g
     mvn-settings: infrautils-settings
+    # Needs to be rather long until we sort out the performance of
+    # https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/
+    build-timeout: 60
 
 - project:
     name: infrautils-sonar