X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=inline;f=jjb%2Farchetypes%2Farchetypes.yaml;h=508ff6f75bbb00ba13ba424c22fc7e3b61fb6d60;hb=19e6284fc77deb0ba1fe489afc9952a1b778f821;hp=0cb92fb193e26ee7fe0b0155162d8a8fc8797a50;hpb=9fa6c40503bee681c48082b1ef0de9123b19ce9a;p=releng%2Fbuilder.git

diff --git a/jjb/archetypes/archetypes.yaml b/jjb/archetypes/archetypes.yaml
index 0cb92fb19..508ff6f75 100644
--- a/jjb/archetypes/archetypes.yaml
+++ b/jjb/archetypes/archetypes.yaml
@@ -2,14 +2,7 @@
 - project:
     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: aluminium
@@ -27,13 +20,7 @@
 - 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-jobs-jdk11
       - odl-maven-verify-jobs
 
     stream: magnesium
@@ -51,13 +38,7 @@
 - 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
+      - odl-maven-jobs
       - odl-maven-verify-jobs
 
     stream: sodium
@@ -71,29 +52,6 @@
     # Used by the release job
     staging-profile-id: d88dcfe6ce48d
 
-- project:
-    name: archetypes-neon
-    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: neon
-    project: 'archetypes'
-    project-name: 'archetypes'
-    branch: 'stable/neon'
-    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-sonar
     jobs: