X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ftransportpce%2Ftransportpce.yaml;h=8da195a5403377d0828cc1c2de389cdbfa6035d9;hb=fb9297d20fe434066a9c84064d79cf9daf89dda2;hp=24c8c8e1e735f90592f50e24820c831423570fa7;hpb=6c099dfd81640689dec35b6bcad121be7304133d;p=releng%2Fbuilder.git

diff --git a/jjb/transportpce/transportpce.yaml b/jjb/transportpce/transportpce.yaml
index 24c8c8e1e..8da195a54 100644
--- a/jjb/transportpce/transportpce.yaml
+++ b/jjb/transportpce/transportpce.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: transportpce-sulfur
+    name: transportpce-chlorine
     jobs:
       - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
@@ -8,7 +8,7 @@
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-transportpce/47688/
           rtd-token: 6f37ba63226bdcc6c823ee455e62237cf68813fd
       - gerrit-tox-verify:
-          build-timeout: 240
+          build-timeout: 360
           build-node: centos7-builder-4c-16g
           parallel: true
       - odl-maven-jobs-jdk11
@@ -16,7 +16,7 @@
 
     project: "transportpce"
     project-name: "transportpce"
-    stream: sulfur
+    stream: chlorine
     branch: "master"
     java-version: "openjdk11"
     mvn-settings: "transportpce-settings"
@@ -28,7 +28,7 @@
     staging-profile-id: a6927323fa3d4
 
 - project:
-    name: transportpce-phosphorus
+    name: transportpce-sulfur
     jobs:
       - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
@@ -36,7 +36,7 @@
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-transportpce/47688/
           rtd-token: 6f37ba63226bdcc6c823ee455e62237cf68813fd
       - gerrit-tox-verify:
-          build-timeout: 240
+          build-timeout: 360
           build-node: centos7-builder-4c-16g
           parallel: true
       - odl-maven-jobs-jdk11
@@ -44,35 +44,8 @@
 
     project: "transportpce"
     project-name: "transportpce"
-    stream: phosphorus
-    branch: "stable/phosphorus"
-    java-version: "openjdk11"
-    mvn-settings: "transportpce-settings"
-    mvn-opts: "-Xmx1024m"
-    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"
-    email-upstream: "[transportpce] [odlparent] [yangtools] [controller]"
-
-    # Used by the release job
-    staging-profile-id: a6927323fa3d4
-
-- project:
-    name: transportpce-silicon
-    jobs:
-      - "{project-name}-rtd-jobs":
-          build-node: centos7-builder-2c-2g
-          project-pattern: transportpce
-          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-transportpce/47688/
-          rtd-token: 6f37ba63226bdcc6c823ee455e62237cf68813fd
-      - gerrit-tox-verify:
-          build-timeout: 240
-          build-node: centos7-builder-4c-16g
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
-
-    project: "transportpce"
-    project-name: "transportpce"
-    stream: silicon
-    branch: "stable/silicon"
+    stream: sulfur
+    branch: "stable/sulfur"
     java-version: "openjdk11"
     mvn-settings: "transportpce-settings"
     mvn-opts: "-Xmx1024m"
@@ -83,7 +56,7 @@
     staging-profile-id: a6927323fa3d4
 
 - project:
-    name: transportpce-aluminium
+    name: transportpce-phosphorus
     jobs:
       - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
@@ -93,13 +66,14 @@
       - gerrit-tox-verify:
           build-timeout: 240
           build-node: centos7-builder-4c-16g
+          parallel: true
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
     project: "transportpce"
     project-name: "transportpce"
-    stream: aluminium
-    branch: "stable/aluminium"
+    stream: phosphorus
+    branch: "stable/phosphorus"
     java-version: "openjdk11"
     mvn-settings: "transportpce-settings"
     mvn-opts: "-Xmx1024m"
@@ -129,6 +103,7 @@
     project-name: "transportpce"
     branch: "master"
     java-version: "openjdk11"
+    mvn-version: mvn38
     mvn-settings: "transportpce-settings"
     mvn-opts: "-Xmx1024m"
     sonarcloud: true