*-tcwg-build: Add tcwg-benchmark user to all images, not just amd64-trusty.

The fact that tcwg-benchmark user is present only in amd64 Trusty tcwg-build
image is historical artifact.  When we added the tcwg-benchmark we didn't
want to destabilize other images.  The change has been extensively tested
since then, so enabling for all tcwg-build images.

Change-Id: Ic341a98405cc39ea6e6f36a5d24dd96b239eaa33

10 files changed, 72 insertions, 39 deletions

diff --git a/tcwg-base/tcwg-build/Dockerfile.in b/tcwg-base/tcwg-build/Dockerfile.in
index 465e7345..9810a860 100644
--- a/tcwg-base/tcwg-build/Dockerfile.in
+++ b/tcwg-base/tcwg-build/Dockerfile.in
@@ -1,6 +1,5 @@
 FROM linaro/ci-#{ARCH}-tcwg-base-ubuntu:#{DISTRO}
 
-#if ARCH_amd64 && DISTRO_trusty
 RUN groupadd -g 9000 tcwg-infra \
  && useradd -m -g tcwg-infra -G kvm -u 11827 tcwg-buildslave \
  && useradd -m -g tcwg-infra -G kvm -u 12326 tcwg-benchmark \
@@ -15,14 +14,3 @@ RUN chown -R tcwg-buildslave:tcwg-infra /home/tcwg-buildslave/ \
  && chown -R tcwg-benchmark:tcwg-infra /home/tcwg-benchmark/ \
  && chmod 0700 /home/tcwg-buildslave/.ssh/ /home/tcwg-benchmark/.ssh/ \
  && chmod 0600 /home/tcwg-buildslave/.ssh/* /home/tcwg-benchmark/.ssh/*
-#else
-RUN groupadd -g 9000 tcwg-infra \
- && useradd -m -g tcwg-infra -G kvm -u 11827 tcwg-buildslave \
- && echo 'tcwg-buildslave ALL = NOPASSWD: ALL' > /etc/sudoers.d/jenkins \
- && chmod 0440 /etc/sudoers.d/jenkins \
- && mkdir -p /home/tcwg-buildslave/workspace
-
-COPY tcwg-buildslave /home/tcwg-buildslave
-RUN chown -R tcwg-buildslave:tcwg-infra /home/tcwg-buildslave/ \
- && chmod 0700 /home/tcwg-buildslave/.ssh/
-#endif
\ No newline at end of file
diff --git a/trusty-arm64-tcwg-base/trusty-arm64-tcwg-build/Dockerfile b/trusty-arm64-tcwg-base/trusty-arm64-tcwg-build/Dockerfile
index 3068c86d..0f672b1b 100644
--- a/trusty-arm64-tcwg-base/trusty-arm64-tcwg-build/Dockerfile
+++ b/trusty-arm64-tcwg-base/trusty-arm64-tcwg-build/Dockerfile
@@ -3,11 +3,16 @@ FROM linaro/ci-arm64-tcwg-base-ubuntu:trusty
 
 RUN groupadd -g 9000 tcwg-infra \
  && useradd -m -g tcwg-infra -G kvm -u 11827 tcwg-buildslave \
- && echo 'tcwg-buildslave ALL = NOPASSWD: ALL' > /etc/sudoers.d/jenkins \
+ && useradd -m -g tcwg-infra -G kvm -u 12326 tcwg-benchmark \
+ && echo '%tcwg-infra ALL = NOPASSWD: ALL' > /etc/sudoers.d/jenkins \
  && chmod 0440 /etc/sudoers.d/jenkins \
  && mkdir -p /home/tcwg-buildslave/workspace
 
 COPY tcwg-buildslave /home/tcwg-buildslave
+COPY tcwg-benchmark /home/tcwg-benchmark
+
 RUN chown -R tcwg-buildslave:tcwg-infra /home/tcwg-buildslave/ \
- && chmod 0700 /home/tcwg-buildslave/.ssh/
-# checksum: 5b8411ba3f5c30038504605630fa8ea0
+ && chown -R tcwg-benchmark:tcwg-infra /home/tcwg-benchmark/ \
+ && chmod 0700 /home/tcwg-buildslave/.ssh/ /home/tcwg-benchmark/.ssh/ \
+ && chmod 0600 /home/tcwg-buildslave/.ssh/* /home/tcwg-benchmark/.ssh/*
+# checksum: 5de8c4d4fdc7b8b350210c347928cfee
diff --git a/trusty-armhf-tcwg-base/trusty-armhf-tcwg-build/Dockerfile b/trusty-armhf-tcwg-base/trusty-armhf-tcwg-build/Dockerfile
index 9af4eae6..1c9e64dc 100644
--- a/trusty-armhf-tcwg-base/trusty-armhf-tcwg-build/Dockerfile
+++ b/trusty-armhf-tcwg-base/trusty-armhf-tcwg-build/Dockerfile
@@ -3,11 +3,16 @@ FROM linaro/ci-armhf-tcwg-base-ubuntu:trusty
 
 RUN groupadd -g 9000 tcwg-infra \
  && useradd -m -g tcwg-infra -G kvm -u 11827 tcwg-buildslave \
- && echo 'tcwg-buildslave ALL = NOPASSWD: ALL' > /etc/sudoers.d/jenkins \
+ && useradd -m -g tcwg-infra -G kvm -u 12326 tcwg-benchmark \
+ && echo '%tcwg-infra ALL = NOPASSWD: ALL' > /etc/sudoers.d/jenkins \
  && chmod 0440 /etc/sudoers.d/jenkins \
  && mkdir -p /home/tcwg-buildslave/workspace
 
 COPY tcwg-buildslave /home/tcwg-buildslave
+COPY tcwg-benchmark /home/tcwg-benchmark
+
 RUN chown -R tcwg-buildslave:tcwg-infra /home/tcwg-buildslave/ \
- && chmod 0700 /home/tcwg-buildslave/.ssh/
-# checksum: 86a4af35e82d1ea8241e260a8cec4d16
+ && chown -R tcwg-benchmark:tcwg-infra /home/tcwg-benchmark/ \
+ && chmod 0700 /home/tcwg-buildslave/.ssh/ /home/tcwg-benchmark/.ssh/ \
+ && chmod 0600 /home/tcwg-buildslave/.ssh/* /home/tcwg-benchmark/.ssh/*
+# checksum: e601ad462d4a4a23f9e950d78de0aa5d
diff --git a/trusty-i386-tcwg-base/trusty-i386-tcwg-build/Dockerfile b/trusty-i386-tcwg-base/trusty-i386-tcwg-build/Dockerfile
index e474ecd2..dd271c4c 100644
--- a/trusty-i386-tcwg-base/trusty-i386-tcwg-build/Dockerfile
+++ b/trusty-i386-tcwg-base/trusty-i386-tcwg-build/Dockerfile
@@ -3,11 +3,16 @@ FROM linaro/ci-i386-tcwg-base-ubuntu:trusty
 
 RUN groupadd -g 9000 tcwg-infra \
  && useradd -m -g tcwg-infra -G kvm -u 11827 tcwg-buildslave \
- && echo 'tcwg-buildslave ALL = NOPASSWD: ALL' > /etc/sudoers.d/jenkins \
+ && useradd -m -g tcwg-infra -G kvm -u 12326 tcwg-benchmark \
+ && echo '%tcwg-infra ALL = NOPASSWD: ALL' > /etc/sudoers.d/jenkins \
  && chmod 0440 /etc/sudoers.d/jenkins \
  && mkdir -p /home/tcwg-buildslave/workspace
 
 COPY tcwg-buildslave /home/tcwg-buildslave
+COPY tcwg-benchmark /home/tcwg-benchmark
+
 RUN chown -R tcwg-buildslave:tcwg-infra /home/tcwg-buildslave/ \
- && chmod 0700 /home/tcwg-buildslave/.ssh/
-# checksum: 40d87b0f3235719ebf32a55519286eea
+ && chown -R tcwg-benchmark:tcwg-infra /home/tcwg-benchmark/ \
+ && chmod 0700 /home/tcwg-buildslave/.ssh/ /home/tcwg-benchmark/.ssh/ \
+ && chmod 0600 /home/tcwg-buildslave/.ssh/* /home/tcwg-benchmark/.ssh/*
+# checksum: d1a93f00cce488976b44c87865c32888
diff --git a/xenial-amd64-tcwg-base/xenial-amd64-tcwg-build/Dockerfile b/xenial-amd64-tcwg-base/xenial-amd64-tcwg-build/Dockerfile
index 495384e9..8106b7bc 100644
--- a/xenial-amd64-tcwg-base/xenial-amd64-tcwg-build/Dockerfile
+++ b/xenial-amd64-tcwg-base/xenial-amd64-tcwg-build/Dockerfile
@@ -3,11 +3,16 @@ FROM linaro/ci-amd64-tcwg-base-ubuntu:xenial
 
 RUN groupadd -g 9000 tcwg-infra \
  && useradd -m -g tcwg-infra -G kvm -u 11827 tcwg-buildslave \
- && echo 'tcwg-buildslave ALL = NOPASSWD: ALL' > /etc/sudoers.d/jenkins \
+ && useradd -m -g tcwg-infra -G kvm -u 12326 tcwg-benchmark \
+ && echo '%tcwg-infra ALL = NOPASSWD: ALL' > /etc/sudoers.d/jenkins \
  && chmod 0440 /etc/sudoers.d/jenkins \
  && mkdir -p /home/tcwg-buildslave/workspace
 
 COPY tcwg-buildslave /home/tcwg-buildslave
+COPY tcwg-benchmark /home/tcwg-benchmark
+
 RUN chown -R tcwg-buildslave:tcwg-infra /home/tcwg-buildslave/ \
- && chmod 0700 /home/tcwg-buildslave/.ssh/
-# checksum: 5a86865cb900e6ec527306f7cb558280
+ && chown -R tcwg-benchmark:tcwg-infra /home/tcwg-benchmark/ \
+ && chmod 0700 /home/tcwg-buildslave/.ssh/ /home/tcwg-benchmark/.ssh/ \
+ && chmod 0600 /home/tcwg-buildslave/.ssh/* /home/tcwg-benchmark/.ssh/*
+# checksum: 710acbfdcccff739b76435ef75be994e
diff --git a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-build/Dockerfile b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-build/Dockerfile
index a7b83a1b..e6e943c7 100644
--- a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-build/Dockerfile
+++ b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-build/Dockerfile
@@ -3,11 +3,16 @@ FROM linaro/ci-arm64-tcwg-base-ubuntu:xenial
 
 RUN groupadd -g 9000 tcwg-infra \
  && useradd -m -g tcwg-infra -G kvm -u 11827 tcwg-buildslave \
- && echo 'tcwg-buildslave ALL = NOPASSWD: ALL' > /etc/sudoers.d/jenkins \
+ && useradd -m -g tcwg-infra -G kvm -u 12326 tcwg-benchmark \
+ && echo '%tcwg-infra ALL = NOPASSWD: ALL' > /etc/sudoers.d/jenkins \
  && chmod 0440 /etc/sudoers.d/jenkins \
  && mkdir -p /home/tcwg-buildslave/workspace
 
 COPY tcwg-buildslave /home/tcwg-buildslave
+COPY tcwg-benchmark /home/tcwg-benchmark
+
 RUN chown -R tcwg-buildslave:tcwg-infra /home/tcwg-buildslave/ \
- && chmod 0700 /home/tcwg-buildslave/.ssh/
-# checksum: 680a06d7dd1b149519daeb1283efe320
+ && chown -R tcwg-benchmark:tcwg-infra /home/tcwg-benchmark/ \
+ && chmod 0700 /home/tcwg-buildslave/.ssh/ /home/tcwg-benchmark/.ssh/ \
+ && chmod 0600 /home/tcwg-buildslave/.ssh/* /home/tcwg-benchmark/.ssh/*
+# checksum: 32a27b3b729064776a076ccd5199b8e2
diff --git a/xenial-armhf-tcwg-base/xenial-armhf-tcwg-build/Dockerfile b/xenial-armhf-tcwg-base/xenial-armhf-tcwg-build/Dockerfile
index 9941ccf6..958c9360 100644
--- a/xenial-armhf-tcwg-base/xenial-armhf-tcwg-build/Dockerfile
+++ b/xenial-armhf-tcwg-base/xenial-armhf-tcwg-build/Dockerfile
@@ -3,11 +3,16 @@ FROM linaro/ci-armhf-tcwg-base-ubuntu:xenial
 
 RUN groupadd -g 9000 tcwg-infra \
  && useradd -m -g tcwg-infra -G kvm -u 11827 tcwg-buildslave \
- && echo 'tcwg-buildslave ALL = NOPASSWD: ALL' > /etc/sudoers.d/jenkins \
+ && useradd -m -g tcwg-infra -G kvm -u 12326 tcwg-benchmark \
+ && echo '%tcwg-infra ALL = NOPASSWD: ALL' > /etc/sudoers.d/jenkins \
  && chmod 0440 /etc/sudoers.d/jenkins \
  && mkdir -p /home/tcwg-buildslave/workspace
 
 COPY tcwg-buildslave /home/tcwg-buildslave
+COPY tcwg-benchmark /home/tcwg-benchmark
+
 RUN chown -R tcwg-buildslave:tcwg-infra /home/tcwg-buildslave/ \
- && chmod 0700 /home/tcwg-buildslave/.ssh/
-# checksum: 22d91bd2f9566cde006f7c075aebc908
+ && chown -R tcwg-benchmark:tcwg-infra /home/tcwg-benchmark/ \
+ && chmod 0700 /home/tcwg-buildslave/.ssh/ /home/tcwg-benchmark/.ssh/ \
+ && chmod 0600 /home/tcwg-buildslave/.ssh/* /home/tcwg-benchmark/.ssh/*
+# checksum: 484fd5849721dbc7371264157f143624
diff --git a/xenial-i386-tcwg-base/xenial-i386-tcwg-build/Dockerfile b/xenial-i386-tcwg-base/xenial-i386-tcwg-build/Dockerfile
index 036f62d5..e2354abc 100644
--- a/xenial-i386-tcwg-base/xenial-i386-tcwg-build/Dockerfile
+++ b/xenial-i386-tcwg-base/xenial-i386-tcwg-build/Dockerfile
@@ -3,11 +3,16 @@ FROM linaro/ci-i386-tcwg-base-ubuntu:xenial
 
 RUN groupadd -g 9000 tcwg-infra \
  && useradd -m -g tcwg-infra -G kvm -u 11827 tcwg-buildslave \
- && echo 'tcwg-buildslave ALL = NOPASSWD: ALL' > /etc/sudoers.d/jenkins \
+ && useradd -m -g tcwg-infra -G kvm -u 12326 tcwg-benchmark \
+ && echo '%tcwg-infra ALL = NOPASSWD: ALL' > /etc/sudoers.d/jenkins \
  && chmod 0440 /etc/sudoers.d/jenkins \
  && mkdir -p /home/tcwg-buildslave/workspace
 
 COPY tcwg-buildslave /home/tcwg-buildslave
+COPY tcwg-benchmark /home/tcwg-benchmark
+
 RUN chown -R tcwg-buildslave:tcwg-infra /home/tcwg-buildslave/ \
- && chmod 0700 /home/tcwg-buildslave/.ssh/
-# checksum: 2d177b61f4a3dc9f12cba0f0a249d5eb
+ && chown -R tcwg-benchmark:tcwg-infra /home/tcwg-benchmark/ \
+ && chmod 0700 /home/tcwg-buildslave/.ssh/ /home/tcwg-benchmark/.ssh/ \
+ && chmod 0600 /home/tcwg-buildslave/.ssh/* /home/tcwg-benchmark/.ssh/*
+# checksum: d3ad0282af3e17dd2bc7562dcf7c3bd9
diff --git a/zesty-arm64-tcwg-base/zesty-arm64-tcwg-build/Dockerfile b/zesty-arm64-tcwg-base/zesty-arm64-tcwg-build/Dockerfile
index 30a16ad3..2908f9f1 100644
--- a/zesty-arm64-tcwg-base/zesty-arm64-tcwg-build/Dockerfile
+++ b/zesty-arm64-tcwg-base/zesty-arm64-tcwg-build/Dockerfile
@@ -3,11 +3,16 @@ FROM linaro/ci-arm64-tcwg-base-ubuntu:zesty
 
 RUN groupadd -g 9000 tcwg-infra \
  && useradd -m -g tcwg-infra -G kvm -u 11827 tcwg-buildslave \
- && echo 'tcwg-buildslave ALL = NOPASSWD: ALL' > /etc/sudoers.d/jenkins \
+ && useradd -m -g tcwg-infra -G kvm -u 12326 tcwg-benchmark \
+ && echo '%tcwg-infra ALL = NOPASSWD: ALL' > /etc/sudoers.d/jenkins \
  && chmod 0440 /etc/sudoers.d/jenkins \
  && mkdir -p /home/tcwg-buildslave/workspace
 
 COPY tcwg-buildslave /home/tcwg-buildslave
+COPY tcwg-benchmark /home/tcwg-benchmark
+
 RUN chown -R tcwg-buildslave:tcwg-infra /home/tcwg-buildslave/ \
- && chmod 0700 /home/tcwg-buildslave/.ssh/
-# checksum: f315b79ecc57c2dae71db5ace1fedcb3
+ && chown -R tcwg-benchmark:tcwg-infra /home/tcwg-benchmark/ \
+ && chmod 0700 /home/tcwg-buildslave/.ssh/ /home/tcwg-benchmark/.ssh/ \
+ && chmod 0600 /home/tcwg-buildslave/.ssh/* /home/tcwg-benchmark/.ssh/*
+# checksum: 13fb54b757062912c232e16738978027
diff --git a/zesty-armhf-tcwg-base/zesty-armhf-tcwg-build/Dockerfile b/zesty-armhf-tcwg-base/zesty-armhf-tcwg-build/Dockerfile
index 34424649..7ffd17df 100644
--- a/zesty-armhf-tcwg-base/zesty-armhf-tcwg-build/Dockerfile
+++ b/zesty-armhf-tcwg-base/zesty-armhf-tcwg-build/Dockerfile
@@ -3,11 +3,16 @@ FROM linaro/ci-armhf-tcwg-base-ubuntu:zesty
 
 RUN groupadd -g 9000 tcwg-infra \
  && useradd -m -g tcwg-infra -G kvm -u 11827 tcwg-buildslave \
- && echo 'tcwg-buildslave ALL = NOPASSWD: ALL' > /etc/sudoers.d/jenkins \
+ && useradd -m -g tcwg-infra -G kvm -u 12326 tcwg-benchmark \
+ && echo '%tcwg-infra ALL = NOPASSWD: ALL' > /etc/sudoers.d/jenkins \
  && chmod 0440 /etc/sudoers.d/jenkins \
  && mkdir -p /home/tcwg-buildslave/workspace
 
 COPY tcwg-buildslave /home/tcwg-buildslave
+COPY tcwg-benchmark /home/tcwg-benchmark
+
 RUN chown -R tcwg-buildslave:tcwg-infra /home/tcwg-buildslave/ \
- && chmod 0700 /home/tcwg-buildslave/.ssh/
-# checksum: 1a6ea7f6937aa882367e6824bbd59835
+ && chown -R tcwg-benchmark:tcwg-infra /home/tcwg-benchmark/ \
+ && chmod 0700 /home/tcwg-buildslave/.ssh/ /home/tcwg-benchmark/.ssh/ \
+ && chmod 0600 /home/tcwg-buildslave/.ssh/* /home/tcwg-benchmark/.ssh/*
+# checksum: 77302f65407ca1a2a4b87352c8347c60