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 e55f672cc6b9991b4be9a9948493de15d562bf4c..ebfaf09400675c99a63ae9517e58c6340b1f7c23 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -6,7 +6,7 @@
       - 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
@@ -108,7 +109,7 @@
 
 - job-template:
     name: builder-check-poms
-    node: centos7-java-builder-2c-4g
+    node: centos7-java-builder-1c-4g
 
     project-type: freestyle
 
@@ -142,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:
@@ -170,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:
@@ -191,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:
@@ -215,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:
@@ -237,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:
@@ -274,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:
@@ -309,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:
@@ -333,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: