Merge "Adjust CSIT for UM projects"

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

diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml
index eab728fb963216663446a94bc1303b555c80a972..f49b3b3e91ee9a2166914371156bdf4a4ef56736 100644 (file)
--- a/jjb/autorelease/autorelease-macros.yaml
+++ b/jjb/autorelease/autorelease-macros.yaml
@@ -34,6 +34,9 @@
           # If the project is autorelease then we need to init and update submodules
           if [ "$GERRIT_PROJECT" == "releng/autorelease" ]; then
               git submodule update --init
+              # The previous checkout might have failed to remove directory of a submodule being removed.
+              # See https://stackoverflow.com/a/10761699
+              git clean -dff
           fi
 
 - builder:
@@ -53,7 +56,7 @@
           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 freeze
           ./scripts/determine-merge-order.py
@@ -63,7 +66,7 @@
 - builder:
     name: autorelease-maven-deploy
     builders:
-      - shell: !include-raw: include-raw-autorelease-maven-deploy.sh
+      - shell: !include-raw: autorelease-maven-deploy.sh
 
 - builder:
     name: autorelease-maven-sources
@@ -90,15 +93,6 @@
       - shell: |
           awk '/The following files have NOT been resolved:/,/^$/' sources.log > missing-sources.log
 
-- builder:
-    name: autorelease-generate-taglist
-    builders:
-      - shell: |
-          echo autorelease `git rev-parse --verify HEAD` ${RELEASE_TAG} \
-              | tee -a $WORKSPACE/taglist.log
-          git submodule foreach 'echo $path `git rev-parse --verify HEAD` ${RELEASE_TAG} \
-              | tee -a $WORKSPACE/taglist.log'
-
 - builder:
     name: autorelease-distribute-taglist
     builders:
@@ -107,15 +101,23 @@
           #!/bin/bash
           set +e  # DO NOT fail build if copying fails.
 
-          if [ -d "integration/distribution/distributions" ]; then
-              cp -vf "$WORKSPACE/taglist.log" "integration/distribution/distributions/karaf/src/main/assembly/"
-          else
-              cp -vf "$WORKSPACE/taglist.log" "integration/distribution/$KARAF_ARTIFACT/src/main/assembly/"
-          fi
+          cp -vf "$WORKSPACE/archives/patches/taglist.log" \
+              "integration/distribution/$KARAF_ARTIFACT/src/main/assembly/"
 
           # DO NOT fail the build if copying failed.
           exit 0
 
+- builder:
+    name: autorelease-generate-artifact-versions
+    # Generate versions.csv containing version of all mvn artifacts in this build.
+    builders:
+      - shell: |
+          #!/bin/bash
+          set -eu -o pipefail
+          ./scripts/generate-artifact-versions.sh
+          mkdir -p "$WORKSPACE/archives"
+          mv versions.csv "$WORKSPACE/archives"
+
 - builder:
     name: autorelease-generate-release-patches
     builders:
@@ -127,7 +129,7 @@
     name: autorelease-get-integration-test-variables
     builders:
       - integration-set-variables
-      - shell: !include-raw: include-raw-autorelease-get-integration-test-variables.sh
+      - shell: !include-raw: autorelease-get-integration-test-variables.sh
       - inject:
           properties-file: variables.prop
 
@@ -140,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.
@@ -154,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