Merge "Remove references to distribution-deploy-*"

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

diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml
index 522964425327e0c089205fee130d526d4f851a27..3f26d52af964428077063db12fcafa06993c67b8 100644 (file)
--- a/jjb/sxp/sxp.yaml
+++ b/jjb/sxp/sxp.yaml
@@ -1,109 +1,27 @@
 ---
 - project:
-    name: sxp-silicon
+    name: sxp-master
     jobs:
-      - '{project-name}-rtd-jobs':
-          build-node: centos7-builder-2c-2g
+      - "{project-name}-rtd-jobs":
+          build-node: centos8-builder-2c-2g
           project-pattern: sxp
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-sxp/47573/
           rtd-token: 4a78556e59ce3ef35e61e2fa19ebae049acf6d5d
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
+      - odl-maven-jobs-jdk17
+      - odl-maven-verify-jobs-jdk17
 
-    java-version: 'openjdk11'
+    java-version: "openjdk17"
 
-    stream: silicon
-    project: 'sxp'
-    project-name: 'sxp'
-    branch: 'master'
+    stream: master
+    project: "sxp"
+    project-name: "sxp"
+    branch: "master"
 
-    mvn-settings: 'sxp-settings'
-    mvn-opts: '-Xmx1024m'
+    mvn-settings: "sxp-settings"
+    mvn-opts: "-Xmx1024m"
 
-    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[sxp] [odlparent] [controller] [yangtools]'
-
-    # Used by the release job
-    staging-profile-id: a6909c75719b7
-
-- project:
-    name: sxp-aluminium
-    jobs:
-      - '{project-name}-rtd-jobs':
-          build-node: centos7-builder-2c-2g
-          project-pattern: sxp
-          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-sxp/47573/
-          rtd-token: 4a78556e59ce3ef35e61e2fa19ebae049acf6d5d
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    java-version: 'openjdk11'
-
-    stream: aluminium
-    project: 'sxp'
-    project-name: 'sxp'
-    branch: 'stable/aluminium'
-
-    mvn-settings: 'sxp-settings'
-    mvn-opts: '-Xmx1024m'
-
-    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[sxp] [odlparent] [controller] [yangtools]'
-
-    # Used by the release job
-    staging-profile-id: a6909c75719b7
-
-- project:
-    name: sxp-magnesium
-    jobs:
-      - '{project-name}-rtd-jobs':
-          build-node: centos7-builder-2c-2g
-          project-pattern: sxp
-          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-sxp/47573/
-          rtd-token: 4a78556e59ce3ef35e61e2fa19ebae049acf6d5d
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    java-version: 'openjdk11'
-
-    stream: magnesium
-    project: 'sxp'
-    project-name: 'sxp'
-    branch: 'stable/magnesium'
-
-    mvn-settings: 'sxp-settings'
-    mvn-opts: '-Xmx1024m'
-
-    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[sxp] [odlparent] [controller] [yangtools]'
-
-    # Used by the release job
-    staging-profile-id: a6909c75719b7
-
-- project:
-    name: sxp-sodium
-    jobs:
-      - '{project-name}-rtd-jobs':
-          build-node: centos7-builder-2c-2g
-          project-pattern: sxp
-          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-sxp/47573/
-          rtd-token: 4a78556e59ce3ef35e61e2fa19ebae049acf6d5d
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    java-version:
-      - openjdk8
-
-    stream: sodium
-    project: 'sxp'
-    project-name: 'sxp'
-    branch: 'stable/sodium'
-
-    mvn-settings: 'sxp-settings'
-    mvn-opts: '-Xmx1024m'
-
-    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[sxp] [odlparent] [controller] [yangtools]'
+    dependencies: "odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}"
+    email-upstream: "[sxp] [odlparent] [controller] [yangtools]"
 
     # Used by the release job
     staging-profile-id: a6909c75719b7
@@ -122,17 +40,13 @@
 - project:
     name: sxp-sonar
     jobs:
-      - gerrit-maven-sonar
-    project: 'sxp'
-    project-name: 'sxp'
-    branch: 'master'
-    java-version: 'openjdk11'
-    mvn-settings: 'sxp-settings'
-    mvn-opts: '-Xmx1024m'
-    sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+      - odl-sonar-jobs-jdk17
+
+    project: "sxp"
+    project-name: "sxp"
+    branch: "master"
+    mvn-settings: "sxp-settings"
+    mvn-opts: "-Xmx1024m"
 
 - project:
     name: sxp-info