X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng-jobs.yaml;h=24e8d177fad75af91183099273e8ce362c392664;hb=ddb2532856a07220cb6c199d5acbe0466897ba5c;hp=ba0563ebe53bbf01a2884d39150621e03d9ace61;hpb=7a61ae15dbb90de5f05778fffc1bc0ba7acf2b2a;p=releng%2Fbuilder.git

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index ba0563ebe..24e8d177f 100644
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -10,6 +10,7 @@
       - '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'
@@ -18,6 +19,7 @@
     platforms:
       - centos
       - ubuntu-14.04
+      - ubuntu-16.04
 
     templates:
       - devstack
@@ -27,7 +29,6 @@
       - gbp
       - java-builder
       - mininet
-      - mininet-ovs-2.3
       - mininet-ovs-2.5
       - robot
 
@@ -36,8 +37,6 @@
         templates: gbp
       - platforms: centos
         templates: mininet
-      - platforms: centos
-        templates: mininet-ovs-2.3
       - platforms: centos
         templates: mininet-ovs-2.5
       - platforms: ubuntu-14.04
@@ -52,6 +51,25 @@
         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'
@@ -77,6 +95,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -104,8 +123,8 @@
           virtualenv $WORKSPACE/venv
           source $WORKSPACE/venv/bin/activate
           pip install --upgrade pip
-          pip freeze
           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
@@ -134,6 +153,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -171,8 +191,8 @@
           virtualenv $WORKSPACE/venv
           source $WORKSPACE/venv/bin/activate
           pip install --upgrade pip
-          pip freeze
           pip install jenkins-job-builder
+          pip freeze
           jenkins-jobs --version
           jenkins-jobs update --recursive --delete-old --workers 4 jjb/
 
@@ -201,6 +221,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -223,8 +244,8 @@
           virtualenv $WORKSPACE/venv
           source $WORKSPACE/venv/bin/activate
           pip install --upgrade pip
-          pip freeze
           pip install jenkins-job-builder
+          pip freeze
           jenkins-jobs --flush-cache update --recursive --workers 4 jjb/
 
     publishers:
@@ -246,6 +267,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -295,6 +317,50 @@
       - 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}'
+      # 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: opendaylight-infra-cleanup-old-images.sh
+
+    publishers:
+      - email-notification:
+          email-recipients: '{email-recipients}'
+          email-prefix: '[releng]'
+      - opendaylight-infra-shiplogs:
+          maven-version: 'mvn33'
+
 - job-template:
     name: 'builder-update-image-list'
     project-type: freestyle
@@ -306,6 +372,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: odlpriv
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -354,6 +421,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -396,6 +464,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -474,6 +543,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -495,6 +565,11 @@
     builders:
       - 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"
@@ -510,9 +585,14 @@
           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-weekly-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: