X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fautorelease%2Fautorelease-macros.yaml;h=2689a5a7e3c028421ac4775803f72ef1ea5d182c;hb=3f74d54d316d9ee1648aa645be5dc71fe5b6cfa3;hp=06daa22d2d138890afba844aa2ddbca2d81f6531;hpb=a66b860b3d438ced66c7151d8499d8d93e4c4467;p=releng%2Fbuilder.git

diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml
index 06daa22d2..e66dc54b6 100644
--- a/jjb/autorelease/autorelease-macros.yaml
+++ b/jjb/autorelease/autorelease-macros.yaml
@@ -20,7 +20,7 @@
     name: autorelease-checkout-gerrit-patch
     builders:
       - shell: |
-          #!/bin/bash
+          #!/bin/bash -l
           set -eu -o pipefail
 
           # If the project is autorelease then we do not need to cd
@@ -53,13 +53,12 @@
     name: autorelease-determine-merge-order
     builders:
       - shell: |
+          #!/bin/bash -l
           virtualenv --system-site-packages $WORKSPACE/venv
           source $WORKSPACE/venv/bin/activate
           PYTHON="$WORKSPACE/venv/bin/python"
-          $PYTHON -m pip install --upgrade pip
           $PYTHON -m pip install --upgrade networkx
-          $PYTHON -m pip install --upgrade pipdeptree
-          pipdeptree
+          $PYTHON -m pip freeze
           ./scripts/determine-merge-order.py
           deactivate
           rm -rf $WORKSPACE/venv
@@ -87,10 +86,6 @@
           settings-type: cfp
           global-settings: '{global-settings}'
           global-settings-type: cfp
-
-- builder:
-    name: autorelease-maven-sources-post-process
-    builders:
       - shell: |
           awk '/The following files have NOT been resolved:/,/^$/' sources.log > missing-sources.log
 
@@ -99,7 +94,7 @@
     builders:
       - integration-set-variables
       - shell: |
-          #!/bin/bash
+          #!/bin/bash -l
           set +e  # DO NOT fail build if copying fails.
 
           cp -vf "$WORKSPACE/archives/patches/taglist.log" \
@@ -113,7 +108,7 @@
     # Generate versions.csv containing version of all mvn artifacts in this build.
     builders:
       - shell: |
-          #!/bin/bash
+          #!/bin/bash -l
           set -eu -o pipefail
           ./scripts/generate-artifact-versions.sh
           mkdir -p "$WORKSPACE/archives"
@@ -123,7 +118,6 @@
     name: autorelease-generate-release-patches
     builders:
       - shell: !include-raw:
-          - ../global-jjb/shell/lftools-install.sh
           - prepare-release.sh
 
 - builder:
@@ -146,17 +140,34 @@
       - shell: !include-raw:
           - generate-release-notes.sh
 
+- builder:
+    name: autorelease-update-project-views
+    builders:
+      - shell: !include-raw: update-autorelease-projects-views.sh
+
 - builder:
     name: autorelease-update-validate-projects
     builders:
       - shell: !include-raw: update-validate-autorelease-projects.sh
 
+- builder:
+    name: autorelease-compare-projects
+    builders:
+      - shell: !include-raw: compare-autorelease-projects.sh
+
 - publisher:
     # Search console log for failures and email status to the release mailing list.
     name: opendaylight-infra-notify-status
     publishers:
       - postbuildscript:
           builders:
-            - shell: !include-raw: notify-build-failure.sh
-          script-only-if-succeeded: false
-          script-only-if-failed: true
+            - role: BOTH
+              build-on:
+                - ABORTED
+                - FAILURE
+                - NOT_BUILT
+                - SUCCESS
+                - UNSTABLE
+              build-steps:
+                - shell: !include-raw: notify-build-failure.sh
+          mark-unstable-if-failed: true