Merge "have release functions script source its own requirements"

jenkins/scripts/release-tools/functions

@@ -5,6 +5,9 @@
 
 _functions_bindir=$(realpath $(dirname $0))
 
+# clone_repo requires configure_git_review from ../common.sh
+source $_functions_bindir/../common.sh
+
 # Make sure custom grep options don't get in the way
 unset GREP_OPTIONS
 

jenkins/scripts/release-tools/release.sh

@@ -22,7 +22,6 @@ set -ex
 
 TOOLSDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 source $TOOLSDIR/functions
-source $TOOLSDIR/../common.sh
 
 function usage {
     echo "Usage: release.sh [-a] repository series version diff_start SHA include_pypi first-full-release extra-metadata"

jenkins/scripts/release-tools/update_constraints.sh

@@ -21,7 +21,6 @@ set -x
 
 TOOLSDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 source $TOOLSDIR/functions
-source $TOOLSDIR/../common.sh
 
 function usage {
     echo "Usage: update_constraints.sh version"

playbooks/release/tag.yaml

@@ -2,6 +2,8 @@
   tasks:
     - name: Run release scripts
       shell: |
+        set -x
+
         RELEASES_DIR=$HOME/src/{{ zuul.project.canonical_name }}
         # Tell the launchpad script run from release.sh where its
         # credentials file is.