Merge "Generate versions.csv for autorelease builds"

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

diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml
index 4a34eaf5a46c023c2ff1445c0715b7b0ed205227..b868d9c868d46dbc73a8b544148ed95c4c818e80 100644 (file)
--- a/jjb/autorelease/autorelease-macros.yaml
+++ b/jjb/autorelease/autorelease-macros.yaml
@@ -8,14 +8,6 @@
           default: '{release-tag}'
           description: "The Release train tag to use eg. Beryllium-SR1"
 
-- parameter:
-    name: autorelease-release-branch
-    parameters:
-      - string:
-          name: RELEASE_BRANCH
-          default: '{release-branch}'
-          description: "The Release train branch to base build off eg. stable/beryllium"
-
 - wrapper:
     name: autorelease-build-timeout
     wrappers:
@@ -71,7 +63,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
@@ -98,15 +90,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:
@@ -115,15 +98,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:
@@ -135,7 +126,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