Update cloud image CentOSStream8 robot x86_64

[releng/builder.git] / jjb / archetypes / archetypes.yaml

diff --git a/jjb/archetypes/archetypes.yaml b/jjb/archetypes/archetypes.yaml
index 5480703c15df5dabacd147879283cae377acf790..067a730ff1a517f72d1b685cd4e1907e8406fba9 100644 (file)
--- a/jjb/archetypes/archetypes.yaml
+++ b/jjb/archetypes/archetypes.yaml
@@ -1,53 +1,18 @@
 ---
 - project:
-    name: archetypes-aluminium
+    name: archetypes-master
     jobs:
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
-
-    stream: aluminium
-    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-magnesium
-    jobs:
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
-
-    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-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]'
+      - odl-maven-jobs-jdk17
+      - odl-maven-verify-jobs-jdk17
+
+    stream: master
+    project: "archetypes"
+    project-name: "archetypes"
+    branch: "master"
+    java-version: "openjdk17"
+    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
@@ -55,17 +20,12 @@
 - project:
     name: archetypes-sonar
     jobs:
-      - gerrit-maven-sonar
+      - odl-sonar-jobs-jdk17
 
-    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: "archetypes"
+    project-name: "archetypes"
+    branch: "master"
+    mvn-settings: "archetypes-settings"
 
 - project:
     name: archetypes-info