Bump build-timeout for lftools to 30 minutes

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

diff --git a/jjb/archetypes/archetypes.yaml b/jjb/archetypes/archetypes.yaml
index b69846fffa8a7b060a0e4de6e706ff0a03b44eb1..508ff6f75bbb00ba13ba424c22fc7e3b61fb6d60 100644 (file)
--- a/jjb/archetypes/archetypes.yaml
+++ b/jjb/archetypes/archetypes.yaml
@@ -1,22 +1,15 @@
 ---
 - project:
-    name: archetypes-magnesium
+    name: archetypes-aluminium
     jobs:
-      - gerrit-maven-clm
-      - '{project-name}-merge-{stream}':
-          build-timeout: 180
-          cron: '@daily'
-          mvn-goals: clean install -V -Dmaven.compile.fork=true
-      - gerrit-maven-stage:
-          sign-artifacts: true
-          mvn-central: true
-          ossrh-profile-id: 6386ebbbf3a563
+      - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: magnesium
+    stream: aluminium
     project: 'archetypes'
     project-name: 'archetypes'
     branch: 'master'
+    java-version: 'openjdk11'
     mvn-settings: 'archetypes-settings'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}'
     email-upstream: '[archetypes] [odlparent] [yangtools] [controller] [mdsal]'
@@ -25,48 +18,16 @@
     staging-profile-id: d88dcfe6ce48d
 
 - project:
-    name: archetypes-sodium
-    jobs:
-      - gerrit-maven-clm
-      - '{project-name}-merge-{stream}':
-          build-timeout: 180
-          cron: '@daily'
-          mvn-goals: clean install -V -Dmaven.compile.fork=true
-      - gerrit-maven-stage:
-          sign-artifacts: true
-          mvn-central: true
-          ossrh-profile-id: 6386ebbbf3a563
-      - odl-maven-verify-jobs
-
-    stream: sodium
-    project: 'archetypes'
-    project-name: 'archetypes'
-    branch: 'stable/sodium'
-    mvn-settings: 'archetypes-settings'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}'
-    email-upstream: '[archetypes] [odlparent] [yangtools] [controller] [mdsal]'
-
-    # Used by the release job
-    staging-profile-id: d88dcfe6ce48d
-
-- project:
-    name: archetypes-neon
+    name: archetypes-magnesium
     jobs:
-      - gerrit-maven-clm
-      - '{project-name}-merge-{stream}':
-          build-timeout: 180
-          cron: '@daily'
-          mvn-goals: clean install -V -Dmaven.compile.fork=true
-      - gerrit-maven-stage:
-          sign-artifacts: true
-          mvn-central: true
-          ossrh-profile-id: 6386ebbbf3a563
+      - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: neon
+    stream: magnesium
     project: 'archetypes'
     project-name: 'archetypes'
-    branch: 'stable/neon'
+    branch: 'stable/magnesium'
+    java-version: 'openjdk11'
     mvn-settings: 'archetypes-settings'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}'
     email-upstream: '[archetypes] [odlparent] [yangtools] [controller] [mdsal]'
@@ -75,23 +36,15 @@
     staging-profile-id: d88dcfe6ce48d
 
 - project:
-    name: archetypes-fluorine
+    name: archetypes-sodium
     jobs:
-      - gerrit-maven-clm
-      - '{project-name}-merge-{stream}':
-          build-timeout: 180
-          cron: '@daily'
-          mvn-goals: clean install -V -Dmaven.compile.fork=true
-      - gerrit-maven-stage:
-          sign-artifacts: true
-          mvn-central: true
-          ossrh-profile-id: 6386ebbbf3a563
+      - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: fluorine
+    stream: sodium
     project: 'archetypes'
     project-name: 'archetypes'
-    branch: 'stable/fluorine'
+    branch: 'stable/sodium'
     mvn-settings: 'archetypes-settings'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}'
     email-upstream: '[archetypes] [odlparent] [yangtools] [controller] [mdsal]'
@@ -107,6 +60,7 @@
     project: 'archetypes'
     project-name: 'archetypes'
     branch: 'master'
+    java-version: 'openjdk11'
     mvn-settings: 'archetypes-settings'
 
 - project: