From 3ab1225b7c623341f5b99b418155e6bd2014041f Mon Sep 17 00:00:00 2001
From: Jess Frazelle <acidburn@microsoft.com>
Date: Wed, 25 Oct 2017 13:19:15 -0400
Subject: [PATCH] install more in dockerfile for lkp-tests

Signed-off-by: Jess Frazelle <acidburn@microsoft.com>
---
 lkp-tests/Dockerfile           | 33 ++++++++++++++++++++++++++++++---
 lkp-tests/{run.sh => runbench} |  4 +++-
 2 files changed, 33 insertions(+), 4 deletions(-)
 rename lkp-tests/{run.sh => runbench} (78%)

diff --git a/lkp-tests/Dockerfile b/lkp-tests/Dockerfile
index c214e85..0c62ff6 100644
--- a/lkp-tests/Dockerfile
+++ b/lkp-tests/Dockerfile
@@ -1,15 +1,42 @@
 FROM debian:sid
 LABEL maintainer "Jessie Frazelle <jess@linux.com>"
 
-RUN apt-get update && apt-get install -y \
+RUN dpkg --add-architecture i386 \
+	&& apt-get update && apt-get install -y \
+	automake \
+	bc \
+	bsdtar \
+	build-essential \
+	bzip2 \
 	ca-certificates \
+	cpio \
+	fakeroot \
+	gawk \
 	gcc \
 	git \
+	gzip \
+	kmod \
+	libc6-dev \
+	libc6-dev:i386 \
+	libklibc-dev \
+	libtool \
+	linux-libc-dev \
+	linux-libc-dev:i386 \
+	linux-perf \
 	make \
+	openssl \
+	patch \
+	perl \
+	rsync \
+	ruby \
+	ruby-dev \
+	sysstat \
+	time \
+	wget \
 	--no-install-recommends \
 	&& rm -rf /var/lib/apt/lists/*
 
-RUN	git clone --depth 1 https://github.com/01org/lkp-tests.git /usr/src/lkp-tests
+RUN	git clone --depth 1 https://github.com/fengguang/lkp-tests.git /usr/src/lkp-tests
 
 WORKDIR /usr/src/lkp-tests
 
@@ -20,6 +47,6 @@ RUN make install \
 RUN groupadd --gid 1090 lkp
 RUN useradd --uid 1090 --gid 1090 lkp
 
-COPY run.sh /usr/local/bin/run-bench
+COPY runbench /usr/local/bin/runbench
 
 CMD [ "lkp" ]
diff --git a/lkp-tests/run.sh b/lkp-tests/runbench
similarity index 78%
rename from lkp-tests/run.sh
rename to lkp-tests/runbench
index e118936..8e8ddcf 100755
--- a/lkp-tests/run.sh
+++ b/lkp-tests/runbench
@@ -7,6 +7,8 @@ JOB_FILE="./jobs/${ARG}.yaml"
 
 if [[ ! -f "$JOB_FILE" ]]; then
 	echo "$JOB_FILE does not exist, please select a job that is in the jobs directory." 1>&2;
+	echo "For example:" 1>&2;
+	echo "     runbench hackbench-100" 1>&2;
 	exit 1
 fi
 
@@ -14,7 +16,7 @@ echo "Installing dependencies for ${ARG}..."
 lkp install "$JOB_FILE"
 
 echo "Running ${ARG}..."
-lkp run "$JOB_FILE"
+lkp run "$JOB_FILE" || true
 
 echo "Getting result from ${ARG}..."
 lkp stat