X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fsxp%2Fsxp.yaml;h=5d0d4e529d96bd6a4dd75f5970bd23116aafa4bf;hb=536f84f47e754118b586d02ffd38ee4f404e6345;hp=c84828118ea7577b29fac4a06bfaba8cf78eb9e5;hpb=cfad36d6090b4086cdcdc3a08c7ff733d6e98664;p=releng%2Fbuilder.git

diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml
index c84828118..5d0d4e529 100644
--- a/jjb/sxp/sxp.yaml
+++ b/jjb/sxp/sxp.yaml
@@ -1,83 +1,65 @@
 ---
 - project:
-    name: sxp-neon
+    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-jobs-jdk11
+      - odl-maven-verify-jobs
 
-    java-version:
-      - openjdk8
-      - openjdk11
+    java-version: "openjdk11"
 
-    stream: neon
-    project: 'sxp'
-    project-name: 'sxp'
-    branch: 'master'
+    stream: master
+    project: "sxp"
+    project-name: "sxp"
+    branch: "master"
 
-    mvn-settings: 'sxp-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    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
 
 - project:
-    name: sxp-fluorine
+    name: sxp-release-management
     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
+      - gerrit-release-merge
 
-    stream: fluorine
-    project: 'sxp'
-    project-name: 'sxp'
-    branch: 'stable/fluorine'
-    mvn-settings: 'sxp-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[sxp] [odlparent] [controller] [yangtools]'
+    project: sxp
+    project-name: sxp
 
-    # Used by the release job
-    staging-profile-id: a6909c75719b7
+    build-node: centos7-builder-2c-1g
+    mvn-settings: sxp-settings
 
 - project:
-    name: sxp-oxygen
+    name: sxp-sonar
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: oxygen
-    project: 'sxp'
-    project-name: 'sxp'
-    branch: 'stable/oxygen'
-
-    mvn-settings: 'sxp-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-    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
+      - 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}"
 
 - project:
-    name: sxp-sonar
+    name: sxp-info
     jobs:
-      - gerrit-maven-sonar
-    project: 'sxp'
-    project-name: 'sxp'
-    branch: 'master'
-    mvn-settings: 'sxp-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+      - gerrit-info-yaml-verify
+    project: sxp
+    project-name: sxp
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: sxp-view