Merge "Fix rtd verify job choosing strategy"

[releng/global-jjb.git] / shell / release-job.sh

diff --git a/shell/release-job.sh b/shell/release-job.sh
index 612fa7e..c27a87f 100644 (file)
--- a/shell/release-job.sh
+++ b/shell/release-job.sh
@@ -19,8 +19,16 @@ if [ -d "/opt/pyenv" ]; then
 fi
 PYTHONPATH=$(pwd)
 export PYTHONPATH
-pyenv local 3.6.4
-export PYENV_VERSION="3.6.4"
+
+latest_version=$(pyenv versions \
+  | sed s,*,,g \
+  | awk '/[0-9]+/{ print $1 }' \
+  | sort --version-sort \
+  | awk '/./{line=$0} END{print line}')
+
+pyenv local "$latest_version"
+
+export PYENV_VERSION="$latest_version"
 pip install --user lftools[nexus] jsonschema niet yq
 
 #Functions.
@@ -92,10 +100,10 @@ set_variables_container(){
     if [[ $VERSION == "None" ]]; then
         VERSION="$(niet ".container_release_tag" "$release_file")"
     fi
-    if $(grep -q "container_pull_registry" "$release_file") ; then
+    if grep -q "container_pull_registry" "$release_file" ; then
         CONTAINER_PULL_REGISTRY="$(niet ".container_pull_registry" "$release_file")"
     fi
-    if $(grep -q "container_push_registry" "$release_file") ; then
+    if grep -q "container_push_registry" "$release_file" ; then
         CONTAINER_PUSH_REGISTRY="$(niet ".container_push_registry" "$release_file")"
     fi
     # Make sure both pull and push registries are defined
@@ -187,7 +195,7 @@ container_release_file(){
     lfn_umbrella="$(echo "$GERRIT_HOST" | awk -F"." '{print $2}')"
 
     for namequoted in $(cat $release_file | yq '.containers[].name'); do
-        versionquoted=$(cat $release_file | yq ".containers[] |select(.name=="$namequoted") |.version")
+        versionquoted=$(cat $release_file | yq ".containers[] |select(.name==$namequoted) |.version")
 
         #Remove extra yaml quotes
         name="${namequoted#\"}"