Merge "Switch the csit-3node-docker to use job prefix"

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

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index cd77391bced7efd77000fe3a561b19376aad48a0..016c65afb5a0ce9934e3f9cdbe42ec197ae80f35 100644 (file)
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -82,7 +82,8 @@
           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
@@ -281,22 +282,37 @@
           send-to:
             - recipients
 
-- publisher:
-    name: jacoco-report
-    publishers:
-      - jacoco:
-          exec-pattern: "**/**.exec"
-          class-pattern: "**/classes"
-          source-pattern: "**/src/main/java"
-          exclusion-pattern: "**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**"
-          status-update: true
-          targets:
-            - branch:
-                healthy: 10
-                unhealthy: 20
-            - method:
-                healthy: 50
-                unhealthy: 40
+
+- 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:
     # Deploys a maven site to Nexus using lftools nexus-zip command
@@ -448,7 +464,7 @@
           files:
             - file-id: npmrc
               target: '$HOME/.npmrc'
-            - file-id: rackspace-heat
+            - file-id: clouds-yaml
               target: '$HOME/.config/openstack/clouds.yaml'
       - timeout:
           type: absolute