Merge "Migrate docs jobs to use lf-infra-publish"

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

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index 2f309173fb5edde835affdbc92d719e9a5afc2a2..1de2a6e000cbf193201f3a07aa7f794973934756 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -5,10 +5,12 @@
       - '{project-name}-ci-jobs'
       - '{project-name}-verify-tox-{stream}'
       - 'builder-check-poms'
+      # Packer jobs
       - 'builder-verify-packer'
       - 'builder-merge-packer-{platforms}-{templates}'
       # OpenStack Related
       - 'builder-cleanup-old-images'
+      - 'builder-delete-stale-nodes'
       - 'builder-delete-stale-stacks'
       # Automation for docs and jobs
       - 'builder-update-csit-tests'
@@ -21,7 +23,6 @@
 
     templates:
       - devstack
-      - devstack-pre-pip-mitaka
       - devstack-pre-pip-newton
       - docker
       - gbp
@@ -41,8 +42,6 @@
         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
@@ -55,8 +54,6 @@
         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
@@ -113,11 +110,11 @@
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[releng]'
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish
+
 
 - job-template:
-    name: 'builder-delete-stale-stacks'
+    name: 'builder-cleanup-old-images'
     project-type: freestyle
     node: centos7-java-builder-2c-4g
 
@@ -125,26 +122,45 @@
       - 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:
-      # 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:
+          - global-jjb/shell/lftools-install.sh
+          - opendaylight-infra-cleanup-old-images.sh
 
     publishers:
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[releng]'
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish
+
 
 - job-template:
-    name: 'builder-cleanup-old-images'
+    name: 'builder-delete-stale-nodes'
     project-type: freestyle
     node: centos7-java-builder-2c-4g
 
@@ -160,32 +176,60 @@
           refspec: 'refs/heads/{branch}'
           artifacts: '{archive-artifacts}'
 
-    scm:
-      - git-scm:
+    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
+          - 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}'
-      # 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'
+      # 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-old-images.sh
+      - 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'
+      - lf-infra-publish
+
 
 - job-template:
     name: 'builder-update-image-list'
@@ -232,8 +276,7 @@
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[releng]'
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish
 
 - job-template:
     name: 'builder-verify-packer'
@@ -276,8 +319,7 @@
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[{project}]'
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish
 
 - job-template:
     name: 'builder-merge-packer-{platforms}-{templates}'
@@ -347,8 +389,7 @@
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[{project}]'
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish
 
 - job-template:
     name: 'builder-update-csit-tests'
@@ -406,11 +447,6 @@
           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: >'"
@@ -423,13 +459,8 @@
           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-with-changes-to-insert: "'csit_jobs_boron.lst'"
           file-to-change: "'jjb/releng-defaults.yaml'"
       - shell: |
           git status
@@ -443,5 +474,4 @@
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[releng]'
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish