X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Farchetypes%2Farchetypes.yaml;h=0dd66f8255d67eecfa6b7201521428879d4b3717;hb=refs%2Fchanges%2F25%2F80125%2F1;hp=51faa1c71bdf6fee1e294738890f376dcc527d6b;hpb=e47a8ddb18b82790e048d312170c643c3a251dd8;p=releng%2Fbuilder.git

diff --git a/jjb/archetypes/archetypes.yaml b/jjb/archetypes/archetypes.yaml
index 51faa1c71..0dd66f825 100644
--- a/jjb/archetypes/archetypes.yaml
+++ b/jjb/archetypes/archetypes.yaml
@@ -1,15 +1,37 @@
 ---
+- 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
+      - gerrit-maven-verify
+      - gerrit-maven-verify-dependencies:
+          build-timeout: 180
+
+    stream: sodium
+    project: 'archetypes'
+    project-name: 'archetypes'
+    branch: 'master'
+    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
     jobs:
-      # TODO: Add CLM jobs back once issue is resolved:
-      #       https://jira.linuxfoundation.org/browse/RELENG-1165
-      # - gerrit-maven-clm
+      - gerrit-maven-clm
       - '{project-name}-merge-{stream}':
           build-timeout: 180
           cron: '@daily'
           mvn-goals: clean install -V -Dmaven.compile.fork=true
-      - gerrit-maven-release
+      - gerrit-maven-stage
       - gerrit-maven-verify
       - gerrit-maven-verify-dependencies:
           build-timeout: 180
@@ -17,7 +39,7 @@
     stream: neon
     project: 'archetypes'
     project-name: 'archetypes'
-    branch: 'master'
+    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]'
@@ -28,14 +50,12 @@
 - project:
     name: archetypes-fluorine
     jobs:
-      # TODO: Add CLM jobs back once issue is resolved:
-      #       https://jira.linuxfoundation.org/browse/RELENG-1165
-      # - gerrit-maven-clm
+      - gerrit-maven-clm
       - '{project-name}-merge-{stream}':
           build-timeout: 180
           cron: '@daily'
           mvn-goals: clean install -V -Dmaven.compile.fork=true
-      - gerrit-maven-release
+      - gerrit-maven-stage
       - gerrit-maven-verify
       - gerrit-maven-verify-dependencies:
           build-timeout: 180
@@ -61,8 +81,8 @@
     branch: 'master'
     mvn-settings: 'archetypes-settings'
 
-- view:
-    name: archetypes
-    regex: '^archetypes-.*'
-    description: 'List of archetypes jobs'
-    <<: *releng_view_common
+- project:
+    name: archetypes-view
+    views:
+      - project-view
+    project-name: archetypes