aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYvan Roux <yvan.roux@linaro.org>2018-05-29 16:34:58 +0200
committerYvan Roux <yvan.roux@linaro.org>2018-05-29 16:35:44 +0200
commit3686dba66c91b1412fc9080a6302e4f489b1ade8 (patch)
treebf9453180ad863b24ed4b0cc409326d0ddbd0d74
parent82287d9c0d2a25f529d242a1385d5bc791523fbd (diff)
parent8abda302b34d21071ad8be1e6e36b86294fb71dd (diff)
downloaddockerfiles-tcwg-staging.tar.gz
Merge remote-tracking branch 'origin/master' into tcwg-stagingtcwg-staging
Change-Id: I8446b7a4ca9ae514f681ae74b00b1d155cb18dfc
-rwxr-xr-xci-amd64-llp-alpine/docker_run.sh17
-rw-r--r--jessie-amd64-jenkins-master/Dockerfile2
-rw-r--r--jessie-amd64-jenkins-master/plugins.txt12
-rw-r--r--tcwg-base/Dockerfile.in1
-rw-r--r--tcwg-base/gerrit-branches1
-rw-r--r--tcwg-base/tcwg-build/Dockerfile.in9
-rwxr-xr-xtcwg-base/tcwg-build/build.sh3
-rwxr-xr-xtcwg-base/tcwg-build/new-user.sh55
-rw-r--r--tcwg-base/tcwg-build/tcwg-test/Dockerfile.in6
-rwxr-xr-xtcwg-base/tcwg-dev/start.sh19
-rw-r--r--tcwg-base/tcwg-llvmbot/Dockerfile.in6
-rwxr-xr-xtcwg-base/tcwg-llvmbot/run.sh6
-rwxr-xr-xtcwg-base/tcwg-llvmbot/start.sh15
-rw-r--r--trusty-amd64-tcwg-base/Dockerfile3
-rw-r--r--trusty-amd64-tcwg-base/trusty-amd64-tcwg-build/Dockerfile11
-rw-r--r--trusty-arm64-tcwg-base/Dockerfile3
-rw-r--r--trusty-arm64-tcwg-base/trusty-arm64-tcwg-build/Dockerfile11
-rw-r--r--trusty-arm64-tcwg-base/trusty-arm64-tcwg-build/trusty-arm64-tcwg-test/Dockerfile8
-rw-r--r--trusty-armhf-tcwg-base/Dockerfile3
-rw-r--r--trusty-armhf-tcwg-base/trusty-armhf-tcwg-build/Dockerfile11
-rw-r--r--trusty-armhf-tcwg-base/trusty-armhf-tcwg-build/trusty-armhf-tcwg-test/Dockerfile8
-rw-r--r--trusty-i386-tcwg-base/Dockerfile3
-rw-r--r--trusty-i386-tcwg-base/trusty-i386-tcwg-build/Dockerfile11
-rw-r--r--xenial-amd64-tcwg-base/Dockerfile3
-rw-r--r--xenial-amd64-tcwg-base/xenial-amd64-tcwg-build/Dockerfile11
-rw-r--r--xenial-arm64-tcwg-base/Dockerfile3
-rw-r--r--xenial-arm64-tcwg-base/xenial-arm64-tcwg-build/Dockerfile11
-rw-r--r--xenial-arm64-tcwg-base/xenial-arm64-tcwg-build/xenial-arm64-tcwg-test/Dockerfile8
-rw-r--r--xenial-armhf-tcwg-base/Dockerfile3
-rw-r--r--xenial-armhf-tcwg-base/xenial-armhf-tcwg-build/Dockerfile11
-rw-r--r--xenial-armhf-tcwg-base/xenial-armhf-tcwg-build/xenial-armhf-tcwg-test/Dockerfile8
-rw-r--r--xenial-i386-tcwg-base/Dockerfile3
-rw-r--r--xenial-i386-tcwg-base/xenial-i386-tcwg-build/Dockerfile11
33 files changed, 168 insertions, 128 deletions
diff --git a/ci-amd64-llp-alpine/docker_run.sh b/ci-amd64-llp-alpine/docker_run.sh
index 52c27ae..8e35b7a 100755
--- a/ci-amd64-llp-alpine/docker_run.sh
+++ b/ci-amd64-llp-alpine/docker_run.sh
@@ -12,15 +12,14 @@ if [ -z "$DJANGO_DEBUG" ] ; then
echo "$html_header" >> /srv/header_override.html
fi
- if [ ! -z "$DJANGO_MIGRATE" ]; then
- python $APPDIR/manage.py migrate --noinput
- fi
- if [ ! -z "$DJANGO_COLLECTSTATIC" ]; then
- python $APPDIR/manage.py collectstatic --noinput
- fi
-
exec /usr/bin/gunicorn -w4 -b 0.0.0.0:$PORT $LLP_APP
fi
-python $APPDIR/manage.py migrate --noinput --settings=settings
-exec python $APPDIR/manage.py runserver 0.0.0.0:8080 --settings=settings
+if [ ! -z "$DJANGO_MIGRATE" ]; then
+ python $APPDIR/manage.py migrate --noinput --settings=$DJANGO_SETTINGS_MODULE
+fi
+if [ ! -z "$DJANGO_COLLECTSTATIC" ]; then
+ python $APPDIR/manage.py collectstatic --noinput --settings=$DJANGO_SETTINGS_MODULE
+fi
+
+exec python $APPDIR/manage.py runserver 0.0.0.0:8080 --settings=$DJANGO_SETTINGS_MODULE
diff --git a/jessie-amd64-jenkins-master/Dockerfile b/jessie-amd64-jenkins-master/Dockerfile
index 85abad5..dd51062 100644
--- a/jessie-amd64-jenkins-master/Dockerfile
+++ b/jessie-amd64-jenkins-master/Dockerfile
@@ -1,4 +1,4 @@
-FROM jenkins/jenkins:2.107.2
+FROM jenkins/jenkins:2.107.3
ENV JENKINS_JAVA_PARAMETERS="-server -XX:+AlwaysPreTouch -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/var/log/jenkins/heapdump.log -verbose:gc -Xloggc:/var/log/jenkins/gc-%t.log -XX:NumberOfGCLogFiles=2 -XX:+UseGCLogFileRotation -XX:GCLogFileSize=100m -XX:+PrintGC -XX:+PrintGCDateStamps -XX:+PrintGCDetails -XX:+PrintHeapAtGC -XX:+PrintGCCause -XX:+PrintTenuringDistribution -XX:+PrintReferenceGC -XX:+PrintAdaptiveSizePolicy -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+ParallelRefProcEnabled -XX:+ExplicitGCInvokesConcurrent -XX:+UnlockDiagnosticVMOptions -XX:G1SummarizeRSetStatsPeriod=1 -XX:MaxMetaspaceExpansion=64M -Djenkins.model.Jenkins.logStartupPerformance=true"
ENV JAVA_OPTS="-Xms4g -Xmx8g $JENKINS_JAVA_PARAMETERS -Djava.awt.headless=true -Dhudson.slaves.WorkspaceList='_' -Dhudson.model.ParametersAction.keepUndefinedParameters=true -Dorg.jenkinsci.plugins.gitclient.Git.timeOut=30 -Dorg.eclipse.jetty.server.Request.maxFormContentSize=1000000"
diff --git a/jessie-amd64-jenkins-master/plugins.txt b/jessie-amd64-jenkins-master/plugins.txt
index a8f30a5..a435645 100644
--- a/jessie-amd64-jenkins-master/plugins.txt
+++ b/jessie-amd64-jenkins-master/plugins.txt
@@ -1,7 +1,7 @@
ansicolor:0.5.2
ant:1.8
antisamy-markup-formatter:1.5
-apache-httpcomponents-client-4-api:4.5.3-2.1
+apache-httpcomponents-client-4-api:4.5.5-2.0
bouncycastle-api:2.16.2
build-blocker:1.7.3
build-monitor-plugin:1.12+build.201708172343
@@ -27,12 +27,12 @@ ghprb:1.40.0
gerrit-trigger:2.27.5
github-organization-folder:1.6
greenballs:1.15
-groovy-postbuild:2.4
+groovy-postbuild:2.4.1
heavy-job:1.1
htmlpublisher:1.16
ircbot:2.30
-jira:2.5
-jenkins-multijob-plugin:1.29
+jira:2.5.2
+jenkins-multijob-plugin:1.30
jobConfigHistory:2.18
ldap:1.20
leastload:2.0.1
@@ -47,7 +47,7 @@ multiple-scms:0.6
naginator:1.17.2
nodelabelparameter:1.7.2
pam-auth:1.3
-pipeline-utility-steps:2.0.2
+pipeline-utility-steps:2.1.0
plot:1.11
PrioritySorter:3.6.0
publish-over-ssh:1.19.1
@@ -58,7 +58,7 @@ ssh-agent:1.15
subversion:2.10.5
tap:2.2.1
throttle-concurrents:2.0.1
-timestamper:1.8.9
+timestamper:1.8.10
translation:1.16
urltrigger:0.41
warnings:4.66
diff --git a/tcwg-base/Dockerfile.in b/tcwg-base/Dockerfile.in
index 9efe3d6..6abf52d 100644
--- a/tcwg-base/Dockerfile.in
+++ b/tcwg-base/Dockerfile.in
@@ -31,6 +31,7 @@ RUN (url="http://ports.ubuntu.com/ubuntu-ports/"; \
autogen \
automake \
bc \
+ bind9-host \
bison \
#if ARCH_amd64 || ARCH_i386
binutils-aarch64-linux-gnu \
diff --git a/tcwg-base/gerrit-branches b/tcwg-base/gerrit-branches
index 0561f3a..2afcbc2 100644
--- a/tcwg-base/gerrit-branches
+++ b/tcwg-base/gerrit-branches
@@ -1,2 +1,3 @@
master
tcwg-staging
+tcwg-tested
diff --git a/tcwg-base/tcwg-build/Dockerfile.in b/tcwg-base/tcwg-build/Dockerfile.in
index 5d620d2..39ef4f3 100644
--- a/tcwg-base/tcwg-build/Dockerfile.in
+++ b/tcwg-base/tcwg-build/Dockerfile.in
@@ -1,10 +1,9 @@
FROM linaro/ci-#{ARCH}-tcwg-base-ubuntu:#{DISTRO}
-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 \
- && echo '%tcwg-infra ALL = NOPASSWD: ALL' > /etc/sudoers.d/jenkins \
- && chmod 0440 /etc/sudoers.d/jenkins \
+COPY new-user.sh /usr/local/bin/
+
+RUN new-user.sh --user tcwg-buildslave:11827 --group tcwg-infra:9000 \
+ && new-user.sh --user tcwg-benchmark:12326 --group tcwg-infra \
&& mkdir -p /home/tcwg-buildslave/workspace
COPY tcwg-buildslave /home/tcwg-buildslave
diff --git a/tcwg-base/tcwg-build/build.sh b/tcwg-base/tcwg-build/build.sh
index 8624b7f..9979502 100755
--- a/tcwg-base/tcwg-build/build.sh
+++ b/tcwg-base/tcwg-build/build.sh
@@ -6,7 +6,7 @@ trap cleanup_exit INT TERM EXIT
cleanup_exit()
{
- rm -rf tcwg-buildslave tcwg-benchmark
+ rm -rf new-user.sh tcwg-buildslave tcwg-benchmark
}
export LANG=C
@@ -16,6 +16,7 @@ name=$(basename ${PWD} | cut -f3- -d '-')
image=linaro/ci-${arch}-${name}-ubuntu:${distro}
top=$(git rev-parse --show-toplevel)
+cp $top/tcwg-base/tcwg-build/new-user.sh ./
rsync -a $top/tcwg-base/tcwg-build/tcwg-buildslave/ ./tcwg-buildslave/
rsync -a $top/tcwg-base/tcwg-build/tcwg-benchmark/ ./tcwg-benchmark/
diff --git a/tcwg-base/tcwg-build/new-user.sh b/tcwg-base/tcwg-build/new-user.sh
new file mode 100755
index 0000000..d1b1895
--- /dev/null
+++ b/tcwg-base/tcwg-build/new-user.sh
@@ -0,0 +1,55 @@
+#!/bin/bash
+
+set -euf -o pipefail
+
+usage ()
+{
+ exit 1
+}
+
+group=""
+key=""
+user=""
+verbose=false
+
+while [ $# -gt 0 ]; do
+ case "$1" in
+ --group) group="$2" ;;
+ --key) key="$2" ;;
+ --user) user="$2" ;;
+ --verbose) verbose="$2"; shift ;;
+ *) echo "ERROR: Wrong option: $1"; usage ;;
+ esac
+ shift 2
+done
+
+if $verbose; then set -x; fi
+
+if [ x"$group" != x"" ]; then
+ gid=$(echo "$group" | cut -s -d: -f 2)
+ group=$(echo "$group" | cut -d: -f 1)
+
+ if [ x"$gid" != x"" ]; then
+ groupadd -g $gid $group
+ fi
+
+ group_opt="-g $group"
+else
+ group_opt=""
+fi
+
+uid=$(echo "$user" | cut -s -d: -f 2)
+user=$(echo "$user" | cut -d: -f 1)
+
+useradd -m $group_opt -G kvm ${uid:+-u $uid} $user
+
+sudoers_file=/etc/sudoers.d/$(echo $user | tr "." "-")
+echo "$user ALL = NOPASSWD: ALL" > $sudoers_file
+chmod 0440 $sudoers_file
+
+if [ x"$key" != x"" ] ; then
+ sudo -i -u $user mkdir -p /home/$user/.ssh
+ sudo -i -u $user chmod 0700 /home/$user/.ssh
+ cat "$key" | sudo -i -u $user tee /home/$user/.ssh/authorized_keys > /dev/null
+ sudo -i -u $user chmod 0600 /home/$user/.ssh/authorized_keys
+fi
diff --git a/tcwg-base/tcwg-build/tcwg-test/Dockerfile.in b/tcwg-base/tcwg-build/tcwg-test/Dockerfile.in
index be59e96..cb7a136 100644
--- a/tcwg-base/tcwg-build/tcwg-test/Dockerfile.in
+++ b/tcwg-base/tcwg-build/tcwg-test/Dockerfile.in
@@ -1,7 +1 @@
FROM linaro/ci-#{ARCH}-tcwg-build-ubuntu:#{DISTRO}
-
-COPY tcwg-buildslave/.ssh /root/.ssh
-
-RUN chmod 0700 /root/.ssh/ \
- && sed -i -e "/.*PermitRootLogin.*/d" /etc/ssh/sshd_config \
- && echo "PermitRootLogin without-password" >> /etc/ssh/sshd_config
diff --git a/tcwg-base/tcwg-dev/start.sh b/tcwg-base/tcwg-dev/start.sh
index e36c851..b06c8bb 100755
--- a/tcwg-base/tcwg-dev/start.sh
+++ b/tcwg-base/tcwg-dev/start.sh
@@ -56,6 +56,11 @@ if $verbose; then
set -x
fi
+if [ x"$image" = x"" ]; then
+ echo "ERROR: image name not provided"
+ usage
+fi
+
if groups tcwg-buildslave 2>/dev/null | grep -q docker; then
# If tcwg-buildslave user is present, use it to start the container
# to have [sudo] log record of container startups.
@@ -111,9 +116,11 @@ $DOCKER run --name=$name -dt -p 22 $mounts --memory=$memlimit --pids-limit=5000
port=$($DOCKER port $name 22 | cut -d: -f 2)
set +x
-echo "NOTE: the warning about kernel not supporting swap memory limit is expected"
-echo "To connect to container run \"ssh -p $port localhost\""
-echo "To stop container run \"docker stop $name\""
-echo "To restart container run \"docker start $name\""
-echo "To remove container run \"docker rm -fv $name\""
-echo "See https://collaborate.linaro.org/display/TCWG/How+to+setup+personal+dev+environment+using+docker for additional info"
+cat <<EOF
+NOTE: the warning about kernel not supporting swap memory limit is expected
+To connect to container run "ssh -p $port localhost"
+To stop container run "docker stop $name"
+To restart container run "docker start $name"
+To remove container run "docker rm -fv $name"
+See https://collaborate.linaro.org/display/TCWG/How+to+setup+personal+dev+environment+using+docker for additional info
+EOF
diff --git a/tcwg-base/tcwg-llvmbot/Dockerfile.in b/tcwg-base/tcwg-llvmbot/Dockerfile.in
index 1d0d65d..24233ed 100644
--- a/tcwg-base/tcwg-llvmbot/Dockerfile.in
+++ b/tcwg-base/tcwg-llvmbot/Dockerfile.in
@@ -32,12 +32,12 @@ RUN git clone -b master https://github.com/maxim-kuvyrkov/ninja.git \
# Add current clang for libcxx bots.
RUN \
#if ARCH_arm64
- clang_ver=clang+llvm-5.0.1-aarch64-linux-gnu \
+ clang_ver=clang+llvm-6.0.0-aarch64-linux-gnu \
#else /* ARCH_armhf */
- clang_ver=clang+llvm-5.0.1-armv7a-linux-gnueabihf \
+ clang_ver=clang+llvm-6.0.0-armv7a-linux-gnueabihf \
#endif
&& cd /usr/local \
- && wget --progress=dot:giga http://releases.llvm.org/5.0.1/$clang_ver.tar.xz \
+ && wget --progress=dot:giga http://releases.llvm.org/6.0.0/$clang_ver.tar.xz \
&& tar xf $clang_ver.tar.xz \
&& rm $clang_ver.tar.xz
diff --git a/tcwg-base/tcwg-llvmbot/run.sh b/tcwg-base/tcwg-llvmbot/run.sh
index e22b1fd..3aa5cb2 100755
--- a/tcwg-base/tcwg-llvmbot/run.sh
+++ b/tcwg-base/tcwg-llvmbot/run.sh
@@ -25,10 +25,10 @@ fi
case "$(uname -m)" in
aarch64)
- clang_ver=clang+llvm-5.0.1-aarch64-linux-gnu
+ clang_ver=clang+llvm-6.0.0-aarch64-linux-gnu
;;
*)
- clang_ver=clang+llvm-5.0.1-armv7a-linux-gnueabihf
+ clang_ver=clang+llvm-6.0.0-armv7a-linux-gnueabihf
;;
esac
@@ -37,7 +37,7 @@ if bare_metal_bot_p "$2"; then
# bots.
(
cd /usr/local
- wget -c --progress=dot:giga http://releases.llvm.org/5.0.1/$clang_ver.tar.xz
+ wget -c --progress=dot:giga http://releases.llvm.org/6.0.0/$clang_ver.tar.xz
tar xf $clang_ver.tar.xz
)
fi
diff --git a/tcwg-base/tcwg-llvmbot/start.sh b/tcwg-base/tcwg-llvmbot/start.sh
index 2cf585a..18e5fa5 100755
--- a/tcwg-base/tcwg-llvmbot/start.sh
+++ b/tcwg-base/tcwg-llvmbot/start.sh
@@ -39,8 +39,6 @@ case "$buildmaster" in
masterurl="$buildmaster"
esac
-# CXX, LLD and LNT bots need additional configuration, and
-# are not supported yet.
case "$mastername:$slavename:$(hostname):$image" in
# No restrictions for custom masters:
custom:*:*:*) ;;
@@ -48,13 +46,22 @@ case "$mastername:$slavename:$(hostname):$image" in
silent:*:linaro-armv8-*:*) ;;
silent:*:r*-a*:*) ;;
# Restrictions for the normal master:
- normal:*:linaro-armv8-*:*) ;;
+ normal:linaro-armv8-*-arm-*:linaro-armv8-*:*-armhf-*) ;;
+ normal:linaro-armv8-*-aarch64-*:linaro-armv8-*:*-arm64-*) ;;
normal:*:r*-a*:*-arm64-*) ;;
*)
usage "ERROR: Wrong mastername:slavename:hostname:image combination: $mastername:$slavename:$(hostname):$image"
;;
esac
+# Set relative CPU weight of containers running silent bots to 1/20th of
+# normal containers. We want to run a full set of silent bots for
+# troubleshooting purposes, but don't want to waste a lot of CPU cycles.
+case "$mastername" in
+ "silent") cpu_shares=50 ;;
+ *) cpu_shares=1000 ;;
+esac
+
case "$slavename" in
linaro-armv8-*)
# Use 64G out of 128G.
@@ -79,4 +86,4 @@ esac
# seccomp:unconfined is required to disable ASLR for sanitizer tests.
caps="--cap-add=IPC_LOCK --cap-add=SYS_PTRACE --security-opt seccomp:unconfined"
-$DOCKER run --name=$mastername-$slavename --hostname=$mastername-$slavename --restart=unless-stopped -dt -p 22 --memory=${memlimit}G --pids-limit=$pids_limit $caps "$image" "$masterurl" "$slavename" "$password"
+$DOCKER run --name=$mastername-$slavename --hostname=$mastername-$slavename --restart=unless-stopped -dt -p 22 --cpu-shares=$cpu_shares --memory=${memlimit}G --pids-limit=$pids_limit $caps "$image" "$masterurl" "$slavename" "$password"
diff --git a/trusty-amd64-tcwg-base/Dockerfile b/trusty-amd64-tcwg-base/Dockerfile
index 8f491ed..f94d7e9 100644
--- a/trusty-amd64-tcwg-base/Dockerfile
+++ b/trusty-amd64-tcwg-base/Dockerfile
@@ -18,6 +18,7 @@ RUN (url="http://archive.ubuntu.com/ubuntu/"; \
autogen \
automake \
bc \
+ bind9-host \
bison \
binutils-aarch64-linux-gnu \
binutils-arm-linux-gnueabihf \
@@ -124,4 +125,4 @@ VOLUME /tmp
EXPOSE 22
CMD ["/usr/sbin/sshd", "-D"]
-# checksum: af7e4ca6d6d6f9e6cb0d1eb355552d2b
+# checksum: 59a3af373c3253df2b6690a0c202f412
diff --git a/trusty-amd64-tcwg-base/trusty-amd64-tcwg-build/Dockerfile b/trusty-amd64-tcwg-base/trusty-amd64-tcwg-build/Dockerfile
index 3963ce4..280e8c9 100644
--- a/trusty-amd64-tcwg-base/trusty-amd64-tcwg-build/Dockerfile
+++ b/trusty-amd64-tcwg-base/trusty-amd64-tcwg-build/Dockerfile
@@ -1,11 +1,10 @@
# Auto generated from tcwg-base/tcwg-build/Dockerfile.in. Do not edit.
FROM linaro/ci-amd64-tcwg-base-ubuntu: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 \
- && echo '%tcwg-infra ALL = NOPASSWD: ALL' > /etc/sudoers.d/jenkins \
- && chmod 0440 /etc/sudoers.d/jenkins \
+COPY new-user.sh /usr/local/bin/
+
+RUN new-user.sh --user tcwg-buildslave:11827 --group tcwg-infra:9000 \
+ && new-user.sh --user tcwg-benchmark:12326 --group tcwg-infra \
&& mkdir -p /home/tcwg-buildslave/workspace
COPY tcwg-buildslave /home/tcwg-buildslave
@@ -28,4 +27,4 @@ RUN \
/var/lib/apt/lists/* \
/tmp/* \
/var/tmp/*
-# checksum: e043d076e8a7fca8b61124ede2bd2461
+# checksum: 847950907becd4d2e0bb2246eed17943
diff --git a/trusty-arm64-tcwg-base/Dockerfile b/trusty-arm64-tcwg-base/Dockerfile
index 13caa85..6936626 100644
--- a/trusty-arm64-tcwg-base/Dockerfile
+++ b/trusty-arm64-tcwg-base/Dockerfile
@@ -18,6 +18,7 @@ RUN (url="http://ports.ubuntu.com/ubuntu-ports/"; \
autogen \
automake \
bc \
+ bind9-host \
bison \
bsd-mailx \
build-essential \
@@ -108,4 +109,4 @@ VOLUME /tmp
EXPOSE 22
CMD ["/usr/sbin/sshd", "-D"]
-# checksum: e5c75d721eaaad378dfe783d822bc457
+# checksum: b553e4f699f9eb1c2496451be411f503
diff --git a/trusty-arm64-tcwg-base/trusty-arm64-tcwg-build/Dockerfile b/trusty-arm64-tcwg-base/trusty-arm64-tcwg-build/Dockerfile
index b75535f..91ca996 100644
--- a/trusty-arm64-tcwg-base/trusty-arm64-tcwg-build/Dockerfile
+++ b/trusty-arm64-tcwg-base/trusty-arm64-tcwg-build/Dockerfile
@@ -1,11 +1,10 @@
# Auto generated from tcwg-base/tcwg-build/Dockerfile.in. Do not edit.
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 \
- && 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 \
+COPY new-user.sh /usr/local/bin/
+
+RUN new-user.sh --user tcwg-buildslave:11827 --group tcwg-infra:9000 \
+ && new-user.sh --user tcwg-benchmark:12326 --group tcwg-infra \
&& mkdir -p /home/tcwg-buildslave/workspace
COPY tcwg-buildslave /home/tcwg-buildslave
@@ -16,4 +15,4 @@ RUN chown -R tcwg-buildslave:tcwg-infra /home/tcwg-buildslave/ \
&& chmod 0700 /home/tcwg-buildslave/.ssh/ /home/tcwg-benchmark/.ssh/ \
&& chmod 0600 /home/tcwg-buildslave/.ssh/* /home/tcwg-benchmark/.ssh/*
-# checksum: 599fae0a5672c9f658bf2b0af0ab31e3
+# checksum: d46dab616715909f84717ae49d7542b9
diff --git a/trusty-arm64-tcwg-base/trusty-arm64-tcwg-build/trusty-arm64-tcwg-test/Dockerfile b/trusty-arm64-tcwg-base/trusty-arm64-tcwg-build/trusty-arm64-tcwg-test/Dockerfile
index 55869b6..ca30d59 100644
--- a/trusty-arm64-tcwg-base/trusty-arm64-tcwg-build/trusty-arm64-tcwg-test/Dockerfile
+++ b/trusty-arm64-tcwg-base/trusty-arm64-tcwg-build/trusty-arm64-tcwg-test/Dockerfile
@@ -1,9 +1,3 @@
# Auto generated from tcwg-base/tcwg-build/tcwg-test/Dockerfile.in. Do not edit.
FROM linaro/ci-arm64-tcwg-build-ubuntu:trusty
-
-COPY tcwg-buildslave/.ssh /root/.ssh
-
-RUN chmod 0700 /root/.ssh/ \
- && sed -i -e "/.*PermitRootLogin.*/d" /etc/ssh/sshd_config \
- && echo "PermitRootLogin without-password" >> /etc/ssh/sshd_config
-# checksum: dc8c825d9bfcc23ca4d58280831726a6
+# checksum: 9422b5574e263e99fc78be0b7d04466f
diff --git a/trusty-armhf-tcwg-base/Dockerfile b/trusty-armhf-tcwg-base/Dockerfile
index 3c0712a..4441771 100644
--- a/trusty-armhf-tcwg-base/Dockerfile
+++ b/trusty-armhf-tcwg-base/Dockerfile
@@ -18,6 +18,7 @@ RUN (url="http://ports.ubuntu.com/ubuntu-ports/"; \
autogen \
automake \
bc \
+ bind9-host \
bison \
bsd-mailx \
build-essential \
@@ -108,4 +109,4 @@ VOLUME /tmp
EXPOSE 22
CMD ["linux32", "/usr/sbin/sshd", "-D"]
-# checksum: 5dbfe6c719dd6703289bbd58fa3aad86
+# checksum: a86a75795b6252fa520a5d910dd3697f
diff --git a/trusty-armhf-tcwg-base/trusty-armhf-tcwg-build/Dockerfile b/trusty-armhf-tcwg-base/trusty-armhf-tcwg-build/Dockerfile
index 91557ee..d1fbe12 100644
--- a/trusty-armhf-tcwg-base/trusty-armhf-tcwg-build/Dockerfile
+++ b/trusty-armhf-tcwg-base/trusty-armhf-tcwg-build/Dockerfile
@@ -1,11 +1,10 @@
# Auto generated from tcwg-base/tcwg-build/Dockerfile.in. Do not edit.
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 \
- && 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 \
+COPY new-user.sh /usr/local/bin/
+
+RUN new-user.sh --user tcwg-buildslave:11827 --group tcwg-infra:9000 \
+ && new-user.sh --user tcwg-benchmark:12326 --group tcwg-infra \
&& mkdir -p /home/tcwg-buildslave/workspace
COPY tcwg-buildslave /home/tcwg-buildslave
@@ -16,4 +15,4 @@ RUN chown -R tcwg-buildslave:tcwg-infra /home/tcwg-buildslave/ \
&& chmod 0700 /home/tcwg-buildslave/.ssh/ /home/tcwg-benchmark/.ssh/ \
&& chmod 0600 /home/tcwg-buildslave/.ssh/* /home/tcwg-benchmark/.ssh/*
-# checksum: 16c7b81789c72e4ca4703f9e020406a8
+# checksum: 719915c4d53c3aaff4bfb874ca144542
diff --git a/trusty-armhf-tcwg-base/trusty-armhf-tcwg-build/trusty-armhf-tcwg-test/Dockerfile b/trusty-armhf-tcwg-base/trusty-armhf-tcwg-build/trusty-armhf-tcwg-test/Dockerfile
index 15ea46c..0470c12 100644
--- a/trusty-armhf-tcwg-base/trusty-armhf-tcwg-build/trusty-armhf-tcwg-test/Dockerfile
+++ b/trusty-armhf-tcwg-base/trusty-armhf-tcwg-build/trusty-armhf-tcwg-test/Dockerfile
@@ -1,9 +1,3 @@
# Auto generated from tcwg-base/tcwg-build/tcwg-test/Dockerfile.in. Do not edit.
FROM linaro/ci-armhf-tcwg-build-ubuntu:trusty
-
-COPY tcwg-buildslave/.ssh /root/.ssh
-
-RUN chmod 0700 /root/.ssh/ \
- && sed -i -e "/.*PermitRootLogin.*/d" /etc/ssh/sshd_config \
- && echo "PermitRootLogin without-password" >> /etc/ssh/sshd_config
-# checksum: 9583d23d885b59e3b3a3f2e6b3e44c38
+# checksum: ba9a6291dad3e62ee683c694534ec286
diff --git a/trusty-i386-tcwg-base/Dockerfile b/trusty-i386-tcwg-base/Dockerfile
index 772b886..a7e0812 100644
--- a/trusty-i386-tcwg-base/Dockerfile
+++ b/trusty-i386-tcwg-base/Dockerfile
@@ -20,6 +20,7 @@ RUN (url="http://archive.ubuntu.com/ubuntu/"; \
autogen \
automake \
bc \
+ bind9-host \
bison \
binutils-aarch64-linux-gnu \
binutils-arm-linux-gnueabihf \
@@ -125,4 +126,4 @@ VOLUME /tmp
EXPOSE 22
CMD ["linux32", "/usr/sbin/sshd", "-D"]
-# checksum: 9cc4a9abc883fa7442bd3e05926e6c5a
+# checksum: b2adc55929fd7872882ce7c1ee55a26f
diff --git a/trusty-i386-tcwg-base/trusty-i386-tcwg-build/Dockerfile b/trusty-i386-tcwg-base/trusty-i386-tcwg-build/Dockerfile
index 74c8557..b559b08 100644
--- a/trusty-i386-tcwg-base/trusty-i386-tcwg-build/Dockerfile
+++ b/trusty-i386-tcwg-base/trusty-i386-tcwg-build/Dockerfile
@@ -1,11 +1,10 @@
# Auto generated from tcwg-base/tcwg-build/Dockerfile.in. Do not edit.
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 \
- && 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 \
+COPY new-user.sh /usr/local/bin/
+
+RUN new-user.sh --user tcwg-buildslave:11827 --group tcwg-infra:9000 \
+ && new-user.sh --user tcwg-benchmark:12326 --group tcwg-infra \
&& mkdir -p /home/tcwg-buildslave/workspace
COPY tcwg-buildslave /home/tcwg-buildslave
@@ -27,4 +26,4 @@ RUN \
/var/lib/apt/lists/* \
/tmp/* \
/var/tmp/*
-# checksum: 50b70f6f0b7cf04d865d6a472c00f215
+# checksum: ba06b8439f636dc78d7968329afbf02e
diff --git a/xenial-amd64-tcwg-base/Dockerfile b/xenial-amd64-tcwg-base/Dockerfile
index 689ce9f..665253d 100644
--- a/xenial-amd64-tcwg-base/Dockerfile
+++ b/xenial-amd64-tcwg-base/Dockerfile
@@ -18,6 +18,7 @@ RUN (url="http://archive.ubuntu.com/ubuntu/"; \
autogen \
automake \
bc \
+ bind9-host \
bison \
binutils-aarch64-linux-gnu \
binutils-arm-linux-gnueabihf \
@@ -123,4 +124,4 @@ VOLUME /tmp
EXPOSE 22
CMD ["/usr/sbin/sshd", "-D"]
-# checksum: d381fae7ceb3f0bd3c0b2db9b11d68df
+# checksum: 2c4f845b0ea5b96fda4b80ebee0c24f2
diff --git a/xenial-amd64-tcwg-base/xenial-amd64-tcwg-build/Dockerfile b/xenial-amd64-tcwg-base/xenial-amd64-tcwg-build/Dockerfile
index 23b8fb7..58b1c17 100644
--- a/xenial-amd64-tcwg-base/xenial-amd64-tcwg-build/Dockerfile
+++ b/xenial-amd64-tcwg-base/xenial-amd64-tcwg-build/Dockerfile
@@ -1,11 +1,10 @@
# Auto generated from tcwg-base/tcwg-build/Dockerfile.in. Do not edit.
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 \
- && 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 \
+COPY new-user.sh /usr/local/bin/
+
+RUN new-user.sh --user tcwg-buildslave:11827 --group tcwg-infra:9000 \
+ && new-user.sh --user tcwg-benchmark:12326 --group tcwg-infra \
&& mkdir -p /home/tcwg-buildslave/workspace
COPY tcwg-buildslave /home/tcwg-buildslave
@@ -28,4 +27,4 @@ RUN \
/var/lib/apt/lists/* \
/tmp/* \
/var/tmp/*
-# checksum: 0f60af30bf7b204b2997d062f2291e04
+# checksum: c2cb73fc80affc8312b1959673d8767c
diff --git a/xenial-arm64-tcwg-base/Dockerfile b/xenial-arm64-tcwg-base/Dockerfile
index ae57aac..74a0824 100644
--- a/xenial-arm64-tcwg-base/Dockerfile
+++ b/xenial-arm64-tcwg-base/Dockerfile
@@ -18,6 +18,7 @@ RUN (url="http://ports.ubuntu.com/ubuntu-ports/"; \
autogen \
automake \
bc \
+ bind9-host \
bison \
bsd-mailx \
build-essential \
@@ -109,4 +110,4 @@ VOLUME /tmp
EXPOSE 22
CMD ["/usr/sbin/sshd", "-D"]
-# checksum: 664a02e76943616cb7d23c836accbae2
+# checksum: bb32f5a03bcc7864035ebc495cde2ea4
diff --git a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-build/Dockerfile b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-build/Dockerfile
index 05baa4f..989ef31 100644
--- a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-build/Dockerfile
+++ b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-build/Dockerfile
@@ -1,11 +1,10 @@
# Auto generated from tcwg-base/tcwg-build/Dockerfile.in. Do not edit.
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 \
- && 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 \
+COPY new-user.sh /usr/local/bin/
+
+RUN new-user.sh --user tcwg-buildslave:11827 --group tcwg-infra:9000 \
+ && new-user.sh --user tcwg-benchmark:12326 --group tcwg-infra \
&& mkdir -p /home/tcwg-buildslave/workspace
COPY tcwg-buildslave /home/tcwg-buildslave
@@ -16,4 +15,4 @@ RUN chown -R tcwg-buildslave:tcwg-infra /home/tcwg-buildslave/ \
&& chmod 0700 /home/tcwg-buildslave/.ssh/ /home/tcwg-benchmark/.ssh/ \
&& chmod 0600 /home/tcwg-buildslave/.ssh/* /home/tcwg-benchmark/.ssh/*
-# checksum: 50d4c4360a7ee4779da324ce515f04de
+# checksum: a9bb4838879761da324a80f74d713b07
diff --git a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-build/xenial-arm64-tcwg-test/Dockerfile b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-build/xenial-arm64-tcwg-test/Dockerfile
index ef1ce19..952f96f 100644
--- a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-build/xenial-arm64-tcwg-test/Dockerfile
+++ b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-build/xenial-arm64-tcwg-test/Dockerfile
@@ -1,9 +1,3 @@
# Auto generated from tcwg-base/tcwg-build/tcwg-test/Dockerfile.in. Do not edit.
FROM linaro/ci-arm64-tcwg-build-ubuntu:xenial
-
-COPY tcwg-buildslave/.ssh /root/.ssh
-
-RUN chmod 0700 /root/.ssh/ \
- && sed -i -e "/.*PermitRootLogin.*/d" /etc/ssh/sshd_config \
- && echo "PermitRootLogin without-password" >> /etc/ssh/sshd_config
-# checksum: 9d6f202aa1c9a2f4391cb0687d75c45a
+# checksum: 1436e0944c7c12d79aa2606ebd123b6d
diff --git a/xenial-armhf-tcwg-base/Dockerfile b/xenial-armhf-tcwg-base/Dockerfile
index 38ebf84..cb31568 100644
--- a/xenial-armhf-tcwg-base/Dockerfile
+++ b/xenial-armhf-tcwg-base/Dockerfile
@@ -18,6 +18,7 @@ RUN (url="http://ports.ubuntu.com/ubuntu-ports/"; \
autogen \
automake \
bc \
+ bind9-host \
bison \
bsd-mailx \
build-essential \
@@ -109,4 +110,4 @@ VOLUME /tmp
EXPOSE 22
CMD ["linux32", "/usr/sbin/sshd", "-D"]
-# checksum: 32595bbead434c67c37058718d33e771
+# checksum: 23b30d538e449e7d3a20a0253ac38224
diff --git a/xenial-armhf-tcwg-base/xenial-armhf-tcwg-build/Dockerfile b/xenial-armhf-tcwg-base/xenial-armhf-tcwg-build/Dockerfile
index b53f1ad..d685b29 100644
--- a/xenial-armhf-tcwg-base/xenial-armhf-tcwg-build/Dockerfile
+++ b/xenial-armhf-tcwg-base/xenial-armhf-tcwg-build/Dockerfile
@@ -1,11 +1,10 @@
# Auto generated from tcwg-base/tcwg-build/Dockerfile.in. Do not edit.
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 \
- && 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 \
+COPY new-user.sh /usr/local/bin/
+
+RUN new-user.sh --user tcwg-buildslave:11827 --group tcwg-infra:9000 \
+ && new-user.sh --user tcwg-benchmark:12326 --group tcwg-infra \
&& mkdir -p /home/tcwg-buildslave/workspace
COPY tcwg-buildslave /home/tcwg-buildslave
@@ -16,4 +15,4 @@ RUN chown -R tcwg-buildslave:tcwg-infra /home/tcwg-buildslave/ \
&& chmod 0700 /home/tcwg-buildslave/.ssh/ /home/tcwg-benchmark/.ssh/ \
&& chmod 0600 /home/tcwg-buildslave/.ssh/* /home/tcwg-benchmark/.ssh/*
-# checksum: ee083c05a3f3b2c07c38fb1dd87df413
+# checksum: 8dcea6cdeb064fe01ee369351717080c
diff --git a/xenial-armhf-tcwg-base/xenial-armhf-tcwg-build/xenial-armhf-tcwg-test/Dockerfile b/xenial-armhf-tcwg-base/xenial-armhf-tcwg-build/xenial-armhf-tcwg-test/Dockerfile
index 9f4b650..8a8e915 100644
--- a/xenial-armhf-tcwg-base/xenial-armhf-tcwg-build/xenial-armhf-tcwg-test/Dockerfile
+++ b/xenial-armhf-tcwg-base/xenial-armhf-tcwg-build/xenial-armhf-tcwg-test/Dockerfile
@@ -1,9 +1,3 @@
# Auto generated from tcwg-base/tcwg-build/tcwg-test/Dockerfile.in. Do not edit.
FROM linaro/ci-armhf-tcwg-build-ubuntu:xenial
-
-COPY tcwg-buildslave/.ssh /root/.ssh
-
-RUN chmod 0700 /root/.ssh/ \
- && sed -i -e "/.*PermitRootLogin.*/d" /etc/ssh/sshd_config \
- && echo "PermitRootLogin without-password" >> /etc/ssh/sshd_config
-# checksum: 3f70f196ffb86f43cdc7369b271c8c1d
+# checksum: 6f5073d1b3f36b007bfe01d60817d61f
diff --git a/xenial-i386-tcwg-base/Dockerfile b/xenial-i386-tcwg-base/Dockerfile
index 4bb386b..496d119 100644
--- a/xenial-i386-tcwg-base/Dockerfile
+++ b/xenial-i386-tcwg-base/Dockerfile
@@ -20,6 +20,7 @@ RUN (url="http://archive.ubuntu.com/ubuntu/"; \
autogen \
automake \
bc \
+ bind9-host \
bison \
binutils-aarch64-linux-gnu \
binutils-arm-linux-gnueabihf \
@@ -125,4 +126,4 @@ VOLUME /tmp
EXPOSE 22
CMD ["linux32", "/usr/sbin/sshd", "-D"]
-# checksum: 1968f52549a5f3844adbd1d98a8ad7da
+# checksum: cb6ee278c0423b5434e71afdb95b02d8
diff --git a/xenial-i386-tcwg-base/xenial-i386-tcwg-build/Dockerfile b/xenial-i386-tcwg-base/xenial-i386-tcwg-build/Dockerfile
index 0d926f9..b105a15 100644
--- a/xenial-i386-tcwg-base/xenial-i386-tcwg-build/Dockerfile
+++ b/xenial-i386-tcwg-base/xenial-i386-tcwg-build/Dockerfile
@@ -1,11 +1,10 @@
# Auto generated from tcwg-base/tcwg-build/Dockerfile.in. Do not edit.
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 \
- && 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 \
+COPY new-user.sh /usr/local/bin/
+
+RUN new-user.sh --user tcwg-buildslave:11827 --group tcwg-infra:9000 \
+ && new-user.sh --user tcwg-benchmark:12326 --group tcwg-infra \
&& mkdir -p /home/tcwg-buildslave/workspace
COPY tcwg-buildslave /home/tcwg-buildslave
@@ -27,4 +26,4 @@ RUN \
/var/lib/apt/lists/* \
/tmp/* \
/var/tmp/*
-# checksum: dca3033a9d14f6f55c1ec182817af115
+# checksum: c4d98a96007fb76a7e5c6114053a3c87