diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2017-09-18 11:32:01 +0000 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2017-09-18 11:32:01 +0000 |
| commit | 8dbabafd947f57b038a7e50fe7c13b89f0037d13 (patch) | |
| tree | 1bb1156a715c1d785ee8faea7c2fbc8cb8575f14 /tcwg-base/tcwg-build/Dockerfile.in | |
| parent | 2db5d1d83328e36184ac527552d7041a2d1a5293 (diff) | |
*-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
Diffstat (limited to 'tcwg-base/tcwg-build/Dockerfile.in')
| -rw-r--r-- | tcwg-base/tcwg-build/Dockerfile.in | 12 |
1 files changed, 0 insertions, 12 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 |