X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Farchetypes%2Farchetypes.yaml;h=508ff6f75bbb00ba13ba424c22fc7e3b61fb6d60;hb=6db63fabeac500383eff09cf4f11dd3e3d0cb728;hp=8c1614b4eea344f3cb8bdaddc5605a0e19cb7bf1;hpb=b12838cd255bf7f39be2225d5db3c98bf55d12c2;p=releng%2Fbuilder.git

diff --git a/jjb/archetypes/archetypes.yaml b/jjb/archetypes/archetypes.yaml
index 8c1614b4e..508ff6f75 100644
--- a/jjb/archetypes/archetypes.yaml
+++ b/jjb/archetypes/archetypes.yaml
@@ -1,18 +1,11 @@
 ---
 - project:
-    name: archetypes-magnesium
+    name: archetypes-aluminium
     jobs:
-      - gerrit-release-merge
-      - 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-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: magnesium
+    stream: aluminium
     project: 'archetypes'
     project-name: 'archetypes'
     branch: 'master'
@@ -25,21 +18,16 @@
     staging-profile-id: d88dcfe6ce48d
 
 - project:
-    name: archetypes-sodium
+    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-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: sodium
+    stream: magnesium
     project: 'archetypes'
     project-name: 'archetypes'
-    branch: 'stable/sodium'
+    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]'
@@ -48,21 +36,15 @@
     staging-profile-id: d88dcfe6ce48d
 
 - project:
-    name: archetypes-neon
+    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
+      - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: neon
+    stream: sodium
     project: 'archetypes'
     project-name: 'archetypes'
-    branch: 'stable/neon'
+    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]'