From: Jessica Wagantall <jwagantall@linuxfoundation.org>
Date: Wed, 15 Apr 2020 23:10:24 +0000 (-0700)
Subject: Use yq instead of niet
X-Git-Tag: v0.53.0~2
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F79%2F63679%2F2;p=releng%2Fglobal-jjb.git

Use yq instead of niet

Standardize yaml parsing tools used across global-jjb.
Switch from using niet package to yq for parsing yaml files
in release-job.sh.

Issue: RELENG-2844
Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
Change-Id: Ia57884a7a8efffa85417becd8c914ab8d23721a9
---

diff --git a/releasenotes/notes/deprecate-niet-release-jobs-64454a3317b7936f.yaml b/releasenotes/notes/deprecate-niet-release-jobs-64454a3317b7936f.yaml
new file mode 100644
index 00000000..1c0fa182
--- /dev/null
+++ b/releasenotes/notes/deprecate-niet-release-jobs-64454a3317b7936f.yaml
@@ -0,0 +1,6 @@
+---
+fixess:
+  - |
+    Standardize yaml parsing tools used across global-jjb.
+    Switch from using niet package to yq for parsing yaml files
+    in release-job.sh.
diff --git a/shell/release-job.sh b/shell/release-job.sh
index 6a5c43c9..3a0294e5 100644
--- a/shell/release-job.sh
+++ b/shell/release-job.sh
@@ -14,7 +14,7 @@ set -eu -o pipefail
 echo "INFO: creating virtual environment"
 virtualenv -p python3 /tmp/venv
 PATH=/tmp/venv/bin:$PATH
-pipup="python -m pip install -q --upgrade pip idna==2.8 lftools jsonschema niet twine yq"
+pipup="python -m pip install -q --upgrade pip idna==2.8 lftools jsonschema twine yq"
 echo "INFO: $pipup"
 $pipup
 # show installed versions
@@ -53,7 +53,7 @@ set_variables_common(){
     # Packagecloud and PyPI jobs set the appropriate value.
     DISTRIBUTION_TYPE="${DISTRIBUTION_TYPE:-None}"
     if [[ $DISTRIBUTION_TYPE == "None" ]]; then
-        if ! DISTRIBUTION_TYPE=$(niet ".distribution_type" "$release_file"); then
+        if ! DISTRIBUTION_TYPE=$(yq -r ".distribution_type" "$release_file"); then
             echo "ERROR: Failed to get distribution_type from $release_file"
             exit 1
         fi
@@ -86,17 +86,17 @@ set_variables_common(){
 set_variables_maven(){
     echo "INFO: Setting maven variables"
     if [[ -z ${VERSION:-} ]]; then
-        VERSION=$(niet ".version" "$release_file")
+        VERSION=$(yq -r ".version" "$release_file")
     fi
     if [[ -z ${GIT_TAG:-} ]]; then
         if grep -q "git_tag" "$release_file" ; then
-            GIT_TAG=$(niet ".git_tag" "$release_file")
+            GIT_TAG=$(yq -r ".git_tag" "$release_file")
         else
             GIT_TAG="$VERSION"
         fi
     fi
     if [[ -z ${LOG_DIR:-} ]]; then
-        LOG_DIR=$(niet ".log_dir" "$release_file")
+        LOG_DIR=$(yq -r ".log_dir" "$release_file")
     fi
     LOGS_URL="${LOGS_SERVER}/${NEXUS_PATH}${LOG_DIR}"
     LOGS_URL=${LOGS_URL%/}  # strip any trailing '/'
@@ -112,27 +112,27 @@ set_variables_maven(){
 set_variables_container(){
     echo "INFO: Setting container variables"
     if [[ -z ${VERSION:-} ]]; then
-        VERSION=$(niet ".container_release_tag" "$release_file")
+        VERSION=$(yq -r ".container_release_tag" "$release_file")
     fi
     if [[ -z ${GIT_TAG:-} ]]; then
         if grep -q "git_tag" "$release_file" ; then
-            GIT_TAG=$(niet ".git_tag" "$release_file")
+            GIT_TAG=$(yq -r ".git_tag" "$release_file")
         else
             GIT_TAG="$VERSION"
         fi
    fi
     if grep -q "container_pull_registry" "$release_file" ; then
-        CONTAINER_PULL_REGISTRY=$(niet ".container_pull_registry" "$release_file")
+        CONTAINER_PULL_REGISTRY=$(yq -r ".container_pull_registry" "$release_file")
     fi
     if grep -q "container_push_registry" "$release_file" ; then
-        CONTAINER_PUSH_REGISTRY=$(niet ".container_push_registry" "$release_file")
+        CONTAINER_PUSH_REGISTRY=$(yq -r ".container_push_registry" "$release_file")
     fi
     # Make sure both pull and push registries are defined
     if [ -z ${CONTAINER_PULL_REGISTRY+x} ] || [ -z ${CONTAINER_PUSH_REGISTRY+x} ]; then
         echo "ERROR: CONTAINER_PULL_REGISTRY and CONTAINER_PUSH_REGISTRY need to be defined"
         exit 1
     fi
-    ref=$(niet ".ref" "$release_file")
+    ref=$(yq -r ".ref" "$release_file")
 
     # Continuing displaying Release Information (Container)
     printf "\t%-30s\n" RELEASE_CONTAINER_INFO:
@@ -146,22 +146,22 @@ set_variables_container(){
 set_variables_pypi(){
     echo "INFO: Setting pypi variables"
     if [[ -z ${LOG_DIR:-} ]]; then
-        LOG_DIR=$(niet ".log_dir" "$release_file")
+        LOG_DIR=$(yq -r ".log_dir" "$release_file")
     fi
     LOGS_URL="${LOGS_SERVER}/${NEXUS_PATH}${LOG_DIR}"
     LOGS_URL=${LOGS_URL%/}  # strip any trailing '/'
     if [[ -z ${PYPI_PROJECT:-} ]]; then
-        PYPI_PROJECT=$(niet ".pypi_project" "$release_file")
+        PYPI_PROJECT=$(yq -r ".pypi_project" "$release_file")
     fi
     if [[ -z ${PYTHON_VERSION:-} ]]; then
-        PYTHON_VERSION=$(niet ".python_version" "$release_file")
+        PYTHON_VERSION=$(yq -r ".python_version" "$release_file")
     fi
     if [[ -z ${VERSION:-} ]]; then
-        VERSION=$(niet ".version" "$release_file")
+        VERSION=$(yq -r ".version" "$release_file")
     fi
     if [[ -z ${GIT_TAG:-} ]]; then
         if grep -q "git_tag" "$release_file" ; then
-            GIT_TAG=$(niet ".git_tag" "$release_file")
+            GIT_TAG=$(yq -r ".git_tag" "$release_file")
         else
             GIT_TAG="$VERSION"
         fi
@@ -181,23 +181,23 @@ set_variables_pypi(){
 set_variables_packagecloud(){
      echo "INFO: Setting packagecloud variables"
      if [[ -z ${VERSION:-} ]]; then
-         VERSION=$(niet ".version" "$release_file")
+         VERSION=$(yq -r ".version" "$release_file")
      fi
      if [[ -z ${GIT_TAG:-} ]]; then
          if grep -q "git_tag" $release_file ; then
-             GIT_TAG=$(niet ".git_tag" "$release_file")
+             GIT_TAG=$(yq -r ".git_tag" "$release_file")
          else
              GIT_TAG="$VERSION"
          fi
      fi
      if [[ -z ${LOG_DIR:-} ]]; then
-         LOG_DIR=$(niet ".log_dir" "$release_file")
+         LOG_DIR=$(yq -r ".log_dir" "$release_file")
      fi
      if [[ -z ${REF:-} ]]; then
-         REF=$(niet ".ref" "$release_file")
+         REF=$(yq -r ".ref" "$release_file")
      fi
      if [[ -z ${PACKAGE_NAME:-} ]]; then
-         PACKAGE_NAME=$(niet ".package_name" "$release_file")
+         PACKAGE_NAME=$(yq -r ".package_name" "$release_file")
      fi
      logs_url="${LOGS_SERVER}/${NEXUS_PATH}${LOG_DIR}"
      logs_url=${logs_url%/}  # strip any trailing '/'