diff options
| -rw-r--r-- | INFO | 4 | ||||
| -rw-r--r-- | docker/Dockerfile | 11 |
2 files changed, 9 insertions, 6 deletions
@@ -2,8 +2,8 @@ Project Name: Controller Performance Testing (cperf) Project Creation Date: September 1, 2015 Project Category: Integration & Testing Lifecycle State: Incubation -Primary Contact: Matt Welch -Project Lead: Matt Welch +Primary Contact: Sai Malleni +Project Lead: Sai Malleni Jira Project Name: Controller Performance Testing Jira Project Prefix: cperf Mailing list tag: cperf diff --git a/docker/Dockerfile b/docker/Dockerfile index 0f57aa7..fe62dba 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 \ @@ -54,7 +57,7 @@ RUN pip install \ netifaces \ netaddr \ requests \ - robotframework{,-{httplibrary,requests,sshlibrary,selenium2library}} \ + robotframework{,-{httplibrary,requests,sshlibrary==3.1.1,selenium2library}} \ scapy \ setuptools @@ -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 |