summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Dockerfile50
-rw-r--r--docker/Dockerfile (renamed from tests/ci/docker/yardstick-ci/Dockerfile)6
-rw-r--r--docker/Makefile (renamed from tests/ci/docker/Makefile)0
-rwxr-xr-xdocker/exec_tests.sh (renamed from tests/ci/docker/yardstick-ci/exec_tests.sh)0
4 files changed, 4 insertions, 52 deletions
diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index 59dbef0ba..000000000
--- a/Dockerfile
+++ /dev/null
@@ -1,50 +0,0 @@
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-FROM ubuntu:14.04
-MAINTAINER Hans Feldt <hans.feldt@ericsson.com>
-
-# TODO: Is there some easy way to get the fastest/closest mirror?
-#RUN sed -i 's/archive.ubuntu.com/ftp.acc.umu.se/g' /etc/apt/sources.list
-
-RUN apt-get update && apt-get install -y \
- libffi-dev \
- libssl-dev \
- libxml2-dev \
- libxslt1-dev \
- python \
- python-dev \
- python-setuptools && \
- easy_install -U setuptools
-
-COPY . /tmp/yardstick
-
-RUN cd /tmp/yardstick && \
- python setup.py install && \
- apt-get -y remove \
- binutils \
- cpp \
- gcc \
- libffi-dev \
- libssl-dev \
- python3 \
- python-dev && \
- apt-get -y autoremove && \
- apt-get clean && \
- useradd -u 65500 -m yardstick && \
- cp -a samples /home/yardstick && \
- chown -R yardstick /home/yardstick/samples && \
- chgrp -R yardstick /home/yardstick/samples && \
- rm -rf /tmp/* && \
- rm -rf /var/lib/apt/lists/*
-
-USER yardstick
-CMD bash --login
-ENV HOME /home/yardstick
-WORKDIR /home/yardstick
diff --git a/tests/ci/docker/yardstick-ci/Dockerfile b/docker/Dockerfile
index 5387babff..cf9fca0c7 100644
--- a/tests/ci/docker/yardstick-ci/Dockerfile
+++ b/docker/Dockerfile
@@ -11,6 +11,8 @@ FROM ubuntu:14.04
LABEL image=opnfv/yardstick
+ARG BRANCH=master
+
# GIT repo directory
ENV REPOS_DIR /home/opnfv/repos
@@ -52,8 +54,8 @@ RUN apt-get -y autoremove && \
RUN mkdir -p ${REPOS_DIR}
RUN git config --global http.sslVerify false
-RUN git clone https://gerrit.opnfv.org/gerrit/yardstick ${YARDSTICK_REPO_DIR}
-RUN git clone https://gerrit.opnfv.org/gerrit/releng ${RELENG_REPO_DIR}
+RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/yardstick ${YARDSTICK_REPO_DIR}
+RUN git clone --depth 1 https://gerrit.opnfv.org/gerrit/releng ${RELENG_REPO_DIR}
# install yardstick + dependencies
RUN cd ${YARDSTICK_REPO_DIR} && easy_install -U pip
diff --git a/tests/ci/docker/Makefile b/docker/Makefile
index 036d67db3..036d67db3 100644
--- a/tests/ci/docker/Makefile
+++ b/docker/Makefile
diff --git a/tests/ci/docker/yardstick-ci/exec_tests.sh b/docker/exec_tests.sh
index 9aee240da..9aee240da 100755
--- a/tests/ci/docker/yardstick-ci/exec_tests.sh
+++ b/docker/exec_tests.sh