commit c762df42cb42f1ada41a1a2be0e3b4b69230be3c
author A R Karthick <kramanar@ciena.com> Wed May 25 10:09:21 2016 -0700
committer A R Karthick <kramanar@ciena.com> Thu May 26 10:20:36 2016 -0700
tree 22f6f1f670191d572065dbc6b3e55808ff81c12c
parent e7fc8d969d33d162a5e8e2a9ef4f662431a99d78

Bug: Combine the apt-get update and apt-get install lines for docker builds.
Also combine the pip install lines.
This allows docker build system to invalidate the update cache when we install another package line later.

Change-Id: I8661e786878547bfbaf14fb69a9fbca171ff989b

src/test/setup/cord-test.py

diff --git a/src/test/setup/cord-test.py b/src/test/setup/cord-test.py
index 7b63451..d4f1ef3 100755
--- a/src/test/setup/cord-test.py
+++ b/src/test/setup/cord-test.py
@@ -149,14 +149,14 @@
         dockerfile = '''
 FROM ubuntu:14.04
 MAINTAINER chetan@ciena.com
-RUN apt-get update  --fix-missing
-RUN apt-get install -y git git-core autoconf automake autotools-dev pkg-config \
-                        make gcc g++ libtool libc6-dev cmake libpcap-dev libxerces-c2-dev  \
-                        unzip libpcre3-dev flex bison libboost-dev
-RUN apt-get -y install python python-pip python-setuptools python-scapy tcpdump doxygen doxypy wget
+RUN apt-get update  && \
+    apt-get install -y git git-core autoconf automake autotools-dev pkg-config \
+        make gcc g++ libtool libc6-dev cmake libpcap-dev libxerces-c2-dev  \
+        unzip libpcre3-dev flex bison libboost-dev \
+        python python-pip python-setuptools python-scapy tcpdump doxygen doxypy wget \
+        openvswitch-common openvswitch-switch \
+        python-twisted python-sqlite sqlite3 python-pexpect telnet arping
 RUN easy_install nose
-RUN apt-get -y install openvswitch-common openvswitch-switch
-RUN apt-get -y install python-twisted python-sqlite sqlite3 python-pexpect telnet
 RUN mkdir -p /root/ovs
 WORKDIR /root
 RUN wget http://openvswitch.org/releases/openvswitch-{}.tar.gz -O /root/ovs/openvswitch-{}.tar.gz && \
@@ -164,16 +164,7 @@
  cd openvswitch-{} && \
  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-ssl && make && make install)
 RUN service openvswitch-switch restart || /bin/true
-RUN pip install scapy-ssl_tls
-RUN pip install -U scapy
-RUN pip install monotonic
-RUN pip install configObj
-RUN pip install -U docker-py
-RUN pip install -U pyyaml
-RUN pip install -U nsenter
-RUN pip install -U pyroute2
-RUN pip install -U netaddr
-RUN apt-get -y install arping
+RUN pip install -U scapy scapy-ssl_tls monotonic configObj docker-py pyyaml nsenter pyroute2 netaddr
 RUN mv /usr/sbin/tcpdump /sbin/
 RUN ln -sf /sbin/tcpdump /usr/sbin/tcpdump
 WORKDIR /root

src/test/utils/CordContainer.py

diff --git a/src/test/utils/CordContainer.py b/src/test/utils/CordContainer.py
index 8ad4c2e..cc700ae 100644
--- a/src/test/utils/CordContainer.py
+++ b/src/test/utils/CordContainer.py
@@ -277,8 +277,8 @@
 MAINTAINER chetan@ciena.com
 LABEL RUN docker pull hbouvier/docker-radius
 LABEL RUN docker run -it --name cord-radius hbouvier/docker-radius
-RUN apt-get update
-RUN apt-get -y install python python-pexpect strace
+RUN apt-get update && \
+    apt-get -y install python python-pexpect strace
 WORKDIR /root
 CMD ["/etc/freeradius/start-radius.py"]
 '''