aboutsummaryrefslogtreecommitdiffstats
path: root/packer
diff options
context:
space:
mode:
authorCorentin LABBE <clabbe@baylibre.com>2020-06-22 18:01:12 +0200
committerCorentin LABBE <clabbe@baylibre.com>2020-06-22 18:01:12 +0200
commit84f60a52060994bdf225640e1a75ee46bffa828a (patch)
treefcdf2ec4087d982d696c26d3e10cbfca901796bf /packer
parentcb100a57fd5796d7ba6f2d0b0a7c7254fa0a3c35 (diff)
SPEC-3408: Use pip3 for jinja2
The debian package is too old and releng-scripts need jinja2>2.9, so lets use pip3 for installing it Change-Id: I4a392acb74e4804c230ac54035ec39f2cecda793 Bug-AGL: SPEC-3408 Signed-off-by: Corentin LABBE <clabbe@baylibre.com>
Diffstat (limited to 'packer')
-rw-r--r--packer/provision/agl_dependencies.sh5
-rw-r--r--packer/provision/agl_hwtest_dependencies.sh5
2 files changed, 8 insertions, 2 deletions
diff --git a/packer/provision/agl_dependencies.sh b/packer/provision/agl_dependencies.sh
index f71e701b..f5aa8a8c 100644
--- a/packer/provision/agl_dependencies.sh
+++ b/packer/provision/agl_dependencies.sh
@@ -28,7 +28,7 @@ DEBIAN_FRONTEND=noninteractive apt-get update && \
tree rsync python-yaml python-requests curl tar docker.io pandoc python3 \
ruby-all-dev ruby-ffi ruby-ffi-* jekyll ruby-redcarpet mkdocs \
python-pip python-simplejson g++-multilib make zip unzip iperf3 \
- debian-keyring debian-archive-keyring python3-yaml python3-jinja2
+ debian-keyring debian-archive-keyring python3-yaml pyhton3-pip
DEBIAN_FRONTEND=noninteractive apt-get install -y -t jessie-backports lava-tool=0.19-1~bpo8+1
@@ -122,10 +122,13 @@ sudo pip install mdlint
# releng-scripts needs latest (stable v2.9) jinja2
sudo pip install --force-reinstall --ignore-installed jinja2
sudo pip install --upgrade jinja2
+sudo pip3 install --force-reinstall --ignore-installed jinja2
+sudo pip3 install --upgrade jinja2
python -c "import sys; print sys.path"
sudo pip show jinja2
+sudo pip3 show jinja2
# install go for xds build
diff --git a/packer/provision/agl_hwtest_dependencies.sh b/packer/provision/agl_hwtest_dependencies.sh
index d38c852c..e031e90c 100644
--- a/packer/provision/agl_hwtest_dependencies.sh
+++ b/packer/provision/agl_hwtest_dependencies.sh
@@ -25,7 +25,7 @@ DEBIAN_FRONTEND=noninteractive apt-get update && \
apt-get -y install wget
python-pip zip unzip iperf3 \
debian-keyring debian-archive-keyring \
- python3-jinja2 python3-yaml
+ python3-pip python3-yaml
DEBIAN_FRONTEND=noninteractive apt-get install -y -t jessie-backports lava-tool=0.19-1~bpo8+1
@@ -68,10 +68,13 @@ EOFSYSCTL
# releng-scripts needs latest (stable v2.9) jinja2
sudo pip install --force-reinstall --ignore-installed jinja2
sudo pip install --upgrade jinja2
+sudo pip3 install --force-reinstall --ignore-installed jinja2
+sudo pip3 install --upgrade jinja2
python -c "import sys; print sys.path"
sudo pip show jinja2
+sudo pip3 show jinja2
# install go for xds build