Merge "Adjust CSIT for UM projects"

[releng/builder.git] / jjb / releng-jobs.yaml

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index 6ae1b9ea347ce085a7a40d77685dfea6ab314a95..0dd4d44aaf6a948c43f954617ae8a301e23dc3aa 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -2,10 +2,17 @@
 - 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-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-releng-builder/32926/
+          rtd-token: e9fa62bd60a39c22de631791309ccacc37a9929e
+      - 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
@@ -19,10 +26,10 @@
     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
+    jjb-version: 2.0.3
     jenkins-urls: >
       https://jenkins.opendaylight.org/releng
       https://jenkins.opendaylight.org/sandbox
@@ -45,8 +52,6 @@
 
     templates:
       - devstack
-      - devstack-pre-pip-newton:
-          build-timeout: 75
       - devstack-pre-pip-ocata:
           build-timeout: 75
       - devstack-pre-pip-pike:
@@ -64,8 +69,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 +79,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,9 +213,7 @@
       # Servers
       - odl-openstack-cleanup-stale-stacks
       - odl-openstack-cleanup-stale-nodes
-      # Disable orphaned nodes script. See:
-      #   https://jira.linuxfoundation.org/browse/RELENG-780
-      # - odl-openstack-cleanup-orphaned-nodes
+      - odl-openstack-cleanup-orphaned-nodes
       # Images
       - odl-openstack-check-image-protection
       - odl-openstack-cleanup-old-images