Merge "Accept maven configuration in Python tox sonar"

diff --git a/shell/check-info-votes.sh b/shell/check-info-votes.sh
index 32384be..fb489af 100644 (file)
--- a/shell/check-info-votes.sh
+++ b/shell/check-info-votes.sh
@@ -36,10 +36,10 @@ if [ -d "/opt/pyenv" ]; then
     export PYENV_VERSION="3.6.4"
 fi
 
-$pip install --user niet
-$pip install --user lftools
-$pip install --user lftools[nexus]
-$pip install --user jsonschema
+$pip install niet
+$pip install lftools
+$pip install lftools[nexus]
+$pip install jsonschema
 
 echo "Checking votes:"
 lftools infofile check-votes INFO.yaml "$GERRIT_URL" "$ref" > gerrit_comment.txt

diff --git a/shell/job-cost.sh b/shell/job-cost.sh
index 6493a6e..5bd61be 100644 (file)
--- a/shell/job-cost.sh
+++ b/shell/job-cost.sh
@@ -47,10 +47,10 @@ instance_type=$(curl -s http://169.254.169.254/latest/meta-data/instance-type)
 
 echo "INFO: Retrieving Pricing Info for: $instance_type"
 url="https://pricing.vexxhost.net/v1/pricing/$instance_type/cost?seconds=$uptime"
-jason_block=$(curl -s "$url")
+json_block=$(curl -s "$url")
 
-cost=$(jq .cost <<< "$jason_block")
-resource=$(jq .resource <<< "$jason_block" | tr -d '"')
+cost=$(jq .cost <<< "$json_block")
+resource=$(jq .resource <<< "$json_block" | tr -d '"')
 
 # Archive the cost date
 mkdir -p "$WORKSPACE/archives/cost"

diff --git a/shell/python-tools-install.sh b/shell/python-tools-install.sh
index e27d64e..7988c31 100644 (file)
--- a/shell/python-tools-install.sh
+++ b/shell/python-tools-install.sh
@@ -35,9 +35,9 @@ EOF
 
     # Use `python -m pip` to ensure we are using pip from user venv
     python3 -m venv ~/.local
-    python3 -m pip install --user --quiet --upgrade pip
-    python3 -m pip install --user --quiet --no-warn-script-location --upgrade setuptools
-    python3 -m pip install --user --quiet --no-warn-script-location --upgrade --upgrade-strategy eager -r "$requirements_file"
+    python3 -m pip install --quiet --upgrade pip
+    python3 -m pip install --quiet --no-warn-script-location --upgrade setuptools
+    python3 -m pip install --quiet --no-warn-script-location --upgrade --upgrade-strategy eager -r "$requirements_file"
     rm -rf "$requirements_file"
     touch /tmp/pre-build-complete
 fi

diff --git a/shell/rtd-verify.sh b/shell/rtd-verify.sh
index 86254a1..ea3aca7 100644 (file)
--- a/shell/rtd-verify.sh
+++ b/shell/rtd-verify.sh
@@ -32,7 +32,7 @@ git submodule update
 
 if [[ $JOB_NAME == "lf-infra-lftools-rtd-verify-any" ]]; then
     # Install patchset lftools
-    python3 -m pip install --user -e .
+    python3 -m pip install -e .
 fi
 
 echo "---> Generating docs"

diff --git a/shell/tox-install.sh b/shell/tox-install.sh
index f8472cc..d88c508 100644 (file)
--- a/shell/tox-install.sh
+++ b/shell/tox-install.sh
@@ -18,9 +18,9 @@ set -eux -o pipefail
 
 
 if [[ $PYTHON == "python2" ]]; then
-    $PYTHON -m pip install --user --quiet --upgrade tox tox-pyenv virtualenv more-itertools~=5.0.0
+    $PYTHON -m pip install --quiet --upgrade tox tox-pyenv virtualenv more-itertools~=5.0.0
 else
-    $PYTHON -m pip install --user --quiet --upgrade tox tox-pyenv virtualenv
+    $PYTHON -m pip install --quiet --upgrade tox tox-pyenv virtualenv
 fi