tcwg-host: Add infra users to tcwg-host images

Move /home data of infra users to tcwg-base/ from tcwg-build/
so that it can be used in tcwg-host images.

Change-Id: Iae33dbf112e645acfdad8a063eee84fc5396c926

14 files changed, 8 insertions, 6 deletions

diff --git a/tcwg-base/tcwg-host/home/maxim.kuvyrkov/.ssh/authorized_keys b/tcwg-base/home-data/maxim.kuvyrkov/.ssh/authorized_keys
index fa17c380..fa17c380 100644
--- a/tcwg-base/tcwg-host/home/maxim.kuvyrkov/.ssh/authorized_keys
+++ b/tcwg-base/home-data/maxim.kuvyrkov/.ssh/authorized_keys
diff --git a/tcwg-base/tcwg-build/tcwg-benchmark/.gitconfig b/tcwg-base/home-data/tcwg-benchmark/.gitconfig
index d0ea2be3..d0ea2be3 100644
--- a/tcwg-base/tcwg-build/tcwg-benchmark/.gitconfig
+++ b/tcwg-base/home-data/tcwg-benchmark/.gitconfig
diff --git a/tcwg-base/tcwg-build/tcwg-benchmark/.ssh/authorized_keys b/tcwg-base/home-data/tcwg-benchmark/.ssh/authorized_keys
index 536483eb..536483eb 100644
--- a/tcwg-base/tcwg-build/tcwg-benchmark/.ssh/authorized_keys
+++ b/tcwg-base/home-data/tcwg-benchmark/.ssh/authorized_keys
diff --git a/tcwg-base/tcwg-build/tcwg-benchmark/.ssh/config b/tcwg-base/home-data/tcwg-benchmark/.ssh/config
index 47e5dbf0..47e5dbf0 100644
--- a/tcwg-base/tcwg-build/tcwg-benchmark/.ssh/config
+++ b/tcwg-base/home-data/tcwg-benchmark/.ssh/config
diff --git a/tcwg-base/tcwg-build/tcwg-benchmark/.ssh/known_hosts b/tcwg-base/home-data/tcwg-benchmark/.ssh/known_hosts
index b649d65f..b649d65f 100644
--- a/tcwg-base/tcwg-build/tcwg-benchmark/.ssh/known_hosts
+++ b/tcwg-base/home-data/tcwg-benchmark/.ssh/known_hosts
diff --git a/tcwg-base/tcwg-build/tcwg-buildslave/.gitconfig b/tcwg-base/home-data/tcwg-buildslave/.gitconfig
index d91df92c..d91df92c 100644
--- a/tcwg-base/tcwg-build/tcwg-buildslave/.gitconfig
+++ b/tcwg-base/home-data/tcwg-buildslave/.gitconfig
diff --git a/tcwg-base/tcwg-build/tcwg-buildslave/.mailrc b/tcwg-base/home-data/tcwg-buildslave/.mailrc
index cae73d9b..cae73d9b 100644
--- a/tcwg-base/tcwg-build/tcwg-buildslave/.mailrc
+++ b/tcwg-base/home-data/tcwg-buildslave/.mailrc
diff --git a/tcwg-base/tcwg-build/tcwg-buildslave/.ssh/authorized_keys b/tcwg-base/home-data/tcwg-buildslave/.ssh/authorized_keys
index bb7e338b..bb7e338b 100644
--- a/tcwg-base/tcwg-build/tcwg-buildslave/.ssh/authorized_keys
+++ b/tcwg-base/home-data/tcwg-buildslave/.ssh/authorized_keys
diff --git a/tcwg-base/tcwg-build/tcwg-buildslave/.ssh/config b/tcwg-base/home-data/tcwg-buildslave/.ssh/config
index 47e5dbf0..47e5dbf0 100644
--- a/tcwg-base/tcwg-build/tcwg-buildslave/.ssh/config
+++ b/tcwg-base/home-data/tcwg-buildslave/.ssh/config
diff --git a/tcwg-base/tcwg-build/tcwg-buildslave/.ssh/known_hosts b/tcwg-base/home-data/tcwg-buildslave/.ssh/known_hosts
index b649d65f..b649d65f 100644
--- a/tcwg-base/tcwg-build/tcwg-buildslave/.ssh/known_hosts
+++ b/tcwg-base/home-data/tcwg-buildslave/.ssh/known_hosts
diff --git a/tcwg-base/tcwg-build/build.sh b/tcwg-base/tcwg-build/build.sh
index 8624b7fd..1e14577d 100755
--- a/tcwg-base/tcwg-build/build.sh
+++ b/tcwg-base/tcwg-build/build.sh
@@ -16,8 +16,8 @@ name=$(basename ${PWD} | cut -f3- -d '-')
 image=linaro/ci-${arch}-${name}-ubuntu:${distro}
 top=$(git rev-parse --show-toplevel)
 
-rsync -a $top/tcwg-base/tcwg-build/tcwg-buildslave/ ./tcwg-buildslave/
-rsync -a $top/tcwg-base/tcwg-build/tcwg-benchmark/ ./tcwg-benchmark/
+rsync -a $top/tcwg-base/home-data/tcwg-buildslave/ ./tcwg-buildslave/
+rsync -a $top/tcwg-base/home-data/tcwg-benchmark/ ./tcwg-benchmark/
 
 (cd ..; ./build.sh)
 "$top"/tcwg-base/validate-dockerfile.sh Dockerfile
diff --git a/tcwg-base/tcwg-host/Dockerfile.in b/tcwg-base/tcwg-host/Dockerfile.in
index 3e876f13..18050ecf 100644
--- a/tcwg-base/tcwg-host/Dockerfile.in
+++ b/tcwg-base/tcwg-host/Dockerfile.in
@@ -1,7 +1,7 @@
 FROM linaro/ci-#{ARCH}-tcwg-base-ubuntu:#{DISTRO}
 
 COPY passwd start.sh /
-COPY home/ /home-data/
+COPY home-data/ /home-data/
 
 RUN new-user.sh --group tcwg-infra:9000 && new-user.sh --group primary:10000 \
  && while read line; do \
diff --git a/tcwg-base/tcwg-host/build.sh b/tcwg-base/tcwg-host/build.sh
index c0a1e789..7cbf775f 100755
--- a/tcwg-base/tcwg-host/build.sh
+++ b/tcwg-base/tcwg-host/build.sh
@@ -6,7 +6,7 @@ trap cleanup_exit INT TERM EXIT
 
 cleanup_exit()
 {
-    rm -rf home/ passwd start.sh
+    rm -rf home-data/ passwd start.sh
 }
 
 export LANG=C
@@ -16,7 +16,7 @@ name=$(basename ${PWD} | cut -f3- -d '-')
 image=linaro/ci-${arch}-${name}-ubuntu:${distro}
 top=$(git rev-parse --show-toplevel)
 
-rsync -aL $top/tcwg-base/tcwg-host/home/ ./home/
+rsync -aL $top/tcwg-base/home-data/ ./home-data/
 cp $top/tcwg-base/tcwg-host/passwd ./
 cp $top/tcwg-base/tcwg-host/start.sh ./
 
diff --git a/tcwg-base/tcwg-host/passwd b/tcwg-base/tcwg-host/passwd
index 62479561..c63d1163 100644
--- a/tcwg-base/tcwg-host/passwd
+++ b/tcwg-base/tcwg-host/passwd
@@ -1 +1,3 @@
-maxim.kuvyrkov:x:10967:10000:Maxim Kuvyrkov:/home/maxim.kuvyrkov:/bin/bash
+tcwg-buildslave:x:11827:9000:TCWG Buildslave::/bin/bash
+tcwg-benchmark:x:12326:9000:TCWG Benchmark::/bin/bash
+maxim.kuvyrkov:x:10967:10000:Maxim Kuvyrkov::/bin/bash