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

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index 9e2b8d30a..62a110906 100644
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -2,14 +2,20 @@
 - project:
     name: builder-jobs
     jobs:
-      - '{project-name}-ci-jobs':
-          build-node: centos7-builder-2c-2g
+      - '{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
       - gerrit-tox-verify
-      # OpenStack Related
-      - 'builder-delete-orphaned-nodes'
       # Automation for docs and jobs
       - 'builder-update-image-list'
 
@@ -19,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
@@ -45,8 +51,6 @@
 
     templates:
       - devstack
-      - devstack-pre-pip-newton:
-          build-timeout: 75
       - devstack-pre-pip-ocata:
           build-timeout: 75
       - devstack-pre-pip-pike:
@@ -64,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
@@ -76,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
@@ -212,6 +212,7 @@
       # Servers
       - odl-openstack-cleanup-stale-stacks
       - odl-openstack-cleanup-stale-nodes
+      - odl-openstack-cleanup-orphaned-nodes
       # Images
       - odl-openstack-check-image-protection
       - odl-openstack-cleanup-old-images
@@ -219,45 +220,6 @@
     publishers:
       - lf-infra-publish
 
-
-- job-template:
-    name: builder-delete-orphaned-nodes
-    project-type: freestyle
-    node: centos7-builder-2c-1g
-
-    properties:
-      - opendaylight-infra-properties:
-          build-days-to-keep: 7
-
-    parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-      - string:
-          name: JENKINS_URLS
-          default: 'https://jenkins.opendaylight.org/releng https://jenkins.opendaylight.org/sandbox'
-          description: 'Space separated list of Jenkins URLs to check for active builds'
-
-    wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      # Attempt to clear up servers every 30 mins in case we have orphaned servers
-      - timed: '0,30 * * * *'
-
-    builders:
-      - shell: !include-raw-escape: opendaylight-infra-cleanup-orphaned-nodes.sh
-
-    publishers:
-      - email-notification:
-          email-recipients: '{email-recipients}'
-          email-prefix: '[releng]'
-      - lf-infra-publish
-
 - job-template:
     name: 'builder-update-image-list'
     project-type: freestyle