Merge "CI: Update int/pgk manged file settings"

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

diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml
index b9746c3f564fc62bdde399542bcb44fc121981d6..661b74e5b1c29448e16e6bc19417ab15dd2e3420 100644 (file)
--- a/jjb/aaa/aaa.yaml
+++ b/jjb/aaa/aaa.yaml
@@ -24,9 +24,8 @@
     staging-profile-id: 9318cf3c82c33
 
 - project:
-    name: aaa-aluminium
+    name: aaa-0.13.x
     jobs:
-      - "{project-name}-distribution-check-{stream}"
       - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
           project-pattern: aaa
@@ -35,35 +34,10 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: aluminium
+    stream: 0.13.x
     project: "aaa"
     project-name: "aaa"
-    branch: "stable/aluminium"
-    java-version: "openjdk11"
-    mvn-settings: "aaa-settings"
-    mvn-opts: "-Xmx1024m"
-    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"
-    email-upstream: "[aaa] [odlparent] [yangtools] [controller]"
-
-    # Used by the release job
-    staging-profile-id: 9318cf3c82c33
-
-- project:
-    name: aaa-magnesium
-    jobs:
-      - "{project-name}-distribution-check-{stream}"
-      - "{project-name}-rtd-jobs":
-          build-node: centos7-builder-2c-2g
-          project-pattern: aaa
-          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-aaa/47615/
-          rtd-token: 621132230e1307d38f4aaf27e669d7dfdf98532f
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
-
-    stream: magnesium
-    project: "aaa"
-    project-name: "aaa"
-    branch: "stable/magnesium"
+    branch: 0.13.x
     java-version: "openjdk11"
     mvn-settings: "aaa-settings"
     mvn-opts: "-Xmx1024m"
@@ -83,6 +57,9 @@
 
     build-node: centos7-builder-2c-1g
     mvn-settings: aaa-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: aaa-sonar