Merge "Fix yamllint for usecplugin"

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

diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml
index 532a55bb4f770210edd35eaadefb1ce1c97b689f..86f981eed2eeb019b024675f344d3e41a97aab6d 100644 (file)
--- a/jjb/autorelease/autorelease-macros.yaml
+++ b/jjb/autorelease/autorelease-macros.yaml
@@ -46,14 +46,18 @@
     name: autorelease-determine-merge-order
     builders:
        - shell: |
-          virtualenv --system-site-packages $WORKSPACE/venv
-          source $WORKSPACE/venv/bin/activate
-          pip install --upgrade pip
-          pip install --upgrade networkx
-          pip freeze
-          ./scripts/determine-merge-order.py
-          deactivate
-          rm -rf $WORKSPACE/venv
+          # TODO: Remove this condition once stable/beryllium is no longer
+          #       officially maintained.
+          if [ "$GERRIT_BRANCH" != "stable/beryllium" ]; then
+              virtualenv --system-site-packages $WORKSPACE/venv
+              source $WORKSPACE/venv/bin/activate
+              pip install --upgrade pip
+              pip install --upgrade networkx
+              pip freeze
+              ./scripts/determine-merge-order.py
+              deactivate
+              rm -rf $WORKSPACE/venv
+          fi
 
 - builder:
     name: autorelease-maven-deploy
@@ -128,3 +132,21 @@
     - shell:
         !include-raw:
             - include-raw-generate-project-report.sh
+
+- builder:
+    name: autorelease-fix-relative-paths
+    builders:
+        - shell: |
+            ./scripts/fix-relativepaths.sh
+
+- publisher:
+    # include-raw-autorelease-notify-build-failure.sh searches console log for
+    # failures and emails the status to the release mailing list.
+    name: opendaylight-infra-notify-status
+    publishers:
+      - postbuildscript:
+          builders:
+              - shell:
+                  !include-raw: include-raw-autorelease-notify-build-failure.sh
+          script-only-if-succeeded: False
+          script-only-if-failed: True