Merge "Consolidate CSIT publisher into macro"

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

diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml
index f49b3b3e91ee9a2166914371156bdf4a4ef56736..a119315b2cba613b97b9434bc60725c23c04e48b 100644 (file)
--- 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
@@ -39,35 +39,20 @@
               git clean -dff
           fi
 
-- builder:
-    name: autorelease-cfp
-    builders:
-      - config-file-provider:
-          files:
-            - file-id: 'autorelease-settings'
-              variable: 'SETTINGS_FILE'
-            - file-id: 'global-settings'
-              variable: 'GLOBAL_SETTINGS_FILE'
-
 - builder:
     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<10.0.0" setuptools
           $PYTHON -m pip install --upgrade networkx
           $PYTHON -m pip freeze
           ./scripts/determine-merge-order.py
           deactivate
           rm -rf $WORKSPACE/venv
 
-- builder:
-    name: autorelease-maven-deploy
-    builders:
-      - shell: !include-raw: autorelease-maven-deploy.sh
-
 - builder:
     name: autorelease-maven-sources
     builders:
@@ -86,10 +71,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
 
@@ -98,7 +79,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" \
@@ -112,7 +93,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"
@@ -122,7 +103,6 @@
     name: autorelease-generate-release-patches
     builders:
       - shell: !include-raw:
-          - ../global-jjb/shell/lftools-install.sh
           - prepare-release.sh
 
 - builder:
@@ -145,6 +125,11 @@
       - 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: