aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVishal Bhoj <vishal.bhoj@linaro.org>2018-01-12 18:23:35 +0530
committerVishal Bhoj <vishal.bhoj@linaro.org>2018-01-12 12:55:36 +0000
commit5b767ce97420b9815f2a09bb9f0de9e815158c2c (patch)
tree8f16862ea2269caba7aff787692a4f0e7d653c85
parentbe7e656909351fefe262c43c7a463c99b4690b32 (diff)
96boards-hikey-aosp-master.yaml: move pip dependency
Move to next shell to see if it resolves installation Change-Id: I36469ab9cbf8030b9ea24c9ef765c4379c6146c9 Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>
-rw-r--r--96boards-hikey-aosp-master.yaml31
1 files changed, 15 insertions, 16 deletions
diff --git a/96boards-hikey-aosp-master.yaml b/96boards-hikey-aosp-master.yaml
index b223d95901..c24a670b7a 100644
--- a/96boards-hikey-aosp-master.yaml
+++ b/96boards-hikey-aosp-master.yaml
@@ -59,22 +59,6 @@
http://mirrors.kernel.org/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jdk_8u45-b14-1_amd64.deb
sudo dpkg -i --force-all *.deb
- if ! sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 update; then
- echo "INFO: apt update error - try again in a moment"
- sleep 15
- sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 update || true
- fi
- pkg_list="python-pip"
- if ! sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 install -y ${pkg_list}; then
- echo "INFO: apt install error - try again in a moment"
- sleep 15
- sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 install -y ${pkg_list}
- fi
-
- # Install ruamel.yaml
- pip install --user --force-reinstall ruamel.yaml
- pip install --user --force-reinstall Jinja2
-
mkdir -p ${HOME}/bin ${WORKSPACE}/build/out
curl https://storage.googleapis.com/git-repo-downloads/repo > ${HOME}/bin/repo
chmod a+x ${HOME}/bin/*
@@ -160,6 +144,21 @@
- inject:
properties-file: publish_parameters
- shell: |
+ if ! sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 update; then
+ echo "INFO: apt update error - try again in a moment"
+ sleep 15
+ sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 update || true
+ fi
+ pkg_list="python-pip"
+ if ! sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 install -y ${pkg_list}; then
+ echo "INFO: apt install error - try again in a moment"
+ sleep 15
+ sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 install -y ${pkg_list}
+ fi
+
+ # Install ruamel.yaml
+ pip install --user --force-reinstall ruamel.yaml
+ pip install --user --force-reinstall Jinja2
export PUB_DEST=snapshots/hikey/linaro/aosp-master/${BUILD_NUMBER}
export VTS_URL=https://builds.96boards.org/${PUB_DEST}
export DEVICE_TYPE=hi6220-hikey