From f0edf98fb3aeec720c18636a600f91f5031e9f88 Mon Sep 17 00:00:00 2001 From: Ross Brattain Date: Wed, 28 Feb 2018 07:38:05 -0800 Subject: remove releng from Dockerfile and elsewhere Current CI does openrc fetching before starting the Docker container and then passes openrc via Docker mount JIRA: YARDSTICK-691 Change-Id: Id0649130f48db5a5586149b237c5252b953e57be Signed-off-by: Ross Brattain --- ansible/roles/create_dockerfile/templates/ubuntu/Dockerfile | 2 -- 1 file changed, 2 deletions(-) (limited to 'ansible/roles/create_dockerfile/templates/ubuntu/Dockerfile') diff --git a/ansible/roles/create_dockerfile/templates/ubuntu/Dockerfile b/ansible/roles/create_dockerfile/templates/ubuntu/Dockerfile index 7fbc4f01a..6eba3a841 100644 --- a/ansible/roles/create_dockerfile/templates/ubuntu/Dockerfile +++ b/ansible/roles/create_dockerfile/templates/ubuntu/Dockerfile @@ -18,7 +18,6 @@ ENV REPOS_DIR /home/opnfv/repos # Yardstick repo ENV YARDSTICK_REPO_DIR ${REPOS_DIR}/yardstick -ENV RELENG_REPO_DIR ${REPOS_DIR}/releng RUN sed -i -e 's/^deb /deb [arch=amd64] /g;s/^deb-src /# deb-src /g' /etc/apt/sources.list && \ echo "\n\ deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ trusty main universe multiverse restricted \n\ @@ -63,7 +62,6 @@ RUN apt-get update && apt-get install -y \ RUN mkdir -p ${REPOS_DIR} && \ git config --global http.sslVerify false && \ git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/yardstick ${YARDSTICK_REPO_DIR} && \ - git clone --depth 1 https://gerrit.opnfv.org/gerrit/releng ${RELENG_REPO_DIR} # install yardstick + dependencies # explicity pin pip version to avoid future issues like the ill-fated pip 8.0.0 release -- cgit 1.2.3-korg