X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Farchetypes%2Farchetypes.yaml;h=afb8f95631913bc5b61bb1692ab20fc198d79725;hb=428a47a10b3a6c59670063400095511d83d8cf51;hp=8c1614b4eea344f3cb8bdaddc5605a0e19cb7bf1;hpb=ebf97a45fa6d937ed300d4235b3eb7776f4876fa;p=releng%2Fbuilder.git

diff --git a/jjb/archetypes/archetypes.yaml b/jjb/archetypes/archetypes.yaml
index 8c1614b4e..afb8f9563 100644
--- a/jjb/archetypes/archetypes.yaml
+++ b/jjb/archetypes/archetypes.yaml
@@ -1,18 +1,11 @@
 ---
 - project:
-    name: archetypes-magnesium
+    name: archetypes-silicon
     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: silicon
     project: 'archetypes'
     project-name: 'archetypes'
     branch: 'master'
@@ -25,21 +18,16 @@
     staging-profile-id: d88dcfe6ce48d
 
 - project:
-    name: archetypes-sodium
+    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
+      - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: sodium
+    stream: aluminium
     project: 'archetypes'
     project-name: 'archetypes'
-    branch: 'stable/sodium'
+    branch: 'stable/aluminium'
+    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,33 @@
     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
+      - 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]'
+
+    # Used by the release job
+    staging-profile-id: d88dcfe6ce48d
+
+- project:
+    name: archetypes-sodium
+    jobs:
+      - odl-maven-jobs
+      - 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]'
@@ -80,6 +80,19 @@
     branch: 'master'
     java-version: 'openjdk11'
     mvn-settings: 'archetypes-settings'
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+
+- project:
+    name: archetypes-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: archetypes
+    project-name: archetypes
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: archetypes-view