tcwg-base: Add psmisc package to get killall

... which we use in tcwg-cleanup-stale-container.sh to kill stale
ssh-agent processes.

Change-Id: I2dfb1ccd9301ce284479e72011ceed07cabb277c

11 files changed, 27 insertions, 17 deletions

diff --git a/bionic-amd64-tcwg-base/Dockerfile b/bionic-amd64-tcwg-base/Dockerfile
index b43d9843..ab133638 100644
--- a/bionic-amd64-tcwg-base/Dockerfile
+++ b/bionic-amd64-tcwg-base/Dockerfile
@@ -60,6 +60,7 @@ RUN true \
  pkg-config \
  python-dev \
  postfix \
+ psmisc \
  pxz \
  qemu-system-arm \
  qemu-user \
@@ -119,4 +120,4 @@ VOLUME /tmp
 
 EXPOSE 22
 CMD ["/usr/sbin/sshd", "-D"]
-# checksum: 9bd01b12ec62b50e63c7b94d4f8ccfc7
+# checksum: 4b61b97898b5eb0c598c220cc2d50f6a
diff --git a/bionic-arm64-tcwg-base/Dockerfile b/bionic-arm64-tcwg-base/Dockerfile
index ddde30a7..277c219d 100644
--- a/bionic-arm64-tcwg-base/Dockerfile
+++ b/bionic-arm64-tcwg-base/Dockerfile
@@ -55,6 +55,7 @@ RUN true \
  openssh-server \
  python-dev \
  postfix \
+ psmisc \
  pxz \
  qemu-system-arm \
  qemu-user \
@@ -114,4 +115,4 @@ VOLUME /tmp
 
 EXPOSE 22
 CMD ["/usr/sbin/sshd", "-D"]
-# checksum: bd71d3b1f3503f6d483dbe956e2e4b7f
+# checksum: 70e28af2a1592e6c1a4c267f37866dff
diff --git a/tcwg-base/Dockerfile.in b/tcwg-base/Dockerfile.in
index e80c9370..2ff712f8 100644
--- a/tcwg-base/Dockerfile.in
+++ b/tcwg-base/Dockerfile.in
@@ -100,10 +100,8 @@ RUN true \
  pkg-config \
 #endif
  python-dev \
-#if DISTRO_trusty
- python-virtualenv \
-#endif
  postfix \
+ psmisc \
  pxz \
  qemu-system-arm \
  qemu-user \
@@ -119,6 +117,8 @@ RUN true \
  vim \
 #if !DISTRO_trusty
  virtualenv \
+#else
+ python-virtualenv \
 #endif
  wget \
  xz-utils \
diff --git a/trusty-amd64-tcwg-base/Dockerfile b/trusty-amd64-tcwg-base/Dockerfile
index b9ca4bc8..bdc767b1 100644
--- a/trusty-amd64-tcwg-base/Dockerfile
+++ b/trusty-amd64-tcwg-base/Dockerfile
@@ -67,8 +67,8 @@ RUN (url="http://archive.ubuntu.com/ubuntu/"; \
  openssh-server \
  pkg-config \
  python-dev \
- python-virtualenv \
  postfix \
+ psmisc \
  pxz \
  qemu-system-arm \
  qemu-user \
@@ -82,6 +82,7 @@ RUN (url="http://archive.ubuntu.com/ubuntu/"; \
  time \
  valgrind \
  vim \
+ python-virtualenv \
  wget \
  xz-utils \
  zip \
@@ -133,4 +134,4 @@ VOLUME /tmp
 
 EXPOSE 22
 CMD ["/usr/sbin/sshd", "-D"]
-# checksum: 75b8465234510ee1512eb784e8495764
+# checksum: 814a72154c55af0cb2e75c091393359b
diff --git a/trusty-arm64-tcwg-base/Dockerfile b/trusty-arm64-tcwg-base/Dockerfile
index 68150f8d..271893d6 100644
--- a/trusty-arm64-tcwg-base/Dockerfile
+++ b/trusty-arm64-tcwg-base/Dockerfile
@@ -60,8 +60,8 @@ RUN (url="http://ports.ubuntu.com/ubuntu-ports/"; \
  openjdk-7-jdk \
  openssh-server \
  python-dev \
- python-virtualenv \
  postfix \
+ psmisc \
  pxz \
  qemu-system-arm \
  qemu-user \
@@ -75,6 +75,7 @@ RUN (url="http://ports.ubuntu.com/ubuntu-ports/"; \
  time \
  valgrind \
  vim \
+ python-virtualenv \
  wget \
  xz-utils \
  zip \
@@ -117,4 +118,4 @@ VOLUME /tmp
 
 EXPOSE 22
 CMD ["/usr/sbin/sshd", "-D"]
-# checksum: ea4ba289a97e70fde67e11f9bd6f6463
+# checksum: 6cf5d2ef5d0c45e74eb710cb5660ab3c
diff --git a/trusty-armhf-tcwg-base/Dockerfile b/trusty-armhf-tcwg-base/Dockerfile
index f083deea..f31f7d4c 100644
--- a/trusty-armhf-tcwg-base/Dockerfile
+++ b/trusty-armhf-tcwg-base/Dockerfile
@@ -60,8 +60,8 @@ RUN (url="http://ports.ubuntu.com/ubuntu-ports/"; \
  openjdk-7-jdk \
  openssh-server \
  python-dev \
- python-virtualenv \
  postfix \
+ psmisc \
  pxz \
  qemu-system-arm \
  qemu-user \
@@ -75,6 +75,7 @@ RUN (url="http://ports.ubuntu.com/ubuntu-ports/"; \
  time \
  valgrind \
  vim \
+ python-virtualenv \
  wget \
  xz-utils \
  zip \
@@ -117,4 +118,4 @@ VOLUME /tmp
 
 EXPOSE 22
 CMD ["linux32", "/usr/sbin/sshd", "-D"]
-# checksum: abfd4fcc5689fdf8920906df65c7e43b
+# checksum: 29383efafa7903e14c3dc0023ae9d711
diff --git a/trusty-i386-tcwg-base/Dockerfile b/trusty-i386-tcwg-base/Dockerfile
index be645485..9d8fe98a 100644
--- a/trusty-i386-tcwg-base/Dockerfile
+++ b/trusty-i386-tcwg-base/Dockerfile
@@ -68,8 +68,8 @@ RUN (url="http://archive.ubuntu.com/ubuntu/"; \
  openssh-server \
  pkg-config \
  python-dev \
- python-virtualenv \
  postfix \
+ psmisc \
  pxz \
  qemu-system-arm \
  qemu-user \
@@ -83,6 +83,7 @@ RUN (url="http://archive.ubuntu.com/ubuntu/"; \
  time \
  valgrind \
  vim \
+ python-virtualenv \
  wget \
  xz-utils \
  zip \
@@ -134,4 +135,4 @@ VOLUME /tmp
 
 EXPOSE 22
 CMD ["linux32", "/usr/sbin/sshd", "-D"]
-# checksum: abba4eb87f135a8653bcdc84c92c3bc4
+# checksum: b81c7618ccf0ea3a18826ed36123cdee
diff --git a/xenial-amd64-tcwg-base/Dockerfile b/xenial-amd64-tcwg-base/Dockerfile
index fbf7d735..17b29cdd 100644
--- a/xenial-amd64-tcwg-base/Dockerfile
+++ b/xenial-amd64-tcwg-base/Dockerfile
@@ -67,6 +67,7 @@ RUN (url="http://archive.ubuntu.com/ubuntu/"; \
  pkg-config \
  python-dev \
  postfix \
+ psmisc \
  pxz \
  qemu-system-arm \
  qemu-user \
@@ -132,4 +133,4 @@ VOLUME /tmp
 
 EXPOSE 22
 CMD ["/usr/sbin/sshd", "-D"]
-# checksum: 40b22144fd4022bdf4d94df0f4c40fcc
+# checksum: 99c24a8b676909e9f2ea94c1942a3d14
diff --git a/xenial-arm64-tcwg-base/Dockerfile b/xenial-arm64-tcwg-base/Dockerfile
index da134ffa..196d5829 100644
--- a/xenial-arm64-tcwg-base/Dockerfile
+++ b/xenial-arm64-tcwg-base/Dockerfile
@@ -62,6 +62,7 @@ RUN (url="http://ports.ubuntu.com/ubuntu-ports/"; \
  openssh-server \
  python-dev \
  postfix \
+ psmisc \
  pxz \
  qemu-system-arm \
  qemu-user \
@@ -118,4 +119,4 @@ VOLUME /tmp
 
 EXPOSE 22
 CMD ["/usr/sbin/sshd", "-D"]
-# checksum: 2c82ed366ede3a5d2b1b808e5c5a90e2
+# checksum: f331e97904e7806cfc56a0a00c8aaaae
diff --git a/xenial-armhf-tcwg-base/Dockerfile b/xenial-armhf-tcwg-base/Dockerfile
index a444768a..3d957386 100644
--- a/xenial-armhf-tcwg-base/Dockerfile
+++ b/xenial-armhf-tcwg-base/Dockerfile
@@ -62,6 +62,7 @@ RUN (url="http://ports.ubuntu.com/ubuntu-ports/"; \
  openssh-server \
  python-dev \
  postfix \
+ psmisc \
  pxz \
  qemu-system-arm \
  qemu-user \
@@ -118,4 +119,4 @@ VOLUME /tmp
 
 EXPOSE 22
 CMD ["linux32", "/usr/sbin/sshd", "-D"]
-# checksum: 18583daa6b63a9d60423fc0a12fdb989
+# checksum: 3e029e523b443199b700a681508f4514
diff --git a/xenial-i386-tcwg-base/Dockerfile b/xenial-i386-tcwg-base/Dockerfile
index bcbd418c..67d8d304 100644
--- a/xenial-i386-tcwg-base/Dockerfile
+++ b/xenial-i386-tcwg-base/Dockerfile
@@ -69,6 +69,7 @@ RUN (url="http://archive.ubuntu.com/ubuntu/"; \
  pkg-config \
  python-dev \
  postfix \
+ psmisc \
  pxz \
  qemu-system-arm \
  qemu-user \
@@ -134,4 +135,4 @@ VOLUME /tmp
 
 EXPOSE 22
 CMD ["linux32", "/usr/sbin/sshd", "-D"]
-# checksum: 9641887f07db3b697c9fec34e1868dc0
+# checksum: 69c56b854878cdb5a7cba9969ac207ea