Fix the recent issue with python3

Signed-off-by: Venkatrangan Govindarajan <gvrangan@gmail.com>
Change-Id: I7f6169b98dcb0d8e215e41dff6590beff12d3e3c

diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml
index 3a3d55bbbe39cc441c9cd3324efb16d59f68559b..cdfe01cdc6339c754c83bf5b169326274c9c9308 100644 (file)
--- a/jjb/autorelease/autorelease-macros.yaml
+++ b/jjb/autorelease/autorelease-macros.yaml
@@ -45,7 +45,7 @@
       - shell: |
           #!/bin/bash -l
           set -xe -o pipefail
-          virtualenv -p python3 --system-site-packages $WORKSPACE/venv
+          python3 -m venv $WORKSPACE/venv
           source $WORKSPACE/venv/bin/activate
           PYTHON="$WORKSPACE/venv/bin/python"
           $PYTHON -m pip install --upgrade networkx

diff --git a/jjb/integration/integration-install-robotframework.sh b/jjb/integration/integration-install-robotframework.sh
index e91454dcb03a361859b4d8e418e13ef7b2522a13..2a961fdb146fcbbf22a3a65875f3c795c54ef5ab 100644 (file)
--- a/jjb/integration/integration-install-robotframework.sh
+++ b/jjb/integration/integration-install-robotframework.sh
@@ -16,7 +16,7 @@ echo ROBOT_VENV="${ROBOT_VENV}" >> "${WORKSPACE}/env.properties"
 # The --system-site-packages parameter allows us to pick up system level
 # installed packages. This allows us to bake matplotlib which takes very long
 # to install into the image.
-virtualenv -p python3 --system-site-packages "${ROBOT_VENV}"
+python3 -m venv "${ROBOT_VENV}"
 # shellcheck disable=SC1090
 source "${ROBOT_VENV}/bin/activate"
 
@@ -28,7 +28,6 @@ python -m pip install --upgrade pip
 echo "Installing Python Requirements"
 cat << 'EOF' > "requirements.txt"
 docker-py
-importlib
 ipaddr
 netaddr
 netifaces