From 5c56cb534c28bbc3ed2eb9ffffbe038ff3ccb6c0 Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Tue, 18 Sep 2018 09:59:49 -0400 Subject: [PATCH] Use lf-infra-pre-build for pip and setuptools lf-infra-pre-build globally updates pip and setuptools for the jenkins user. This allows us to simplify other scripts to not have to do it as well. Change-Id: I09f981a255d02bd4f574b2619073b94b419047a9 Signed-off-by: Thanh Ha --- jjb/autorelease/autorelease-macros.yaml | 8 ++++---- jjb/autorelease/autorelease-maven-deploy.sh | 2 +- jjb/autorelease/autorelease-templates.yaml | 6 +++++- jjb/autorelease/branch-cut.sh | 2 +- jjb/autorelease/compare-autorelease-projects.sh | 2 +- jjb/autorelease/generate-release-notes.sh | 4 +++- jjb/autorelease/notify-build-failure.sh | 2 +- jjb/autorelease/update-autorelease-projects-views.sh | 2 +- jjb/autorelease/update-validate-autorelease-projects.sh | 2 +- jjb/autorelease/version-bump.sh | 2 +- 10 files changed, 19 insertions(+), 13 deletions(-) diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml index 5ade7e8ba..60e3cfd9d 100644 --- 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 @@ -53,10 +53,10 @@ 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 @@ -98,7 +98,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 +112,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" diff --git a/jjb/autorelease/autorelease-maven-deploy.sh b/jjb/autorelease/autorelease-maven-deploy.sh index a55cf6d5a..82e52fe8b 100644 --- a/jjb/autorelease/autorelease-maven-deploy.sh +++ b/jjb/autorelease/autorelease-maven-deploy.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -l # SPDX-License-Identifier: EPL-1.0 ############################################################################## # Copyright (c) 2015 The Linux Foundation and others. diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml index dc03923f2..3d5bd1d66 100644 --- a/jjb/autorelease/autorelease-templates.yaml +++ b/jjb/autorelease/autorelease-templates.yaml @@ -125,6 +125,7 @@ - timed: '{cron}' builders: + - lf-infra-pre-build # force jenkins install of maven version before any shell scripts use it - lf-maven-install: mvn-version: '{mvn-version}' @@ -250,6 +251,7 @@ - timed: '{obj:cron}' builders: + - lf-infra-pre-build # Fetch latest head of branch - shell: | git checkout $GERRIT_BRANCH @@ -326,6 +328,7 @@ jenkins-ssh-credential: opendaylight-jenkins-ssh builders: + - lf-infra-pre-build - autorelease-update-project-views - autorelease-update-validate-projects - lf-infra-push-gerrit-patch: @@ -394,6 +397,7 @@ jenkins-ssh-credential: opendaylight-jenkins-ssh builders: + - lf-infra-pre-build # force jenkins install of maven version before any shell scripts use it - maven-target: maven-version: mvn35 @@ -404,7 +408,6 @@ global-settings-type: cfp - autorelease-cfp - shell: !include-raw-escape: - - ../global-jjb/shell/lftools-install.sh - version-bump.sh publishers: @@ -468,6 +471,7 @@ branch-pattern: '**/{branch}' builders: + - lf-infra-pre-build - autorelease-generate-release-notes publishers: diff --git a/jjb/autorelease/branch-cut.sh b/jjb/autorelease/branch-cut.sh index fd0055f6a..6d74e78cf 100644 --- a/jjb/autorelease/branch-cut.sh +++ b/jjb/autorelease/branch-cut.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -l # @License EPL-1.0 ############################################################################## # Copyright (c) 2017 The Linux Foundation and others. diff --git a/jjb/autorelease/compare-autorelease-projects.sh b/jjb/autorelease/compare-autorelease-projects.sh index 0984d01f7..49cf4f337 100644 --- a/jjb/autorelease/compare-autorelease-projects.sh +++ b/jjb/autorelease/compare-autorelease-projects.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -l # SPDX-License-Identifier: EPL-1.0 ############################################################################## # Copyright (c) 2018 The Linux Foundation and others. diff --git a/jjb/autorelease/generate-release-notes.sh b/jjb/autorelease/generate-release-notes.sh index 08773f77f..a3b3c9c30 100644 --- a/jjb/autorelease/generate-release-notes.sh +++ b/jjb/autorelease/generate-release-notes.sh @@ -1,4 +1,4 @@ -#!/bin/bash -x +#!/bin/bash -l # SPDX-License-Identifier: EPL-1.0 ############################################################################## # Copyright (c) 2017 The Linux Foundation and others. @@ -11,6 +11,8 @@ # This script generates Service Release notes and appends them to the release # notes in the docs project and submits a patch. +set -x + RELEASE=${RELEASE:-$(echo "$GERRIT_EVENT_COMMENT_TEXT" | grep generate-release-notes | awk '{print $2}')} if [ -z "$RELEASE" ]; then echo "ERROR: The RELEASE variable is not set." diff --git a/jjb/autorelease/notify-build-failure.sh b/jjb/autorelease/notify-build-failure.sh index 7eefa4043..a5c5c82bb 100644 --- a/jjb/autorelease/notify-build-failure.sh +++ b/jjb/autorelease/notify-build-failure.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -l # SPDX-License-Identifier: EPL-1.0 ############################################################################## # Copyright (c) 2017 The Linux Foundation and others. diff --git a/jjb/autorelease/update-autorelease-projects-views.sh b/jjb/autorelease/update-autorelease-projects-views.sh index fa610a96b..8e8cf2147 100755 --- a/jjb/autorelease/update-autorelease-projects-views.sh +++ b/jjb/autorelease/update-autorelease-projects-views.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -l # SPDX-License-Identifier: EPL-1.0 ############################################################################## # Copyright (c) 2018 The Linux Foundation and others. diff --git a/jjb/autorelease/update-validate-autorelease-projects.sh b/jjb/autorelease/update-validate-autorelease-projects.sh index e7691cb13..5bc1901a4 100644 --- a/jjb/autorelease/update-validate-autorelease-projects.sh +++ b/jjb/autorelease/update-validate-autorelease-projects.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -l # SPDX-License-Identifier: EPL-1.0 ############################################################################## # Copyright (c) 2017 - 2018 The Linux Foundation and others. diff --git a/jjb/autorelease/version-bump.sh b/jjb/autorelease/version-bump.sh index d48b49070..682d0fb6d 100644 --- a/jjb/autorelease/version-bump.sh +++ b/jjb/autorelease/version-bump.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -l # SPDX-License-Identifier: EPL-1.0 ############################################################################## # Copyright (c) 2017 The Linux Foundation and others. -- 2.36.6