X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Farchetypes%2Farchetypes.yaml;h=006b92debb4588eaab82b3c8efd01849b9dae329;hb=ce618a81e648001a2ecf6b67f06407e76ea82786;hp=a7a5f983746726194a441965ef1794b10e599a9f;hpb=0f0df42295c5b40da573c3a3f81579a291001dec;p=releng%2Fbuilder.git

diff --git a/jjb/archetypes/archetypes.yaml b/jjb/archetypes/archetypes.yaml
index a7a5f9837..006b92deb 100644
--- a/jjb/archetypes/archetypes.yaml
+++ b/jjb/archetypes/archetypes.yaml
@@ -1,95 +1,71 @@
 ---
 - 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-verify-jobs:
-          java-version:
-            - openjdk11
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
 
-    stream: magnesium
-    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]'
+    stream: silicon
+    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-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
-    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]'
+    stream: aluminium
+    project: "archetypes"
+    project-name: "archetypes"
+    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]"
 
     # Used by the release job
     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
-    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]'
+    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]"
 
     # Used by the release job
     staging-profile-id: d88dcfe6ce48d
 
 - project:
-    name: archetypes-fluorine
+    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: fluorine
-    project: 'archetypes'
-    project-name: 'archetypes'
-    branch: 'stable/fluorine'
-    mvn-settings: 'archetypes-settings'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}'
-    email-upstream: '[archetypes] [odlparent] [yangtools] [controller] [mdsal]'
+    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]"
 
     # Used by the release job
     staging-profile-id: d88dcfe6ce48d
@@ -99,10 +75,24 @@
     jobs:
       - gerrit-maven-sonar
 
-    project: 'archetypes'
-    project-name: 'archetypes'
-    branch: 'master'
-    mvn-settings: 'archetypes-settings'
+    project: "archetypes"
+    project-name: "archetypes"
+    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