Consolidate a single openstack-cron job

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

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index 66206c9939210f6edcf3498078ba9d015752922f..51f232a518f117a82109784cf567625499207f03 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -3,12 +3,9 @@
     name: builder-jobs
     jobs:
       - '{project-name}-ci-jobs'
-      - '{project-name}-verify-tox-{stream}'
-      - 'builder-check-poms'
-      # OpenStack Related
-      - 'builder-cleanup-old-images'
-      - 'builder-delete-stale-nodes'
-      - 'builder-delete-stale-stacks'
+      - builder-check-poms
+      - builder-openstack-cron
+      - gerrit-tox-verify
       # Automation for docs and jobs
       - 'builder-update-image-list'
 
@@ -18,7 +15,7 @@
     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
 
@@ -31,6 +28,7 @@
     project-name: builder
     branch: master
     archive-artifacts: '**/*.log'
+    build-node: centos7-java-builder-1c-4g
 
     platforms:
       - centos
@@ -43,13 +41,18 @@
           build-timeout: 75
       - devstack-pre-pip-ocata:
           build-timeout: 60
-      - docker
+      - devstack-pre-pip-pike:
+          build-timeout: 75
+      - docker:
+          build-timeout: 60
       - gbp
       - java-builder:
           build-timeout: 75
       - mininet
       - mininet-ovs-2.5:
           build-timeout: 60
+      - mininet-ovs-2.6:
+          build-timeout: 75
       - robot
 
     exclude:
@@ -59,6 +62,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
@@ -67,12 +72,16 @@
         templates: devstack-pre-pip-newton
       - platforms: ubuntu-14.04
         templates: devstack-pre-pip-ocata
+      - platforms: ubuntu-14.04
+        templates: devstack-pre-pip-pike
       - platforms: ubuntu-14.04
         templates: devstack
       - platforms: ubuntu-14.04
         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
@@ -81,14 +90,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
@@ -96,7 +105,7 @@
 
 - job-template:
     name: builder-check-poms
-    node: centos7-java-builder-2c-4g
+    node: centos7-java-builder-1c-4g
 
     project-type: freestyle
 
@@ -130,9 +139,11 @@
 
 
 - job-template:
-    name: 'builder-cleanup-old-images'
+    name: 'builder-openstack-cron'
+    # Job that runs every 30 mins to perform regular openstack cleanup
+
     project-type: freestyle
-    node: centos7-java-builder-2c-4g
+    node: centos7-java-builder-1c-4g
 
     properties:
       - opendaylight-infra-properties:
@@ -153,92 +164,19 @@
     wrappers:
       - opendaylight-infra-wrappers:
           build-timeout: '{build-timeout}'
-      # Listed after to override openstack-infra-wrappers clouds.yaml definition
-      - config-file-provider:
-          files:
-            - file-id: opendaylight-private-clouds-yaml
-              target: '$HOME/.config/openstack/clouds.yaml'
 
     triggers:
-      # Cleanup images on a weekly schedule
-      - timed: '@weekly'
-
-    builders:
-      - shell: !include-raw-escape:
-          - global-jjb/shell/lftools-install.sh
-          - opendaylight-infra-cleanup-old-images.sh
-
-    publishers:
-      - email-notification:
-          email-recipients: '{email-recipients}'
-          email-prefix: '[releng]'
-      - lf-infra-publish
-
-
-- job-template:
-    name: 'builder-delete-stale-nodes'
-    project-type: freestyle
-    node: centos7-java-builder-2c-4g
-
-    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}'
-
-    wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      # Attempt to clear up stacks every 30 mins in case we have orphaned stacks
       - timed: '0,30 * * * *'
 
     builders:
       - shell: !include-raw-escape:
           - global-jjb/shell/lftools-install.sh
+          # Servers
+          - opendaylight-infra-cleanup-stale-stacks.sh
           - opendaylight-infra-cleanup-stale-nodes.sh
-
-    publishers:
-      - email-notification:
-          email-recipients: '{email-recipients}'
-          email-prefix: '[releng]'
-      - lf-infra-publish
-
-
-- job-template:
-    name: 'builder-delete-stale-stacks'
-    project-type: freestyle
-    node: centos7-java-builder-2c-4g
-
-    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}'
-
-    wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      # Attempt to clear up stacks every 30 mins in case we have orphaned stacks
-      - timed: '0,30 * * * *'
-
-    builders:
-      - shell: !include-raw-escape: opendaylight-infra-cleanup-stale-stacks.sh
+          # Images
+          - opendaylight-infra-check-image-protection.sh
+          - opendaylight-infra-cleanup-old-images.sh
 
     publishers:
       - email-notification:
@@ -250,7 +188,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:
@@ -274,7 +212,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: