Magnesium branch cut

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

diff --git a/jjb/archetypes/archetypes.yaml b/jjb/archetypes/archetypes.yaml
index 8ae2754822711ce2ee107d0fd6535ba5a27a08fc..0cb92fb193e26ee7fe0b0155162d8a8fc8797a50 100644 (file)
--- a/jjb/archetypes/archetypes.yaml
+++ b/jjb/archetypes/archetypes.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: archetypes-magnesium
+    name: archetypes-aluminium
     jobs:
       - gerrit-release-merge
       - gerrit-maven-clm
@@ -10,14 +10,37 @@
           mvn-goals: clean install -V -Dmaven.compile.fork=true
       - gerrit-maven-stage:
           sign-artifacts: true
-      - odl-maven-verify-jobs:
-          java-version:
-            - openjdk11
+      - 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]'
+
+    # Used by the release job
+    staging-profile-id: d88dcfe6ce48d
+
+- project:
+    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
+      - odl-maven-verify-jobs
+
+    stream: magnesium
+    project: 'archetypes'
+    project-name: 'archetypes'
+    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]'
@@ -79,6 +102,7 @@
     project: 'archetypes'
     project-name: 'archetypes'
     branch: 'master'
+    java-version: 'openjdk11'
     mvn-settings: 'archetypes-settings'
 
 - project: