X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng-jobs.yaml;h=62a110906d369ef8a3c90ada4d0a50548df215f3;hb=26b7d0bb57c0add170d1bebad45b73e6b9429d1e;hp=73c5ab5c33c20def31be10407108a00129447e99;hpb=d5e8f75a9f0db5fcc780d7d0157234a17dd20356;p=releng%2Fbuilder.git

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index 73c5ab5c3..62a110906 100644
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -2,9 +2,16 @@
 - project:
     name: builder-jobs
     jobs:
-      - '{project-name}-ci-jobs':
-          build-node: centos7-builder-2c-2g
-          build-timeout: 60
+      - '{project-name}-rtd-jobs':
+          project-pattern: releng/builder
+          rtd-project: opendaylight-releng-builder
+      - gerrit-jenkins-cfg-merge:
+          jenkins-silos: releng sandbox
+      - gerrit-jjb-deploy-job
+      - gerrit-jjb-merge:
+          build-node: centos7-builder-4c-4g
+          build-timeout: 90
+      - gerrit-jjb-verify
       - builder-check-poms
       - builder-copy-sandbox-logs
       - builder-openstack-cron
@@ -18,7 +25,7 @@
     project-name: builder
     stream: master
     branch: master
-    build-node: centos7-builder-2c-1g
+    build-node: centos7-builder-2c-2g
     archive-artifacts: '**/*.log'
     build-timeout: 30
     jjb-version: 2.0.0
@@ -44,8 +51,6 @@
 
     templates:
       - devstack
-      - devstack-pre-pip-newton:
-          build-timeout: 75
       - devstack-pre-pip-ocata:
           build-timeout: 75
       - devstack-pre-pip-pike:
@@ -63,8 +68,6 @@
         templates: mininet-ovs-2.5
       - platforms: centos
         templates: mininet-ovs-2.6
-      - platforms: ubuntu-14.04
-        templates: devstack-pre-pip-newton
       - platforms: ubuntu-14.04
         templates: devstack-pre-pip-ocata
       - platforms: ubuntu-14.04
@@ -75,8 +78,6 @@
         templates: mininet-ovs-2.5
       - platforms: ubuntu-14.04
         templates: mininet-ovs-2.6
-      - platforms: ubuntu-16.04
-        templates: devstack-pre-pip-newton
       - platforms: ubuntu-16.04
         templates: devstack-pre-pip-ocata
       - platforms: ubuntu-16.04