summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Brattain <ross.b.brattain@intel.com>2018-05-24 07:17:32 -0700
committerRoss Brattain <ross.b.brattain@intel.com>2018-05-24 07:23:17 -0700
commit2568d72211986a7b61decb0dd6db6233c3dc153d (patch)
tree9a3a68b52a1624e278eabe4b8f3562a272677df1
parent256fc55e7fabfc70a445d2be8fd879fbfe218eb2 (diff)
Dockerfile: add ping for prepare_env.sh
INFO: Creating openstack credentials .. Verifying connectivity to 10.20.0.2... /home/opnfv/repos/yardstick//tests/ci/prepare_env.sh: line 56: ping: command not found /home/opnfv/repos/yardstick//tests/ci/prepare_env.sh: line 56: ping: command not found https://build.opnfv.org/ci/view/yardstick/job/yardstick-fuel-baremetal-daily-master/2400/console JIRA: YARDSTICK-1201 Change-Id: Ib9e139046724ece4be7a85cc1ae74cbb0ec8e203 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
-rw-r--r--docker/Dockerfile2
-rw-r--r--docker/Dockerfile.aarch64.patch4
2 files changed, 3 insertions, 3 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index b97337e4d..709db317e 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -23,7 +23,7 @@ ENV REPOS_DIR="/home/opnfv/repos" \
ENV YARDSTICK_REPO_DIR="${REPOS_DIR}/yardstick" \
STORPERF_REPO_DIR="${REPOS_DIR}/storperf"
-RUN apt-get update && apt-get install -y git python-setuptools python-pip && apt-get -y autoremove && apt-get clean
+RUN apt-get update && apt-get install -y git python-setuptools python-pip iputils-ping && apt-get -y autoremove && apt-get clean
RUN easy_install -U setuptools==30.0.0
RUN pip install appdirs==1.4.0 pyopenssl==17.5.0 python-openstackclient==3.11.0 python-heatclient==1.11.0
diff --git a/docker/Dockerfile.aarch64.patch b/docker/Dockerfile.aarch64.patch
index e8dbea288..7bc89f6fe 100644
--- a/docker/Dockerfile.aarch64.patch
+++ b/docker/Dockerfile.aarch64.patch
@@ -35,8 +35,8 @@ index 2ee5b4c..23e5ea5 100644
RELENG_REPO_DIR="${REPOS_DIR}/releng" \
STORPERF_REPO_DIR="${REPOS_DIR}/storperf"
--RUN apt-get update && apt-get install -y git python-setuptools python-pip && apt-get -y autoremove && apt-get clean
-+RUN apt-get update && apt-get install -y git python-setuptools python-pip && apt-get -y autoremove && \
+-RUN apt-get update && apt-get install -y git python-setuptools python-pip iputils-ping && apt-get -y autoremove && apt-get clean
++RUN apt-get update && apt-get install -y git python-setuptools python-pip iputils-ping && apt-get -y autoremove && \
+ apt-get install -y libssl-dev && apt-get -y install libffi-dev && apt-get clean
RUN easy_install -U setuptools==30.0.0
RUN pip install appdirs==1.4.0 pyopenssl==17.5.0 python-openstackclient==3.11.0 python-heatclient==1.11.0