Cleanup tox warnings

Issue: RELENG-2365
Change-Id: I5a739a4446bfeabf73d020e6f72a8440b9d1c913
Signed-off-by: Tim Johnson <tijohnson@linuxfoundation.org>

diff --git a/.coafile b/.coafile
index c0e13b0..86889a5 100644 (file)
--- a/.coafile
+++ b/.coafile
@@ -36,7 +36,8 @@ ignore = .git/**,
     docs/jjb/lf-ci-jobs.rst,
     docs/jjb/lf-docker-jobs.rst,
     docs/jjb/lf-macros.rst,
-    docs/jjb/lf-maven-jobs.rst
+    docs/jjb/lf-maven-jobs.rst,
+    docs/jjb/lf-python-jobs.rst
 
 [all.ShellCheck]
 bears = ShellCheckBear,SpaceConsistencyBear

diff --git a/releasenotes/notes/tox-warnings.yaml b/releasenotes/notes/tox-warnings.yaml
new file mode 100644 (file)
index 0000000..76cfdd1
--- /dev/null
+++ b/releasenotes/notes/tox-warnings.yaml
@@ -0,0 +1,4 @@
+---
+fixes:
+  - |
+    Fix warnings from tox (shellcheck).

diff --git a/shell/release-job.sh b/shell/release-job.sh
index 612fa7e..2ac368f 100644 (file)
--- a/shell/release-job.sh
+++ b/shell/release-job.sh
@@ -92,10 +92,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 +187,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#\"}"