Merge "Change default RPM repo, CentOS CBS to ODL Nexus"

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

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index 0c40a66521f55881d885bb593e0e35727578a0b2..ebfaf09400675c99a63ae9517e58c6340b1f7c23 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -3,10 +3,10 @@
     name: builder-jobs
     jobs:
       - '{project-name}-ci-jobs'
-      - '{project-name}-verify-tox-{stream}'
-      - 'builder-check-poms'
+      - builder-check-poms
+      - gerrit-tox-verify
       # OpenStack Related
-      - 'builder-verify-image-visibility'
+      - 'builder-verify-image-protection'
       - 'builder-cleanup-old-images'
       - 'builder-delete-stale-nodes'
       - 'builder-delete-stale-stacks'
@@ -19,9 +19,9 @@
     project-name: builder
     stream: master
     branch: master
-    build-node: centos7-java-builder-2c-4g
+    build-node: centos7-java-builder-1c-4g
     archive-artifacts: '**/*.log'
-    build-timeout: 10
+    build-timeout: 30
 
 - project:
     name: packer-jobs
@@ -32,6 +32,7 @@
     project-name: builder
     branch: master
     archive-artifacts: '**/*.log'
+    build-node: centos7-java-builder-1c-4g
 
     platforms:
       - centos
@@ -46,7 +47,8 @@
           build-timeout: 60
       - devstack-pre-pip-pike:
           build-timeout: 75
-      - docker
+      - docker:
+          build-timeout: 60
       - gbp
       - java-builder:
           build-timeout: 75
@@ -64,6 +66,8 @@
         templates: mininet
       - platforms: centos
         templates: mininet-ovs-2.5
+      - platforms: centos
+        templates: mininet-ovs-2.6
       - platforms: ubuntu-14.04
         templates: java-builder
       - platforms: ubuntu-14.04
@@ -80,6 +84,8 @@
         templates: docker
       - platforms: ubuntu-14.04
         templates: mininet-ovs-2.5
+      - platforms: ubuntu-14.04
+        templates: mininet-ovs-2.6
       - platforms: ubuntu-16.04
         templates: java-builder
       - platforms: ubuntu-16.04
@@ -88,14 +94,14 @@
         templates: devstack-pre-pip-newton
       - platforms: ubuntu-16.04
         templates: devstack-pre-pip-ocata
+      - platforms: ubuntu-16.04
+        templates: devstack-pre-pip-pike
       - platforms: ubuntu-16.04
         templates: devstack
       - platforms: ubuntu-16.04
         templates: docker
       - platforms: ubuntu-16.04
         templates: mininet
-      - platforms: ubuntu-16.04
-        templates: gbp
       - platforms: ubuntu-16.04
         templates: baseline
       - platforms: centos
@@ -103,7 +109,7 @@
 
 - job-template:
     name: builder-check-poms
-    node: centos7-java-builder-2c-4g
+    node: centos7-java-builder-1c-4g
 
     project-type: freestyle
 
@@ -137,11 +143,9 @@
 
 
 - job-template:
-    name: 'builder-verify-image-visibility'
+    name: 'builder-verify-image-protection'
     project-type: freestyle
-    node: centos7-java-builder-2c-4g
-
-    os-cloud: 'odlpriv-sandbox'
+    node: centos7-java-builder-1c-4g
 
     properties:
       - opendaylight-infra-properties:
@@ -165,16 +169,15 @@
       # Listed after to override openstack-infra-wrappers clouds.yaml definition
       - config-file-provider:
           files:
-            - file-id: opendaylight-private-clouds-yaml
+            - file-id: clouds-yaml
               target: '$HOME/.config/openstack/clouds.yaml'
 
     triggers:
-      # Check images visibility on a daily schedule
       - timed: '@daily'
 
     builders:
       - shell: !include-raw-escape:
-          - opendaylight-infra-check-image-visibility.sh
+          - opendaylight-infra-check-image-protection.sh
 
     publishers:
       - email-notification:
@@ -186,7 +189,7 @@
 - job-template:
     name: 'builder-cleanup-old-images'
     project-type: freestyle
-    node: centos7-java-builder-2c-4g
+    node: centos7-java-builder-1c-4g
 
     properties:
       - opendaylight-infra-properties:
@@ -210,7 +213,7 @@
       # Listed after to override openstack-infra-wrappers clouds.yaml definition
       - config-file-provider:
           files:
-            - file-id: opendaylight-private-clouds-yaml
+            - file-id: clouds-yaml
               target: '$HOME/.config/openstack/clouds.yaml'
 
     triggers:
@@ -232,7 +235,7 @@
 - job-template:
     name: 'builder-delete-stale-nodes'
     project-type: freestyle
-    node: centos7-java-builder-2c-4g
+    node: centos7-java-builder-1c-4g
 
     properties:
       - opendaylight-infra-properties:
@@ -269,7 +272,7 @@
 - job-template:
     name: 'builder-delete-stale-stacks'
     project-type: freestyle
-    node: centos7-java-builder-2c-4g
+    node: centos7-java-builder-1c-4g
 
     properties:
       - opendaylight-infra-properties:
@@ -304,7 +307,7 @@
 - job-template:
     name: 'builder-update-image-list'
     project-type: freestyle
-    node: centos7-java-builder-2c-4g
+    node: centos7-java-builder-1c-4g
 
     properties:
       - opendaylight-infra-properties:
@@ -328,7 +331,7 @@
       # Listed after to override openstack-infra-wrappers clouds.yaml definition
       - config-file-provider:
           files:
-            - file-id: opendaylight-private-clouds-yaml
+            - file-id: clouds-yaml
               target: '$HOME/.config/openstack/clouds.yaml'
 
     triggers: