X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng-macros.yaml;h=f57959410608274c5f4200b4d047b899e9958e52;hb=4d616e4fac941f77ed206a573970ef3f98d9c464;hp=1d35880b91a592d82260aee52692844e419fc6f5;hpb=0f16b29ecc52f1b1beb31f563659b15b07cea4eb;p=releng%2Fbuilder.git

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index 1d35880b9..f57959410 100644
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -82,16 +82,25 @@
           name: PATCHES_TO_BUILD
           default: ''
           description: |
-            Patches to add to distro in CSV project:changeset format (genius:32/53632/9,netvirt:59/50259/47)
+              Ordered list of patches to build in the format of project=changeset (checkout) or
+              project:changeset (cherry-pick) for example: genius=32/53632/9,netvirt:59/50259/47
 
 - parameter:
     name: run-test-parameter
     parameters:
       - string:
-          name: RUNTEST
+          name: RUN_TEST
           default: '{run-test}'
           description: 'Set true to run test after build'
 
+- parameter:
+    name: build-fast-parameter
+    parameters:
+      - string:
+          name: BUILD_FAST
+          default: '{build-fast}'
+          description: 'Set true to build fast -Pq'
+
 - parameter:
     name: distribution-branch-to-build-parameter
     parameters:
@@ -190,7 +199,7 @@
                 exclude-no-code-change: false
             - draft-published-event
             - comment-added-contains-event:
-                comment-contains-value: recheck
+                comment-contains-value: 'recheck$'
           projects:
             - project-compare-type: ANT
               project-pattern: '{project}'
@@ -210,7 +219,7 @@
           trigger-on:
             - change-merged-event
             - comment-added-contains-event:
-                comment-contains-value: 'remerge'
+                comment-contains-value: 'remerge$'
           projects:
             - project-compare-type: 'ANT'
               project-pattern: '{name}'
@@ -281,6 +290,43 @@
           send-to:
             - recipients
 
+
+- builder:
+    # Installs the openstack cli into a virtualenv at /tmp/v/openstack
+    name: odl-openstack-install
+    builders:
+      - shell: !include-raw: odl-openstack-install.sh
+
+- builder:
+    name: odl-openstack-check-image-protection
+    builders:
+      - shell: !include-raw: odl-openstack-check-image-protection.sh
+
+- builder:
+    name: odl-openstack-cleanup-old-images
+    builders:
+      - shell: !include-raw: odl-openstack-cleanup-old-images.sh
+
+- builder:
+    name: odl-openstack-cleanup-orphaned-nodes
+    builders:
+      - shell: !include-raw: odl-openstack-cleanup-orphaned-nodes.sh
+
+- builder:
+    name: odl-openstack-cleanup-stale-nodes
+    builders:
+      - shell: !include-raw: odl-openstack-cleanup-stale-nodes.sh
+
+- builder:
+    name: odl-openstack-cleanup-stale-stacks
+    builders:
+      - shell: !include-raw: odl-openstack-cleanup-stale-stacks.sh
+
+- builder:
+    name: odl-openstack-cleanup-stale-volumes
+    builders:
+      - shell: !include-raw: odl-openstack-cleanup-stale-volumes.sh
+
 - builder:
     # Deploys a maven site to Nexus using lftools nexus-zip command
     name: opendaylight-infra-deploy-maven-site
@@ -416,6 +462,25 @@
                 settings: '{settings}'
                 global-settings: '{global-settings}'
 
+- publisher:
+    name: releng-openstack-stack-delete
+    publishers:
+      - postbuildscript:
+          builders:
+            - role: BOTH
+              build-on:
+                - ABORTED
+                - FAILURE
+                - SUCCESS
+                - UNSTABLE
+              build-steps:
+                - shell: |
+                    #!/bin/bash
+                    echo "Deleting $STACK_NAME"
+                    source "/tmp/v/openstack/bin/activate"
+                    openstack stack delete --yes "$STACK_NAME"
+          mark-unstable-if-failed: false
+
 - builder:
     name: releng-stage-release
     builders:
@@ -431,7 +496,9 @@
           files:
             - file-id: npmrc
               target: '$HOME/.npmrc'
-            - file-id: rackspace-heat
+            - file-id: pipconf
+              target: '$HOME/.config/pip/pip.conf'
+            - file-id: clouds-yaml
               target: '$HOME/.config/openstack/clouds.yaml'
       - timeout:
           type: absolute
@@ -450,7 +517,13 @@
     publishers:
       - postbuildscript:
           builders:
-            - shell: !include-raw: generate-csit-status-report.sh
-          script-only-if-succeeded: false
-          script-only-if-failed: false
-          mark-unstable-if-failed: false
+            - role: BOTH
+              build-on:
+                - ABORTED
+                - FAILURE
+                - NOT_BUILT
+                - SUCCESS
+                - UNSTABLE
+              build-steps:
+                - shell: !include-raw: generate-csit-status-report.sh
+          mark-unstable-if-failed: true