Merge "Revert "Increase packer job timeout to 120 minutes""

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

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index ab2f6b732116cf37af44f28692655b97f71b4b3b..1f5ab471086f997616652132370e7bd14edb106d 100644 (file)
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -76,7 +76,8 @@
       - string:
           name: PATCHES_TO_BUILD
           default: ''
-          description: 'csv list of patches in project:changeset format to build distribution with'
+          description: |
+            Patches to add to distro in CSV project:changeset format (genius:32/53632/9,netvirt:59/50259/47)
 
 - parameter:
     name: run-test-parameter
@@ -301,44 +302,6 @@
                 healthy: 50
                 unhealthy: 40
 
-- publisher:
-    name: opendaylight-infra-shiplogs
-    # To archive things the job will need to create a "archives" directory in
-    # the workspace and this macro will handle copying the contents of the
-    # archives directory.
-    #
-    # Uses the build parameter ARCHIVE_ARTIFACTS if not empty to find files
-    # to archive. You can pass globstar patterns for example "**/*.xml **/*.log"
-    # as the archive pattern. This is a space separated list of files to archive.
-    #
-    # Also ensure that the workspace is cleaned up at the end of the build.
-    publishers:
-      - postbuildscript:
-          builders:
-            - shell: !include-raw: include-raw-stack-delete.sh
-            - shell: !include-raw-escape: include-raw-deploy-archives.sh
-            - maven-target:
-                maven-version: '{maven-version}'
-                pom: '.archives/deploy-archives.xml'
-                goals: 'clean deploy -V -B -q -Dmaven.repo.local=/tmp/r'
-                settings: 'jenkins-log-archives-settings'
-                settings-type: cfp
-                global-settings: 'odl-global-settings'
-                global-settings-type: cfp
-            - description-setter:
-                regexp: '^Build logs: .*'
-            # Cleanup after ourselves
-            - wipe-org-opendaylight-repo
-          script-only-if-succeeded: false
-          script-only-if-failed: false
-          mark-unstable-if-failed: true
-      - workspace-cleanup:
-          exclude:
-            # Do not clean up *.jenkins-trigger files for jobs that use a
-            # properties file as input for triggering another build.
-            - '**/*.jenkins-trigger'
-          fail-build: false
-
 - builder:
     name: opendaylight-infra-stack
     # opendaylight-infra-stack.sh has a required variable {stack-template} that
@@ -369,7 +332,14 @@
     name: distribute-build-url
     # Place URL of the current run of a build job to a file at given path.
     builders:
-      - shell: 'echo "$BUILD_URL" > {path}/build.url'
+      - shell: |
+          #!/bin/bash
+          set +e  # DO NOT fail script if command returns non-zero.
+
+          echo "$BUILD_URL" > {path}/build.url
+
+          # DO NOT fail the build if the echo failed.
+          exit 0
 
 - builder:
     name: wipe-org-opendaylight-repo
@@ -466,6 +436,8 @@
       - mask-passwords
       - config-file-provider:
           files:
+            - file-id: npmrc
+              target: '$HOME/.npmrc'
             - file-id: rackspace-heat
               target: '$HOME/.config/openstack/clouds.yaml'
       - timeout:
@@ -710,25 +682,3 @@
               {mvn-opts}
           java-opts:
             - '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
-
-- builder:
-    name: distribution-check-deploy-distribution
-    # Deploy distribution-karaf zip to Nexus SNAPSHOT repo for testing.
-    # Arguments:
-    #   {settings-file} to use for opendaylight-snapshot credentials
-    builders:
-      - inject:
-          properties-content: BUNDLE_POM={dist-pom}
-      - shell: !include-raw-escape: deploy-distribution-get-vars.sh
-      - inject:
-          properties-file: deploy-distribution.env
-      - config-file-provider:
-          files:
-            - file-id: odl-global-settings
-              variable: GLOBAL_SETTINGS_FILE
-            - file-id: integration-settings
-              variable: SETTINGS_FILE
-      - shell: !include-raw-escape: deploy-distribution.sh
-      # Re-inject BUNDLE_URL so that downstream projects can use it.
-      - inject:
-          properties-file: deploy-distribution.env