Merge "Fix packaging tox-verify to run only master"

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

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index 3e8cd1db36fd0282755739a552cf8086be283a2d..f54557e262e5554515b2f0b9d0badff7f50ec633 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -2,7 +2,8 @@
 - project:
     name: builder-jobs
     jobs:
-      - '{project-name}-ci-jobs'
+      - '{project-name}-ci-jobs':
+          build-node: centos7-builder-2c-2g
       - builder-check-poms
       - builder-copy-sandbox-logs
       - gerrit-tox-verify
@@ -21,7 +22,7 @@
     project-name: builder
     stream: master
     branch: master
-    build-node: centos7-builder-2c-8g
+    build-node: centos7-builder-2c-1g
     archive-artifacts: '**/*.log'
     build-timeout: 30
     jjb-version: 2.0.0
@@ -35,7 +36,7 @@
     project-name: builder
     branch: master
     archive-artifacts: '**/*.log'
-    build-node: centos7-builder-2c-8g
+    build-node: centos7-builder-2c-1g
 
     platforms:
       - centos
@@ -47,7 +48,7 @@
       - devstack-pre-pip-newton:
           build-timeout: 75
       - devstack-pre-pip-ocata:
-          build-timeout: 60
+          build-timeout: 75
       - devstack-pre-pip-pike:
           build-timeout: 75
       - gbp
@@ -86,7 +87,7 @@
 
 - job-template:
     name: builder-check-poms
-    node: centos7-builder-2c-8g
+    node: centos7-builder-2c-1g
 
     project-type: freestyle
 
@@ -120,7 +121,7 @@
 
 - job-template:
     name: builder-copy-sandbox-logs
-    node: centos7-builder-2c-8g
+    node: centos7-builder-2c-1g
 
     project-type: freestyle
 
@@ -163,7 +164,7 @@
 - job-template:
     name: 'builder-verify-image-protection'
     project-type: freestyle
-    node: centos7-builder-2c-8g
+    node: centos7-builder-2c-1g
 
     properties:
       - opendaylight-infra-properties:
@@ -207,7 +208,7 @@
 - job-template:
     name: 'builder-cleanup-old-images'
     project-type: freestyle
-    node: centos7-builder-2c-8g
+    node: centos7-builder-2c-1g
 
     properties:
       - opendaylight-infra-properties:
@@ -253,7 +254,7 @@
 - job-template:
     name: builder-delete-orphaned-nodes
     project-type: freestyle
-    node: centos7-builder-2c-8g
+    node: centos7-builder-2c-1g
 
     properties:
       - opendaylight-infra-properties:
@@ -292,7 +293,7 @@
 - job-template:
     name: 'builder-delete-stale-nodes'
     project-type: freestyle
-    node: centos7-builder-2c-8g
+    node: centos7-builder-2c-1g
 
     properties:
       - opendaylight-infra-properties:
@@ -329,7 +330,7 @@
 - job-template:
     name: 'builder-delete-stale-stacks'
     project-type: freestyle
-    node: centos7-builder-2c-8g
+    node: centos7-builder-2c-1g
 
     properties:
       - opendaylight-infra-properties:
@@ -368,7 +369,7 @@
 - job-template:
     name: 'builder-update-image-list'
     project-type: freestyle
-    node: centos7-builder-2c-8g
+    node: centos7-builder-2c-1g
 
     properties:
       - opendaylight-infra-properties: