X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng-jobs.yaml;h=24e8d177fad75af91183099273e8ce362c392664;hb=b5be33b878d75af8df189ee55974405b9a08dff1;hp=5c670819831d8f96f6755292ecc7789a62bc7e70;hpb=592fe3c9ac41e1afe7f271cd370e6aef7664ff49;p=releng%2Fbuilder.git

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index 5c6708198..24e8d177f 100644
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -1,64 +1,86 @@
+---
 - project:
     name: builder-jobs
     jobs:
-        - 'builder-verify-jjb'
-        - 'builder-verify-python'
-        - 'builder-merge'
-        - 'builder-weekly'
-        - 'builder-check-poms'
-        - 'builder-verify-packer'
-        - 'builder-merge-packer-{platforms}-{templates}'
-        # OpenStack Related
-        - 'builder-delete-stale-stacks'
-        # Automation for docs and jobs
-        - 'builder-update-csit-tests'
-        - 'builder-update-image-list'
+      - 'builder-verify-jjb'
+      - '{project-name}-verify-tox-{stream}'
+      - 'builder-merge'
+      - 'builder-weekly'
+      - 'builder-check-poms'
+      - 'builder-verify-packer'
+      - 'builder-merge-packer-{platforms}-{templates}'
+      # OpenStack Related
+      - 'builder-cleanup-old-images'
+      - 'builder-delete-stale-stacks'
+      # Automation for docs and jobs
+      - 'builder-update-csit-tests'
+      - 'builder-update-image-list'
 
     platforms:
-        - centos
-        - ubuntu-14.04
+      - centos
+      - ubuntu-14.04
+      - ubuntu-16.04
 
     templates:
-        - devstack
-        - devstack-pre-pip-mitaka
-        - devstack-pre-pip-newton
-        - docker
-        - gbp
-        - java-builder
-        - mininet
-        - mininet-ovs-2.3
-        - mininet-ovs-2.5
-        - robot
+      - devstack
+      - devstack-pre-pip-mitaka
+      - devstack-pre-pip-newton
+      - docker
+      - gbp
+      - java-builder
+      - mininet
+      - mininet-ovs-2.5
+      - robot
 
     exclude:
-        - platforms: centos
-          templates: gbp
-        - platforms: centos
-          templates: mininet
-        - platforms: centos
-          templates: mininet-ovs-2.3
-        - platforms: centos
-          templates: mininet-ovs-2.5
-        - platforms: ubuntu-14.04
-          templates: java-builder
-        - platforms: ubuntu-14.04
-          templates: robot
-        - platforms: ubuntu-14.04
-          templates: devstack-pre-pip-mitaka
-        - platforms: ubuntu-14.04
-          templates: devstack-pre-pip-newton
-        - platforms: ubuntu-14.04
-          templates: devstack
-        - platforms: ubuntu-14.04
-          templates: docker
+      - platforms: centos
+        templates: gbp
+      - platforms: centos
+        templates: mininet
+      - platforms: centos
+        templates: mininet-ovs-2.5
+      - platforms: ubuntu-14.04
+        templates: java-builder
+      - platforms: ubuntu-14.04
+        templates: robot
+      - platforms: ubuntu-14.04
+        templates: devstack-pre-pip-mitaka
+      - platforms: ubuntu-14.04
+        templates: devstack-pre-pip-newton
+      - platforms: ubuntu-14.04
+        templates: devstack
+      - platforms: ubuntu-14.04
+        templates: docker
+      - platforms: ubuntu-14.04
+        templates: mininet-ovs-2.5
+      - platforms: ubuntu-16.04
+        templates: java-builder
+      - platforms: ubuntu-16.04
+        templates: robot
+      - platforms: ubuntu-16.04
+        templates: devstack-pre-pip-mitaka
+      - platforms: ubuntu-16.04
+        templates: devstack-pre-pip-newton
+      - platforms: ubuntu-16.04
+        templates: devstack
+      - platforms: ubuntu-16.04
+        templates: docker
+      - platforms: ubuntu-16.04
+        templates: mininet
+      - platforms: ubuntu-16.04
+        templates: gbp
+
 
     project-type: freestyle
     archive-artifacts: '**/*.log'
     build-timeout: '60'
-    # The following two values are only specified here
+
+    # The following values are only specified here
     # so that code blocks look similar to other projects.
     project: 'releng/builder'
-    branch: 'master'
+    project-name: builder
+    stream: master
+    branch: master
 
 - job-template:
     name: builder-verify-jjb
@@ -68,104 +90,52 @@
     project-type: freestyle
 
     properties:
-        - opendaylight-infra-properties:
-            build-days-to-keep: 14
+      - opendaylight-infra-properties:
+          build-days-to-keep: 14
 
     parameters:
-        - opendaylight-infra-parameters:
-            project: '{project}'
-            branch: '{branch}'
-            refspec: 'refs/heads/{branch}'
-            artifacts: '{archive-artifacts}'
+      - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
+          project: '{project}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
 
     scm:
-        - gerrit-trigger-scm:
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
+      - gerrit-trigger-scm:
+          refspec: '$GERRIT_REFSPEC'
+          choosing-strategy: 'gerrit'
 
     wrappers:
-        - opendaylight-infra-wrappers:
-            build-timeout: '{build-timeout}'
+      - opendaylight-infra-wrappers:
+          build-timeout: '{build-timeout}'
 
     triggers:
-        - gerrit-trigger-patch-submitted:
-            server: '{server-name}'
-            project: '{project}'
-            branch: '{branch}'
-            files: 'jjb/**'
+      - gerrit-trigger-patch-submitted:
+          server: '{server-name}'
+          project: '{project}'
+          branch: '{branch}'
+          files: 'jjb/**'
 
     builders:
-        - opendaylight-infra-jjbini
-        - shell: |
-            virtualenv $WORKSPACE/venv
-            source $WORKSPACE/venv/bin/activate
-            pip install --upgrade pip
-            pip freeze
-            pip install jenkins-job-builder
-            jenkins-jobs -l DEBUG test --recursive -o archives/job_output jjb/
-            gzip archives/job_output/*
-        - releng-check-unicode
-        - verify-gpg-signature
+      - opendaylight-infra-jjbini
+      - shell: |
+          virtualenv $WORKSPACE/venv
+          source $WORKSPACE/venv/bin/activate
+          pip install --upgrade pip
+          pip install jenkins-job-builder
+          pip freeze
+          jenkins-jobs -l DEBUG test --recursive -o archives/job_output jjb/
+          gzip archives/job_output/*
+      - releng-check-unicode
+      - verify-gpg-signature
 
     publishers:
-        - email-notification:
-            email-recipients: '{email-recipients}'
-            email-prefix: '[releng]'
-        - opendaylight-infra-shiplogs:
-            maven-version: 'mvn33'
-
-# FIXME: Migrate to {project-name}-verify-python-{stream} or delete this entirely,
-#        as there are zero python files (aside docs/conf.py) in releng/builder.
-- job-template:
-    name: builder-verify-python
-    node: centos7-java-builder-2c-4g
-    concurrent: true
-
-    project-type: freestyle
-
-    properties:
-        - opendaylight-infra-properties:
-            build-days-to-keep: 14
-
-    parameters:
-        - opendaylight-infra-parameters:
-            project: '{project}'
-            branch: '{branch}'
-            refspec: 'refs/heads/{branch}'
-            artifacts: '{archive-artifacts}'
-
-    scm:
-        - gerrit-trigger-scm:
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
-
-    wrappers:
-        - opendaylight-infra-wrappers:
-            build-timeout: '{build-timeout}'
-
-    triggers:
-        - gerrit-trigger-patch-submitted:
-            server: '{server-name}'
-            project: '{project}'
-            branch: '{branch}'
-            files: 'scripts/**'
-
-    builders:
-        - verify-gpg-signature
-        - shell: |
-            virtualenv $WORKSPACE/venv
-            source $WORKSPACE/venv/bin/activate
-            pip install --upgrade pip
-            pip freeze
-            pip install flake8
-            flake8 scripts/
-
-    publishers:
-        - email-notification:
-            email-recipients: '{email-recipients}'
-            email-prefix: '[releng]'
-        - opendaylight-infra-shiplogs:
-            maven-version: 'mvn33'
+      - email-notification:
+          email-recipients: '{email-recipients}'
+          email-prefix: '[releng]'
+      - opendaylight-infra-shiplogs:
+          maven-version: 'mvn33'
 
 - job-template:
     name: 'builder-merge'
@@ -178,59 +148,60 @@
     project-type: freestyle
 
     properties:
-        - opendaylight-infra-properties:
-            build-days-to-keep: 14
+      - opendaylight-infra-properties:
+          build-days-to-keep: 14
 
     parameters:
-        - opendaylight-infra-parameters:
-            project: '{project}'
-            branch: '{branch}'
-            refspec: 'refs/heads/{branch}'
-            artifacts: '{archive-artifacts}'
+      - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
+          project: '{project}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
 
     scm:
-        - gerrit-trigger-scm:
-            refspec: ''
-            choosing-strategy: 'default'
+      - gerrit-trigger-scm:
+          refspec: ''
+          choosing-strategy: 'default'
 
     wrappers:
-        - opendaylight-infra-wrappers:
-            build-timeout: '{build-timeout}'
+      - opendaylight-infra-wrappers:
+          build-timeout: '{build-timeout}'
 
     triggers:
-        - gerrit:
-            server-name: '{server-name}'
-            trigger-on:
-                - change-merged-event
-                - comment-added-contains-event:
-                    comment-contains-value: 'remerge'
-            projects:
-              - project-compare-type: 'ANT'
-                project-pattern: 'releng/builder'
-                branches:
-                    - branch-compare-type: 'ANT'
-                      branch-pattern: '**/{branch}'
-                file-paths:
-                    - compare-type: ANT
-                      pattern: jjb/**
+      - gerrit:
+          server-name: '{server-name}'
+          trigger-on:
+            - change-merged-event
+            - comment-added-contains-event:
+                comment-contains-value: 'remerge'
+          projects:
+            - project-compare-type: 'ANT'
+              project-pattern: 'releng/builder'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/{branch}'
+              file-paths:
+                - compare-type: ANT
+                  pattern: jjb/**
 
     builders:
-        - opendaylight-infra-jjbini
-        - shell: |
-            virtualenv $WORKSPACE/venv
-            source $WORKSPACE/venv/bin/activate
-            pip install --upgrade pip
-            pip freeze
-            pip install jenkins-job-builder
-            jenkins-jobs --version
-            jenkins-jobs update --recursive --delete-old --workers 4 jjb/
+      - opendaylight-infra-jjbini
+      - shell: |
+          virtualenv $WORKSPACE/venv
+          source $WORKSPACE/venv/bin/activate
+          pip install --upgrade pip
+          pip install jenkins-job-builder
+          pip freeze
+          jenkins-jobs --version
+          jenkins-jobs update --recursive --delete-old --workers 4 jjb/
 
     publishers:
-        - email-notification:
-            email-recipients: '{email-recipients}'
-            email-prefix: '[releng]'
-        - opendaylight-infra-shiplogs:
-            maven-version: 'mvn33'
+      - email-notification:
+          email-recipients: '{email-recipients}'
+          email-prefix: '[releng]'
+      - opendaylight-infra-shiplogs:
+          maven-version: 'mvn33'
 
 - job-template:
     name: 'builder-weekly'
@@ -245,43 +216,44 @@
     project-type: freestyle
 
     properties:
-        - opendaylight-infra-properties:
-            build-days-to-keep: 14
+      - opendaylight-infra-properties:
+          build-days-to-keep: 14
 
     parameters:
-        - opendaylight-infra-parameters:
-            project: '{project}'
-            branch: '{branch}'
-            refspec: 'refs/heads/{branch}'
-            artifacts: '{archive-artifacts}'
+      - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
+          project: '{project}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
 
     scm:
-        - git-scm:
-            branch: '{branch}'
+      - git-scm:
+          branch: '{branch}'
 
     wrappers:
-        - opendaylight-infra-wrappers:
-            build-timeout: '{build-timeout}'
+      - opendaylight-infra-wrappers:
+          build-timeout: '{build-timeout}'
 
     triggers:
-        - timed: 'H H * * 0'
+      - timed: 'H H * * 0'
 
     builders:
-        - opendaylight-infra-jjbini
-        - shell: |
-            virtualenv $WORKSPACE/venv
-            source $WORKSPACE/venv/bin/activate
-            pip install --upgrade pip
-            pip freeze
-            pip install jenkins-job-builder
-            jenkins-jobs --flush-cache update --recursive --workers 4 jjb/
+      - opendaylight-infra-jjbini
+      - shell: |
+          virtualenv $WORKSPACE/venv
+          source $WORKSPACE/venv/bin/activate
+          pip install --upgrade pip
+          pip install jenkins-job-builder
+          pip freeze
+          jenkins-jobs --flush-cache update --recursive --workers 4 jjb/
 
     publishers:
-        - email-notification:
-            email-recipients: '{email-recipients}'
-            email-prefix: '[releng]'
-        - opendaylight-infra-shiplogs:
-            maven-version: 'mvn33'
+      - email-notification:
+          email-recipients: '{email-recipients}'
+          email-prefix: '[releng]'
+      - opendaylight-infra-shiplogs:
+          maven-version: 'mvn33'
 
 - job-template:
     name: builder-check-poms
@@ -290,34 +262,33 @@
     project-type: freestyle
 
     properties:
-        - opendaylight-infra-properties:
-            build-days-to-keep: 14
+      - opendaylight-infra-properties:
+          build-days-to-keep: 14
 
     parameters:
-        - opendaylight-infra-parameters:
-            project: '{project}'
-            branch: '{branch}'
-            refspec: 'refs/heads/{branch}'
-            artifacts: '{archive-artifacts}'
+      - 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}'
+      - opendaylight-infra-wrappers:
+          build-timeout: '{build-timeout}'
 
     triggers:
-        - timed: 'H H * * 1'
+      - timed: 'H H * * 1'
 
     builders:
-        - shell:
-            !include-raw-escape:
-                - include-raw-check-poms.sh
+      - shell: !include-raw-escape: include-raw-check-poms.sh
 
     publishers:
-        - email-notification:
-            email-recipients: '{email-recipients}'
-            email-prefix: '[releng]'
-        - opendaylight-infra-shiplogs:
-            maven-version: 'mvn33'
+      - email-notification:
+          email-recipients: '{email-recipients}'
+          email-prefix: '[releng]'
+      - opendaylight-infra-shiplogs:
+          maven-version: 'mvn33'
 
 - job-template:
     name: 'builder-delete-stale-stacks'
@@ -325,26 +296,70 @@
     node: centos7-java-builder-2c-4g
 
     properties:
-        - opendaylight-infra-properties:
-            build-days-to-keep: 7
+      - opendaylight-infra-properties:
+          build-days-to-keep: 7
+
+    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
+
+    publishers:
+      - email-notification:
+          email-recipients: '{email-recipients}'
+          email-prefix: '[releng]'
+      - opendaylight-infra-shiplogs:
+          maven-version: 'mvn33'
+
+- job-template:
+    name: 'builder-cleanup-old-images'
+    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}'
+
+    scm:
+      - git-scm:
+          branch: '{branch}'
 
     wrappers:
-        - opendaylight-infra-wrappers:
-            build-timeout: '{build-timeout}'
+      - 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:
-        # Attempt to clear up stacks every 30 mins in case we have orphaned stacks
-        - timed: '0,30 * * * *'
+      # Cleanup images on a weekly schedule
+      - timed: '@weekly'
 
     builders:
-        - shell: !include-raw-escape: opendaylight-infra-cleanup-stale-stacks.sh
+      - shell: !include-raw-escape: opendaylight-infra-cleanup-old-images.sh
 
     publishers:
-        - email-notification:
-            email-recipients: '{email-recipients}'
-            email-prefix: '[releng]'
-        - opendaylight-infra-shiplogs:
-            maven-version: 'mvn33'
+      - email-notification:
+          email-recipients: '{email-recipients}'
+          email-prefix: '[releng]'
+      - opendaylight-infra-shiplogs:
+          maven-version: 'mvn33'
 
 - job-template:
     name: 'builder-update-image-list'
@@ -352,46 +367,47 @@
     node: centos7-java-builder-2c-4g
 
     properties:
-        - opendaylight-infra-properties:
-            build-days-to-keep: 7
+      - opendaylight-infra-properties:
+          build-days-to-keep: 7
 
     parameters:
-        - opendaylight-infra-parameters:
-            project: '{project}'
-            branch: '{branch}'
-            refspec: 'refs/heads/{branch}'
-            artifacts: '{archive-artifacts}'
+      - opendaylight-infra-parameters:
+          os-cloud: odlpriv
+          project: '{project}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
 
     scm:
-        - git-scm:
-            branch: '{branch}'
+      - git-scm:
+          branch: '{branch}'
 
     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'
+      - 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:
-        # Update image list every Monday to Friday at 11:00 UTC
-        - timed: '0 11 * * 1-5'
+      # Update image list every Monday to Friday at 11:00 UTC
+      - timed: '0 11 * * 1-5'
 
     builders:
-        - shell: !include-raw-escape: opendaylight-infra-update-image-list.sh
-        - opendaylight-infra-push-gerrit-patch:
-            project: '{project}'
-            gerrit-topic: 'releng-update-cloud-image-list'
-            gerrit-commit-message: 'Update cloud image list docs'
+      - shell: !include-raw-escape: opendaylight-infra-update-image-list.sh
+      - opendaylight-infra-push-gerrit-patch:
+          project: '{project}'
+          gerrit-topic: 'releng-update-cloud-image-list'
+          gerrit-commit-message: 'Update cloud image list docs'
 
     publishers:
-        - email-notification:
-            email-recipients: '{email-recipients}'
-            email-prefix: '[releng]'
-        - opendaylight-infra-shiplogs:
-            maven-version: 'mvn33'
+      - email-notification:
+          email-recipients: '{email-recipients}'
+          email-prefix: '[releng]'
+      - opendaylight-infra-shiplogs:
+          maven-version: 'mvn33'
 
 - job-template:
     name: 'builder-verify-packer'
@@ -400,41 +416,42 @@
     concurrent: true
 
     properties:
-        - opendaylight-infra-properties:
-            build-days-to-keep: 14
+      - opendaylight-infra-properties:
+          build-days-to-keep: 14
 
     parameters:
-        - opendaylight-infra-parameters:
-            project: '{project}'
-            branch: '{branch}'
-            refspec: 'refs/heads/{branch}'
-            artifacts: '{archive-artifacts}'
+      - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
+          project: '{project}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
 
     scm:
-        - gerrit-trigger-scm:
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
+      - gerrit-trigger-scm:
+          refspec: '$GERRIT_REFSPEC'
+          choosing-strategy: 'gerrit'
 
     wrappers:
-        - opendaylight-infra-wrappers:
-            build-timeout: '{build-timeout}'
+      - opendaylight-infra-wrappers:
+          build-timeout: '{build-timeout}'
 
     triggers:
-        - gerrit-trigger-patch-submitted:
-            server: '{server-name}'
-            project: '{project}'
-            branch: '{branch}'
-            files: 'packer/**'
+      - gerrit-trigger-patch-submitted:
+          server: '{server-name}'
+          project: '{project}'
+          branch: '{branch}'
+          files: 'packer/**'
 
     builders:
-        - packer-validate:
+      - packer-validate:
 
     publishers:
-        - email-notification:
-            email-recipients: '{email-recipients}'
-            email-prefix: '[{project}]'
-        - opendaylight-infra-shiplogs:
-            maven-version: 'mvn33'
+      - email-notification:
+          email-recipients: '{email-recipients}'
+          email-prefix: '[{project}]'
+      - opendaylight-infra-shiplogs:
+          maven-version: 'mvn33'
 
 - job-template:
     name: 'builder-merge-packer-{platforms}-{templates}'
@@ -442,69 +459,70 @@
     node: centos7-java-builder-2c-4g
 
     properties:
-        - opendaylight-infra-properties:
-            build-days-to-keep: 14
+      - opendaylight-infra-properties:
+          build-days-to-keep: 14
 
     parameters:
-        - opendaylight-infra-parameters:
-            project: '{project}'
-            branch: '{branch}'
-            refspec: 'refs/heads/{branch}'
-            artifacts: '{archive-artifacts}'
+      - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
+          project: '{project}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
 
     scm:
-        - gerrit-trigger-scm:
-            refspec: '$GERRIT_REFSPEC'
-            branches:
-                - '$GERRIT_BRANCH'
-            choosing-strategy: 'default'
+      - gerrit-trigger-scm:
+          refspec: '$GERRIT_REFSPEC'
+          branches:
+            - '$GERRIT_BRANCH'
+          choosing-strategy: 'default'
 
     wrappers:
-        - opendaylight-infra-wrappers:
-            build-timeout: '{build-timeout}'
+      - opendaylight-infra-wrappers:
+          build-timeout: '{build-timeout}'
 
     triggers:
-        - timed: '00 10 1 * *'
-        - gerrit:
-            server-name: '{server-name}'
-            trigger-on:
-                - change-merged-event
-                - comment-added-contains-event:
-                    comment-contains-value: 'remerge'
-            projects:
-              - project-compare-type: 'ANT'
-                project-pattern: 'releng/builder'
-                branches:
-                    - branch-compare-type: 'ANT'
-                      branch-pattern: '**/{branch}'
-                file-paths:
-                    - compare-type: ANT
-                      pattern: 'packer/vars/{platforms}.json'
-                    - compare-type: ANT
-                      pattern: 'packer/templates/{templates}.json'
-                    - compare-type: ANT
-                      pattern: 'packer/provision/{templates}.sh'
-                    - compare-type: ANT
-                      pattern: 'packer/provision/system_reseal.sh'
-                    - compare-type: ANT
-                      pattern: 'packer/provision/rh-user_data.sh'
-                    - compare-type: ANT
-                      pattern: 'packer/provision/devstack-pre-pip.sh'
-                    - compare-type: ANT
-                      pattern: 'packer/provision/baseline.sh'
+      - timed: '00 10 1 * *'
+      - gerrit:
+          server-name: '{server-name}'
+          trigger-on:
+            - change-merged-event
+            - comment-added-contains-event:
+                comment-contains-value: 'remerge'
+          projects:
+            - project-compare-type: 'ANT'
+              project-pattern: 'releng/builder'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/{branch}'
+              file-paths:
+                - compare-type: ANT
+                  pattern: 'packer/vars/{platforms}.json'
+                - compare-type: ANT
+                  pattern: 'packer/templates/{templates}.json'
+                - compare-type: ANT
+                  pattern: 'packer/provision/{templates}.sh'
+                - compare-type: ANT
+                  pattern: 'packer/provision/system_reseal.sh'
+                - compare-type: ANT
+                  pattern: 'packer/provision/rh-user_data.sh'
+                - compare-type: ANT
+                  pattern: 'packer/provision/devstack-pre-pip.sh'
+                - compare-type: ANT
+                  pattern: 'packer/provision/baseline.sh'
 
     builders:
-        - packer-validate:
-        - packer-build:
-            platform: '{platforms}'
-            template: '{templates}'
+      - packer-validate:
+      - packer-build:
+          platform: '{platforms}'
+          template: '{templates}'
 
     publishers:
-        - email-notification:
-            email-recipients: '{email-recipients}'
-            email-prefix: '[{project}]'
-        - opendaylight-infra-shiplogs:
-            maven-version: 'mvn33'
+      - email-notification:
+          email-recipients: '{email-recipients}'
+          email-prefix: '[{project}]'
+      - opendaylight-infra-shiplogs:
+          maven-version: 'mvn33'
 
 - job-template:
     name: 'builder-update-csit-tests'
@@ -520,73 +538,84 @@
     project-type: freestyle
 
     properties:
-        - opendaylight-infra-properties:
-            build-days-to-keep: 14
+      - opendaylight-infra-properties:
+          build-days-to-keep: 14
 
     parameters:
-        - opendaylight-infra-parameters:
-            project: '{project}'
-            branch: '{branch}'
-            refspec: 'refs/heads/{branch}'
-            artifacts: '{archive-artifacts}'
+      - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
+          project: '{project}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
 
     scm:
-        - gerrit-trigger-scm:
-            refspec: ''
-            choosing-strategy: 'default'
+      - gerrit-trigger-scm:
+          refspec: ''
+          choosing-strategy: 'default'
 
     wrappers:
-        - opendaylight-infra-wrappers:
-            build-timeout: '{build-timeout}'
+      - opendaylight-infra-wrappers:
+          build-timeout: '{build-timeout}'
 
     triggers:
-        - reverse:
-               jobs: 'builder-merge'
+      - reverse:
+          jobs: 'builder-merge'
 
     builders:
-        - shell: |
-            git checkout -b auto-update-csit-jobs
-        - integration-list-jobs:
-            blacklist: '{csit-list-blacklist}'
-            search_string: "csit"
-            stream: "carbon"
-            jobs-filename: "csit_jobs_carbon.lst"
-        - integration-list-jobs:
-            blacklist: '{csit-list-blacklist}'
-            search_string: "csit"
-            stream: "boron"
-            jobs-filename: "csit_jobs_boron.lst"
-        - integration-list-jobs:
-            blacklist: '{csit-list-blacklist}'
-            search_string: "csit"
-            stream: "beryllium"
-            jobs-filename: "csit_jobs_beryllium.lst"
-        - integration-replace-block-text:
-            starting-regex: "'csit-list-carbon: >'"
-            ending-regex: "'csit-list-boron: >'"
-            file-with-changes-to-insert: "'csit_jobs_carbon.lst'"
-            file-to-change: "'jjb/releng-defaults.yaml'"
-        - integration-replace-block-text:
-            starting-regex: "'csit-list-boron: >'"
-            ending-regex: "'csit-list-beryllium: >'"
-            file-with-changes-to-insert: "'csit_jobs_boron.lst'"
-            file-to-change: "'jjb/releng-defaults.yaml'"
-        - integration-replace-block-text:
-            starting-regex: "'csit-list-beryllium: >'"
-            ending-regex: "'# CSIT TESTS END SED MARKER'"
-            file-with-changes-to-insert: "'csit_jobs_beryllium.lst'"
-            file-to-change: "'jjb/releng-defaults.yaml'"
-        - shell: |
-            git status
-            git add jjb/releng-defaults.yaml
-        - opendaylight-infra-push-gerrit-patch:
-            project: "releng/builder"
-            gerrit-topic: "auto-update-csit-jobs"
-            gerrit-commit-message: "Auto Update CSIT Jobs to run"
+      - shell: |
+          git checkout -b auto-update-csit-jobs
+      - integration-list-jobs:
+          blacklist: '{csit-list-blacklist}'
+          search_string: "csit"
+          stream: "nitrogen"
+          jobs-filename: "csit_jobs_nitrogen.lst"
+      - integration-list-jobs:
+          blacklist: '{csit-list-blacklist}'
+          search_string: "csit"
+          stream: "carbon"
+          jobs-filename: "csit_jobs_carbon.lst"
+      - integration-list-jobs:
+          blacklist: '{csit-list-blacklist}'
+          search_string: "csit"
+          stream: "boron"
+          jobs-filename: "csit_jobs_boron.lst"
+      - integration-list-jobs:
+          blacklist: '{csit-list-blacklist}'
+          search_string: "csit"
+          stream: "beryllium"
+          jobs-filename: "csit_jobs_beryllium.lst"
+      - integration-replace-block-text:
+          starting-regex: "'csit-list-nitrogen: >'"
+          ending-regex: "'csit-list-carbon: >'"
+          file-with-changes-to-insert: "'csit_jobs_nitrogen.lst'"
+          file-to-change: "'jjb/releng-defaults.yaml'"
+      - integration-replace-block-text:
+          starting-regex: "'csit-list-carbon: >'"
+          ending-regex: "'csit-list-boron: >'"
+          file-with-changes-to-insert: "'csit_jobs_carbon.lst'"
+          file-to-change: "'jjb/releng-defaults.yaml'"
+      - integration-replace-block-text:
+          starting-regex: "'csit-list-boron: >'"
+          ending-regex: "'csit-list-beryllium: >'"
+          file-with-changes-to-insert: "'csit_jobs_boron.lst'"
+          file-to-change: "'jjb/releng-defaults.yaml'"
+      - integration-replace-block-text:
+          starting-regex: "'csit-list-beryllium: >'"
+          ending-regex: "'# CSIT TESTS END SED MARKER'"
+          file-with-changes-to-insert: "'csit_jobs_beryllium.lst'"
+          file-to-change: "'jjb/releng-defaults.yaml'"
+      - shell: |
+          git status
+          git add jjb/releng-defaults.yaml
+      - opendaylight-infra-push-gerrit-patch:
+          project: "releng/builder"
+          gerrit-topic: "auto-update-csit-jobs"
+          gerrit-commit-message: "Auto Update CSIT Jobs to run"
 
     publishers:
-        - email-notification:
-            email-recipients: '{email-recipients}'
-            email-prefix: '[releng]'
-        - opendaylight-infra-shiplogs:
-            maven-version: 'mvn33'
+      - email-notification:
+          email-recipients: '{email-recipients}'
+          email-prefix: '[releng]'
+      - opendaylight-infra-shiplogs:
+          maven-version: 'mvn33'