Use lf-infra-pre-build for pip and setuptools 20/76220/5
authorThanh Ha <thanh.ha@linuxfoundation.org>
Tue, 18 Sep 2018 13:59:49 +0000 (09:59 -0400)
committerThanh Ha <thanh.ha@linuxfoundation.org>
Tue, 18 Sep 2018 14:12:25 +0000 (10:12 -0400)
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 <thanh.ha@linuxfoundation.org>
jjb/autorelease/autorelease-macros.yaml
jjb/autorelease/autorelease-maven-deploy.sh
jjb/autorelease/autorelease-templates.yaml
jjb/autorelease/branch-cut.sh
jjb/autorelease/compare-autorelease-projects.sh
jjb/autorelease/generate-release-notes.sh
jjb/autorelease/notify-build-failure.sh
jjb/autorelease/update-autorelease-projects-views.sh
jjb/autorelease/update-validate-autorelease-projects.sh
jjb/autorelease/version-bump.sh

index 5ade7e8bafb6151449007e575f32c9f5705bebc8..60e3cfd9da0e5137d6161e0c56528d5d6f61beed 100644 (file)
@@ -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
     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" \
     # 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"
index a55cf6d5ae779186882149d9b1e067f6a469d345..82e52fe8b58145bbb5ce1d6848d37dea210d9113 100644 (file)
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -l
 # SPDX-License-Identifier: EPL-1.0
 ##############################################################################
 # Copyright (c) 2015 The Linux Foundation and others.
index dc03923f230cbc714184664edffa9458826b24da..3d5bd1d66ee4feb1d9153d7f1aa3747d81b93a1d 100644 (file)
       - 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}'
       - timed: '{obj:cron}'
 
     builders:
+      - lf-infra-pre-build
       # Fetch latest head of branch
       - shell: |
           git checkout $GERRIT_BRANCH
           jenkins-ssh-credential: opendaylight-jenkins-ssh
 
     builders:
+      - lf-infra-pre-build
       - autorelease-update-project-views
       - autorelease-update-validate-projects
       - lf-infra-push-gerrit-patch:
           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
           global-settings-type: cfp
       - autorelease-cfp
       - shell: !include-raw-escape:
-          - ../global-jjb/shell/lftools-install.sh
           - version-bump.sh
 
     publishers:
                   branch-pattern: '**/{branch}'
 
     builders:
+      - lf-infra-pre-build
       - autorelease-generate-release-notes
 
     publishers:
index fd0055f6a475823f116a5743bb3d5901bda21b34..6d74e78cf3b683e29244b9769e9cecae9d5fa7b7 100644 (file)
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -l
 # @License EPL-1.0 <http://spdx.org/licenses/EPL-1.0>
 ##############################################################################
 # Copyright (c) 2017 The Linux Foundation and others.
index 0984d01f7d5a1ca4e9af9af8e3242d253338a67b..49cf4f33715f042f4533a6e0e57f8426d1da82e6 100644 (file)
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -l
 # SPDX-License-Identifier: EPL-1.0
 ##############################################################################
 # Copyright (c) 2018 The Linux Foundation and others.
index 08773f77fdb075e3fe2b22fc79c686b8c7878aed..a3b3c9c3071861786bbd46fd221f040772d45929 100644 (file)
@@ -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."
index 7eefa4043a0322fca793e253466cd4796ea4fe88..a5c5c82bbe10b2678f94d9b70747fe009793ffa1 100644 (file)
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -l
 # SPDX-License-Identifier: EPL-1.0
 ##############################################################################
 # Copyright (c) 2017 The Linux Foundation and others.
index fa610a96b2d27313705facf0b2ed42891dcf1e2d..8e8cf21471dafaf628033ec144ec431409492074 100755 (executable)
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -l
 # SPDX-License-Identifier: EPL-1.0
 ##############################################################################
 # Copyright (c) 2018 The Linux Foundation and others.
index e7691cb130a680a8934a53bade38776ca350169f..5bc1901a4e8dc3872ae71cd6e033e08d77ad22f8 100644 (file)
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -l
 # SPDX-License-Identifier: EPL-1.0
 ##############################################################################
 # Copyright (c) 2017 - 2018 The Linux Foundation and others.
index d48b49070ed71a29109f688d0d8818a442577320..682d0fb6d292886e61ed343885b92a0f024ca417 100644 (file)
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -l
 # SPDX-License-Identifier: EPL-1.0
 ##############################################################################
 # Copyright (c) 2017 The Linux Foundation and others.