X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fautorelease%2Fautorelease-macros.yaml;h=f49b3b3e91ee9a2166914371156bdf4a4ef56736;hb=dd127697545ae248565a4fb8b0468691bed3d522;hp=238fe9b5be20f767ac013208132bd49178171abe;hpb=492a570941534cb5a29af88607245d8376cadd43;p=releng%2Fbuilder.git

diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml
index 238fe9b5b..f49b3b3e9 100644
--- a/jjb/autorelease/autorelease-macros.yaml
+++ b/jjb/autorelease/autorelease-macros.yaml
@@ -56,10 +56,9 @@
           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 "pip<10.0.0" setuptools
           $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
@@ -143,13 +142,18 @@
 - builder:
     name: autorelease-generate-release-notes
     builders:
-      - shell: |
-          cd $WORKSPACE/scripts/release_notes_management
-          java -jar target/autonotes.jar
-          if [ -f  "$WORKSPACE/scripts/release_notes_management/projects/release-notes.rst" ]; then
-              mkdir -p $WORKSPACE/archives
-              cp -vf "$WORKSPACE/scripts/release_notes_management/projects/release-notes.rst" "$WORKSPACE/archives"
-          fi
+      - shell: !include-raw:
+          - generate-release-notes.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.
@@ -157,6 +161,13 @@
     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