Merge "Update Ubuntu docker image"

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

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index f57959410608274c5f4200b4d047b899e9958e52..6487231cb84ca48bb13e9cf97eb8ef653037bec7 100644 (file)
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -83,15 +83,16 @@
           default: ''
           description: |
               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
+              project:changeset (cherry-pick) for example: genius=32/53632/9,netvirt:59/50259/47.
+              A topic is also allowed, for example: topic=binding-tlc-rpc
 
 - parameter:
-    name: run-test-parameter
+    name: build-order-parameter
     parameters:
       - string:
-          name: RUN_TEST
-          default: '{run-test}'
-          description: 'Set true to run test after build'
+          name: BUILD_ORDER
+          default: '{build-order}'
+          description: 'Build order for multipatch test when topic is used'
 
 - parameter:
     name: build-fast-parameter
@@ -101,6 +102,14 @@
           default: '{build-fast}'
           description: 'Set true to build fast -Pq'
 
+- parameter:
+    name: run-test-parameter
+    parameters:
+      - string:
+          name: RUN_TEST
+          default: '{run-test}'
+          description: 'Set true to run test after build'
+
 - parameter:
     name: distribution-branch-to-build-parameter
     parameters:
@@ -349,24 +358,6 @@
       - shell: !include-raw: opendaylight-infra-stack.sh
       - shell: !include-raw-escape: opendaylight-infra-copy-ssh-keys.sh
 
-- builder:
-    name: opendaylight-infra-push-gerrit-patch
-    # opendaylight-infra-push-gerrit-patch.sh allows a job to push a patch to
-    # Gerrit in an automated fashion. This is meant for tasks that creates
-    # the same patch regularly and needs the ability to detect if an unreviewed
-    # patch already exists. In which case it will update the existing patch.
-    #
-    # Note: This patch assumes the $WORKSPACE contains the project repo with
-    #       the files changed already "git add" and waiting for a "git commit" call.
-    #
-    # This script requires the following JJB variables to be passed in:
-    #     {project}       Gerrit project-name
-    #     {gerrit-topic}  Gerrit topic, please make a unique topic.
-    #     {gerrit-commit-message} Commit message to assign to commit.
-    # NOTE: Requires git review to be installed on node.
-    builders:
-      - shell: !include-raw: opendaylight-infra-push-gerrit-patch.sh
-
 - builder:
     name: distribute-build-url
     # Place URL of the current run of a build job to a file at given path.