From: Jamo Luhrsen <jluhrsen@redhat.com>
Date: Thu, 17 May 2018 23:47:04 +0000 (-0700)
Subject: Update broken CPERF Dockerfile
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F61%2F57561%2F1;p=cperf.git

Update broken CPERF Dockerfile

seems newer CentOS versions (e.g. 7.5) need to have their
distro "centos" available in a yum vars file when trying
to work with SIG repositories

also updated the openstack repo to queens release from
the older ocata

finally, updated the repo location for openflow and oflops.
the stanford repo no longer works, but the github repos
claim to be mirrors of it.

Change-Id: I7084c38c680e1875558af17a3ef3c2344ee9cefc
Signed-off-by: Jamo Luhrsen <jluhrsen@redhat.com>
---

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 0f57aa7..22a42c3 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -27,7 +27,10 @@ ENV HOME /home/opnfv
 ENV REPOS_DIR /home/opnfv/repos
 RUN mkdir -p ${REPOS_DIR}
 
-RUN yum install -y epel-release centos-release-openstack-ocata && yum update -y
+# need to put distro in a yum vars file. learned that here:
+# https://review.openstack.org/#/c/568180/2//COMMIT_MSG
+RUN echo "centos" > /etc/yum/vars/contentdir
+RUN yum install -y epel-release centos-release-openstack-queens && yum update -y
 
 RUN yum install -y \
     automake \
@@ -71,6 +74,6 @@ RUN git clone https://git.opendaylight.org/gerrit/p/integration/test ${ODL_TEST_
 # Clone and build CBench
 ENV OF_DIR ${REPOS_DIR}/openflow
 ENV OFLOPS_DIR ${REPOS_DIR}/oflops
-RUN git clone git://gitosis.stanford.edu/openflow.git ${OF_DIR}
-RUN git clone https://github.com/andi-bigswitch/oflops.git ${OFLOPS_DIR}
+RUN git clone https://github.com/mininet/openflow.git ${OF_DIR}
+RUN git clone https://github.com/mininet/oflops.git ${OFLOPS_DIR}
 RUN cd ${OFLOPS_DIR} && ./boot.sh && ./configure --with-openflow-src-dir=${OF_DIR} && make && make install