Update cloud image list docs

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

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index 03c77cc76a4c32e78fd6129e5c4dce67ba425ad6..cc4bfe4d71bb8778799aa0fab3ec4959e34b7fb5 100644 (file)
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -29,7 +29,9 @@
             **/hs_err_*.log
             **/target/feature/feature.xml
           # TODO: **/*.hprof is too large, compress with xz first
-          description: "Space separated glob patterns for artifacts to archive into logs.opendaylight.org"
+          description: |
+            Space separated glob patterns for artifacts to archive
+            into s3-logs.opendaylight.org/logs
       - string:
           name: GERRIT_PROJECT
           default: "{project}"
@@ -144,7 +146,7 @@
                 - compare-type: ANT
                   pattern: "{files}"
               forbidden-file-paths:
-                - compare-type: ANT
+                - compare-type: REG_EXP
                   pattern: "{forbidden-files}"
 
 # TODO: Unify argument names across gerrit-trigger-* macros.
@@ -167,7 +169,7 @@
                 - compare-type: ANT
                   pattern: "{files}"
               forbidden-file-paths:
-                - compare-type: ANT
+                - compare-type: REG_EXP
                   pattern: "{forbidden-files}"
           skip-vote:
             successful: true
@@ -203,7 +205,7 @@
             and use the Jenkins Build URL as a last resort.
 
             Console Logs URL:
-            https://logs.opendaylight.org/$SILO/$JENKINS_HOSTNAME/$JOB_NAME/$BUILD_NUMBER
+            https://s3-logs.opendaylight.org/logs/$SILO/$JENKINS_HOSTNAME/$JOB_NAME/$BUILD_NUMBER
 
             Jenkins Build URL:
             $BUILD_URL
@@ -220,13 +222,6 @@
       - shell: !include-raw: opendaylight-infra-stack.sh
       - shell: !include-raw-escape: opendaylight-infra-copy-ssh-keys.sh
 
-- builder:
-    name: opendaylight-apex-stack
-    # opendaylight-apex-stack.sh has a required variable {stack-template} that
-    # must be passed into this macro.
-    builders:
-      - shell: !include-raw: opendaylight-infra-stack.sh
-
 - builder:
     name: distribute-build-url
     # Place URL of the current run of a build job to a file at given path.
@@ -289,5 +284,5 @@
                 - SUCCESS
                 - UNSTABLE
               build-steps:
-                - shell: !include-raw: generate-csit-status-report.sh
+                - shell: !include-raw-escape: generate-csit-status-report.sh
           mark-unstable-if-failed: true