From ccf09ae7a6ad0336e7177c62544e4472790a2d0b Mon Sep 17 00:00:00 2001 From: Maxim Kuvyrkov Date: Thu, 3 May 2018 11:49:00 +0000 Subject: tcwg-llvmbot: Update comments and sanity checks in start.sh Change-Id: I01b2a3b98dfff590e0b24856d79c698a889afbff --- tcwg-base/tcwg-llvmbot/start.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tcwg-base/tcwg-llvmbot/start.sh b/tcwg-base/tcwg-llvmbot/start.sh index 2cf585ad..35e167e0 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,7 +46,8 @@ 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" -- cgit v1.2.3 From 08b40433c9b269e88d7e74c802be50e3464fa4d2 Mon Sep 17 00:00:00 2001 From: Maxim Kuvyrkov Date: Thu, 3 May 2018 11:49:46 +0000 Subject: tcwg-base: Add bind9-host package ... for the sake of jenkins-scripts.git:jenkins-helpers.sh. Change-Id: I6418837d9101f2f39f4f38e60eefa1e94287bca7 --- tcwg-base/Dockerfile.in | 1 + trusty-amd64-tcwg-base/Dockerfile | 3 ++- trusty-arm64-tcwg-base/Dockerfile | 3 ++- trusty-armhf-tcwg-base/Dockerfile | 3 ++- trusty-i386-tcwg-base/Dockerfile | 3 ++- xenial-amd64-tcwg-base/Dockerfile | 3 ++- xenial-arm64-tcwg-base/Dockerfile | 3 ++- xenial-armhf-tcwg-base/Dockerfile | 3 ++- xenial-i386-tcwg-base/Dockerfile | 3 ++- 9 files changed, 17 insertions(+), 8 deletions(-) diff --git a/tcwg-base/Dockerfile.in b/tcwg-base/Dockerfile.in index 9efe3d67..6abf52dd 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/trusty-amd64-tcwg-base/Dockerfile b/trusty-amd64-tcwg-base/Dockerfile index 8f491edc..f94d7e95 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-arm64-tcwg-base/Dockerfile b/trusty-arm64-tcwg-base/Dockerfile index 13caa85f..69366269 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-armhf-tcwg-base/Dockerfile b/trusty-armhf-tcwg-base/Dockerfile index 3c0712a0..4441771d 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-i386-tcwg-base/Dockerfile b/trusty-i386-tcwg-base/Dockerfile index 772b886c..a7e08128 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/xenial-amd64-tcwg-base/Dockerfile b/xenial-amd64-tcwg-base/Dockerfile index 689ce9f8..665253db 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-arm64-tcwg-base/Dockerfile b/xenial-arm64-tcwg-base/Dockerfile index ae57aac1..74a08245 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-armhf-tcwg-base/Dockerfile b/xenial-armhf-tcwg-base/Dockerfile index 38ebf847..cb315681 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-i386-tcwg-base/Dockerfile b/xenial-i386-tcwg-base/Dockerfile index 4bb386b7..496d119d 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 -- cgit v1.2.3 From 8fae4965bc1908f5dab1673d138c2ae567504c40 Mon Sep 17 00:00:00 2001 From: Maxim Kuvyrkov Date: Mon, 7 May 2018 14:53:55 +0000 Subject: tcwg-test: Disable "root" login. ABE no longer requires "root" ssh access, it uses "sudo" now. Change-Id: I62bd6b3d0bbce37a942d4328a70c0e0293708da0 --- tcwg-base/tcwg-build/tcwg-test/Dockerfile.in | 6 ------ .../trusty-arm64-tcwg-build/trusty-arm64-tcwg-test/Dockerfile | 8 +------- .../trusty-armhf-tcwg-build/trusty-armhf-tcwg-test/Dockerfile | 8 +------- .../xenial-arm64-tcwg-build/xenial-arm64-tcwg-test/Dockerfile | 8 +------- .../xenial-armhf-tcwg-build/xenial-armhf-tcwg-test/Dockerfile | 8 +------- 5 files changed, 4 insertions(+), 34 deletions(-) diff --git a/tcwg-base/tcwg-build/tcwg-test/Dockerfile.in b/tcwg-base/tcwg-build/tcwg-test/Dockerfile.in index be59e965..cb7a1369 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/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 55869b62..ca30d593 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/trusty-armhf-tcwg-build/trusty-armhf-tcwg-test/Dockerfile b/trusty-armhf-tcwg-base/trusty-armhf-tcwg-build/trusty-armhf-tcwg-test/Dockerfile index 15ea46ce..0470c125 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/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 ef1ce192..952f96f4 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/xenial-armhf-tcwg-build/xenial-armhf-tcwg-test/Dockerfile b/xenial-armhf-tcwg-base/xenial-armhf-tcwg-build/xenial-armhf-tcwg-test/Dockerfile index 9f4b650f..8a8e9155 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 -- cgit v1.2.3 From 838978c9ffa6b7c73dc0bfe4e3ee72371a058fa9 Mon Sep 17 00:00:00 2001 From: Benjamin Copeland Date: Tue, 8 May 2018 12:03:12 +0100 Subject: LLP: Update docker_run.sh Move the collectstatic and migration out of the block so we can use it in both DEBUG and Production mode Change-Id: Id725dee008cc19fe27f92dd6f1031031700000ec --- ci-amd64-llp-alpine/docker_run.sh | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/ci-amd64-llp-alpine/docker_run.sh b/ci-amd64-llp-alpine/docker_run.sh index 52c27ae1..8e35b7a4 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 -- cgit v1.2.3 From a9e49ea875f56fb71cb694dd6b73dff5a8ec535e Mon Sep 17 00:00:00 2001 From: Benjamin Copeland Date: Thu, 10 May 2018 08:07:48 +0100 Subject: Jenkins: Upgrade to latest LTS Change-Id: I24aa112dfd51e07e15a2b902ba91c20f2fbc9819 --- jessie-amd64-jenkins-master/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jessie-amd64-jenkins-master/Dockerfile b/jessie-amd64-jenkins-master/Dockerfile index 85abad56..dd51062e 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" -- cgit v1.2.3 From 4f37117e32a4d6b8d915e6b95c9cab0994436539 Mon Sep 17 00:00:00 2001 From: Maxim Kuvyrkov Date: Fri, 11 May 2018 12:10:49 +0000 Subject: tcwg-llvmbot: Set CPU weight of silent bots to 1/20th of normal bots. Change-Id: I6d32df8d83cf214a50ce350ef0ffb26432cb18a3 --- tcwg-base/tcwg-llvmbot/start.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tcwg-base/tcwg-llvmbot/start.sh b/tcwg-base/tcwg-llvmbot/start.sh index 35e167e0..18e5fa50 100755 --- a/tcwg-base/tcwg-llvmbot/start.sh +++ b/tcwg-base/tcwg-llvmbot/start.sh @@ -54,6 +54,14 @@ case "$mastername:$slavename:$(hostname):$image" in ;; 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. @@ -78,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" -- cgit v1.2.3 From 702513b895ce183dce59becc8fae6ebb085e43a2 Mon Sep 17 00:00:00 2001 From: Maxim Kuvyrkov Date: Fri, 11 May 2018 12:29:59 +0000 Subject: tcwg-build: Add new script new-user.sh ... and use it to create users inside containers. Change-Id: Ic00d13c30ad6e8a4a613040fa76537eec7e1ad97 --- tcwg-base/tcwg-build/Dockerfile.in | 9 ++-- tcwg-base/tcwg-build/build.sh | 3 +- tcwg-base/tcwg-build/new-user.sh | 55 ++++++++++++++++++++++ .../trusty-amd64-tcwg-build/Dockerfile | 11 ++--- .../trusty-arm64-tcwg-build/Dockerfile | 11 ++--- .../trusty-armhf-tcwg-build/Dockerfile | 11 ++--- .../trusty-i386-tcwg-build/Dockerfile | 11 ++--- .../xenial-amd64-tcwg-build/Dockerfile | 11 ++--- .../xenial-arm64-tcwg-build/Dockerfile | 11 ++--- .../xenial-armhf-tcwg-build/Dockerfile | 11 ++--- .../xenial-i386-tcwg-build/Dockerfile | 11 ++--- 11 files changed, 101 insertions(+), 54 deletions(-) create mode 100755 tcwg-base/tcwg-build/new-user.sh diff --git a/tcwg-base/tcwg-build/Dockerfile.in b/tcwg-base/tcwg-build/Dockerfile.in index 5d620d23..39ef4f39 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 8624b7fd..99795026 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 00000000..ff191814 --- /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/trusty-amd64-tcwg-base/trusty-amd64-tcwg-build/Dockerfile b/trusty-amd64-tcwg-base/trusty-amd64-tcwg-build/Dockerfile index 3963ce4d..280e8c91 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/trusty-arm64-tcwg-build/Dockerfile b/trusty-arm64-tcwg-base/trusty-arm64-tcwg-build/Dockerfile index b75535f4..91ca9969 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-armhf-tcwg-base/trusty-armhf-tcwg-build/Dockerfile b/trusty-armhf-tcwg-base/trusty-armhf-tcwg-build/Dockerfile index 91557eee..d1fbe12b 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-i386-tcwg-base/trusty-i386-tcwg-build/Dockerfile b/trusty-i386-tcwg-base/trusty-i386-tcwg-build/Dockerfile index 74c8557b..b559b08d 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/xenial-amd64-tcwg-build/Dockerfile b/xenial-amd64-tcwg-base/xenial-amd64-tcwg-build/Dockerfile index 23b8fb7b..58b1c170 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/xenial-arm64-tcwg-build/Dockerfile b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-build/Dockerfile index 05baa4f3..989ef31e 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-armhf-tcwg-base/xenial-armhf-tcwg-build/Dockerfile b/xenial-armhf-tcwg-base/xenial-armhf-tcwg-build/Dockerfile index b53f1ad8..d685b29a 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-i386-tcwg-base/xenial-i386-tcwg-build/Dockerfile b/xenial-i386-tcwg-base/xenial-i386-tcwg-build/Dockerfile index 0d926f9b..b105a155 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 -- cgit v1.2.3 From 0b4d6ce1fcec3d1dc53eac60784ffa2fcb80d011 Mon Sep 17 00:00:00 2001 From: Benjamin Copeland Date: Thu, 10 May 2018 10:45:52 +0100 Subject: Jenkins: Update plugins Update plugins, minor point versions. Change-Id: Ib80a71ecafd301786f22444e23e6520450334227 --- jessie-amd64-jenkins-master/plugins.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/jessie-amd64-jenkins-master/plugins.txt b/jessie-amd64-jenkins-master/plugins.txt index a8f30a58..a435645d 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 -- cgit v1.2.3 From bd8dbb89e84c932c343827bb1898c11d47dd1367 Mon Sep 17 00:00:00 2001 From: Maxim Kuvyrkov Date: Tue, 15 May 2018 11:19:09 +0000 Subject: tcwg-build: Fix shell expansion in new-user.sh. Change-Id: I08cf5586cdbb0b22e79284c27b4cf2b1d59bb3cf --- tcwg-base/tcwg-build/new-user.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tcwg-base/tcwg-build/new-user.sh b/tcwg-base/tcwg-build/new-user.sh index ff191814..d1b18953 100755 --- a/tcwg-base/tcwg-build/new-user.sh +++ b/tcwg-base/tcwg-build/new-user.sh @@ -44,7 +44,7 @@ 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 +echo "$user ALL = NOPASSWD: ALL" > $sudoers_file chmod 0440 $sudoers_file if [ x"$key" != x"" ] ; then -- cgit v1.2.3 From c2d068d4b7b28cb6f4f52f30a4973f025f35f781 Mon Sep 17 00:00:00 2001 From: Prathamesh Kulkarni Date: Thu, 17 May 2018 11:34:49 +0200 Subject: tcwg-dev: Check if image option is provided. Change-Id: If113c7b9ce57cf15bac15f9b306f37a89cd749ab --- tcwg-base/tcwg-dev/start.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tcwg-base/tcwg-dev/start.sh b/tcwg-base/tcwg-dev/start.sh index e36c8516..4eb721dc 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. -- cgit v1.2.3 From aa44a90f499ececb3ccc594ba5a730771f885c50 Mon Sep 17 00:00:00 2001 From: Prathamesh Kulkarni Date: Thu, 17 May 2018 10:11:56 +0000 Subject: Replace multiple echos with cat. Change-Id: I5779388836159ec90e68ac0caefcfd23ca6e3811 --- tcwg-base/tcwg-dev/start.sh | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/tcwg-base/tcwg-dev/start.sh b/tcwg-base/tcwg-dev/start.sh index 4eb721dc..b06c8bba 100755 --- a/tcwg-base/tcwg-dev/start.sh +++ b/tcwg-base/tcwg-dev/start.sh @@ -116,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 < Date: Fri, 18 May 2018 10:44:36 +0000 Subject: tcwg-base: Add "tcwg-tested" branch to gerrit-branches. Change-Id: Ie38a5da38d84d8effb9855f37984be22639246af --- tcwg-base/gerrit-branches | 1 + 1 file changed, 1 insertion(+) diff --git a/tcwg-base/gerrit-branches b/tcwg-base/gerrit-branches index 0561f3af..2afcbc2d 100644 --- a/tcwg-base/gerrit-branches +++ b/tcwg-base/gerrit-branches @@ -1,2 +1,3 @@ master tcwg-staging +tcwg-tested -- cgit v1.2.3 From 8abda302b34d21071ad8be1e6e36b86294fb71dd Mon Sep 17 00:00:00 2001 From: Yvan Roux Date: Tue, 29 May 2018 11:22:41 +0200 Subject: tcwg-llvmbot: Update Clang to 6.0.0 version. Change-Id: Ied812cda47eb4a1cdadc5e41211aad5fd704e0b6 --- tcwg-base/tcwg-llvmbot/Dockerfile.in | 6 +++--- tcwg-base/tcwg-llvmbot/run.sh | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tcwg-base/tcwg-llvmbot/Dockerfile.in b/tcwg-base/tcwg-llvmbot/Dockerfile.in index 1d0d65d4..24233ed9 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 e22b1fda..3aa5cb2a 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 -- cgit v1.2.3 From 3c5bd48e7520449c6a1f2322e3252f1a5768614a Mon Sep 17 00:00:00 2001 From: Senthil Kumaran S Date: Fri, 27 Apr 2018 15:45:24 +0530 Subject: lava-dispatcher: Docker images for both production and staging. * Re-organize the build.sh script in order to build for both production and staging repo based docker images by accepting options. * Add Dockerfile for building from staging-repo that will build on a daily basis with the latest lava-dispatcher packages made from master git branch. * Use a single entrypoint.sh file shared between both these supported builds. * Install lava-common which is required after single code base changes. * Use python3 to start lava-slave and remove timeout option. Change-Id: I23b0afce1e2ae68ee67929e48922ae7bea3ad909 --- lava/dispatcher/build.sh | 44 ++++++++ lava/dispatcher/entrypoint.sh | 105 +++++++++++++++++++ .../dispatcher/production/stretch-amd64/Dockerfile | 6 +- lava/dispatcher/production/stretch-amd64/build.sh | 19 ---- .../production/stretch-amd64/entrypoint.sh | 115 --------------------- lava/dispatcher/staging/stretch-amd64/Dockerfile | 46 +++++++++ 6 files changed, 198 insertions(+), 137 deletions(-) create mode 100755 lava/dispatcher/build.sh create mode 100755 lava/dispatcher/entrypoint.sh delete mode 100755 lava/dispatcher/production/stretch-amd64/build.sh delete mode 100755 lava/dispatcher/production/stretch-amd64/entrypoint.sh create mode 100644 lava/dispatcher/staging/stretch-amd64/Dockerfile diff --git a/lava/dispatcher/build.sh b/lava/dispatcher/build.sh new file mode 100755 index 00000000..50cab78e --- /dev/null +++ b/lava/dispatcher/build.sh @@ -0,0 +1,44 @@ +#!/bin/sh + +# An example invocation of this script would be: +# +# ./build.sh -r production -d stretch -a amd64 + +set -e + +export LANG=C + +while getopts "r:d:a:" opt; do + case $opt in + r) + REPO="$OPTARG" + ;; + d) + DISTRIBUTION="$OPTARG" + ;; + a) + ARCH="$OPTARG" + ;; + ?) + echo "Usage:" + echo "-r - repository such as production or staging" + echo "-d - distribution such as stretch" + echo "-a - architecture such as amd64" + exit 1 + ;; + esac +done + +if [ "$REPO" = staging ]; then + VERSION="latest" +else + # Get version by parsing Packages file from respective repo. + VERSION=$(wget -qO - http://images.validation.linaro.org/${REPO}-repo/dists/${DISTRIBUTION}-backports/main/binary-${ARCH}/Packages \ + | grep -A5 '^Package: lava-dispatcher' | grep '^Version: ' \ + | awk '{ print $2 }' \ + | sed 's/[~|+].*//') +fi + +image=linaro/lava-dispatcher-${REPO}-${DISTRIBUTION}-${ARCH}:${VERSION} +docker build --no-cache --pull --tag=$image -f ${REPO}/${DISTRIBUTION}-${ARCH}/Dockerfile . +echo $image > .docker-tag diff --git a/lava/dispatcher/entrypoint.sh b/lava/dispatcher/entrypoint.sh new file mode 100755 index 00000000..490f236e --- /dev/null +++ b/lava/dispatcher/entrypoint.sh @@ -0,0 +1,105 @@ +#!/usr/bin/env bash +# +# entrypoint.sh +# +# This is the default entrypoint for this image. +# +# By default, it starts lava-slave service with the values set in environment +# variable. +# +# The following environment values can be set: +# +# HOSTNAME Name of the slave +# +# MASTER Main master socket +# Example: MASTER='tcp://192.168.1.2:5556' +# +# SOCKET_ADDR Log socket +# Example: SOCKET_ADDR='tcp://192.168.1.2:5555' +# +# LOG_FILE Log file for the slave logs +# Example: LOG_FILE='/tmp/lava-slave.log' +# +# LOG_LEVEL Log level (DEBUG, ERROR, INFO, WARN); default to INFO +# Example: LOG_LEVEL='DEBUG' +# +# IPV6 Enable IPv6 +# Example: IPV6=True +# +# ENCRYPT Encrypt messages +# Example: ENCRYPT=True +# +# MASTER_CERT Master certificate file +# Example: MASTER_CERT='/etc/lava/certs/master.key' +# +# SLAVE_CERT Slave certificate file +# Example: SLAVE_CERT='/etc/lava/certs/slave.key_secret' +# +# Usages: +# /entrypoint.sh : starts the lava-slave service with environment variable +# values in place. + +if [[ -z "${HOSTNAME}" ]]; +then + HOSTNAME=`hostname` +fi + +if [[ -z "${MASTER}" ]]; +then + MASTER='tcp://localhost:5556' +fi + +if [[ -z "${SOCKET_ADDR}" ]]; +then + SOCKET_ADDR='tcp://localhost:5555' +fi + +if [[ -z "${LOG_FILE}" ]]; +then + LOG_FILE='' +else + LOG_FILE='--log-file '${LOG_FILE} +fi + +if [ -z "${LOG_LEVEL}" ] +then + LOG_LEVEL='INFO' +fi + +if [ -z "${ENCRYPT}" ] +then + ENCRYPT='' +else + ENCRYPT='--encrypt' +fi + +if [ -z "${IPV6}" ] +then + IPV6='' +else + IPV6='--ipv6' +fi + +if [ -z "${MASTER_CERT}" ] +then + MASTER_CERT='' +else + MASTER_CERT='--master-cert '${MASTER_CERT} +fi + +if [ -z "${SLAVE_CERT}" ] +then + SLAVE_CERT='' +else + SLAVE_CERT='--slave-cert '${SLAVE_CERT} +fi + +echo "Starting lava-slave with the following command:" + +echo "/usr/bin/python3 /usr/bin/lava-slave --hostname ${HOSTNAME} \ +--master ${MASTER} --socket-addr ${SOCKET_ADDR} ${LOG_FILE} \ +--level ${LOG_LEVEL} ${ENCRYPT} ${IPV6} ${MASTER_CERT} ${SLAVE_CERT}" + +/usr/bin/python3 /usr/bin/lava-slave --hostname ${HOSTNAME} \ +--master ${MASTER} --socket-addr ${SOCKET_ADDR} ${LOG_FILE} \ +--level ${LOG_LEVEL} ${ENCRYPT} ${IPV6} ${MASTER_CERT} ${SLAVE_CERT} diff --git a/lava/dispatcher/production/stretch-amd64/Dockerfile b/lava/dispatcher/production/stretch-amd64/Dockerfile index c555a9b8..4fc9110f 100644 --- a/lava/dispatcher/production/stretch-amd64/Dockerfile +++ b/lava/dispatcher/production/stretch-amd64/Dockerfile @@ -2,7 +2,7 @@ FROM debian:stretch # Docker image for LAVA dispatcher with production release. -MAINTAINER Senthil Kumaran S +LABEL maintainer="senthil.kumaran@linaro.org" # Install the required dependencies RUN echo 'locales locales/locales_to_be_generated multiselect C.UTF-8 UTF-8, en_US.UTF-8 UTF-8 ' | debconf-set-selections && \ @@ -25,7 +25,7 @@ RUN echo 'locales locales/locales_to_be_generated multiselect C.UTF-8 UTF-8, en_ export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ apt-get -y upgrade && \ - apt-get -y -t stretch-backports install lava-dispatcher \ + apt-get -y -t stretch-backports install lava-common lava-dispatcher \ lava-lxc-mocker && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* @@ -34,7 +34,7 @@ RUN echo 'locales locales/locales_to_be_generated multiselect C.UTF-8 UTF-8, en_ EXPOSE 22 # Set entrypoint script -COPY entrypoint.sh /entrypoint.sh +COPY ./entrypoint.sh /entrypoint.sh ENTRYPOINT [ "/entrypoint.sh" ] # Following is a sample docker run command to use this image diff --git a/lava/dispatcher/production/stretch-amd64/build.sh b/lava/dispatcher/production/stretch-amd64/build.sh deleted file mode 100755 index d7f69b33..00000000 --- a/lava/dispatcher/production/stretch-amd64/build.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -set -e - -export LANG=C - -DISTRIBUTION=$(basename ${PWD} | cut -f1 -d '-') -ARCHITECTURE=$(basename ${PWD} | cut -f2 -d '-') -REPO=$(basename $(dirname ${PWD})) - -# Get version by parsing Packages file from respective repo. -VERSION=$(wget -qO - http://images.validation.linaro.org/${REPO}-repo/dists/${DISTRIBUTION}-backports/main/binary-${ARCHITECTURE}/Packages \ - | grep -A5 '^Package: lava-dispatcher' | grep '^Version: ' \ - | awk '{ print $2 }' \ - | sed 's/[~|+].*//') - -image=linaro/lava-dispatcher-debian-${DISTRIBUTION}-${ARCHITECTURE}:${VERSION} -docker build --no-cache --pull --tag=$image . -echo $image > .docker-tag diff --git a/lava/dispatcher/production/stretch-amd64/entrypoint.sh b/lava/dispatcher/production/stretch-amd64/entrypoint.sh deleted file mode 100755 index 74bc9c7e..00000000 --- a/lava/dispatcher/production/stretch-amd64/entrypoint.sh +++ /dev/null @@ -1,115 +0,0 @@ -#!/usr/bin/env bash -# -# entrypoint.sh -# -# This is the default entrypoint for this image. -# -# By default, it starts lava-slave service with the values set in environment -# variable. -# -# The following environment values can be set: -# -# HOSTNAME Name of the slave -# -# MASTER Main master socket -# Example: MASTER='tcp://192.168.1.2:5556' -# -# SOCKET_ADDR Log socket -# Example: SOCKET_ADDR='tcp://192.168.1.2:5555' -# -# LOG_FILE Log file for the slave logs -# Example: LOG_FILE='/tmp/lava-slave.log' -# -# LOG_LEVEL Log level (DEBUG, ERROR, INFO, WARN); default to INFO -# Example: LOG_LEVEL='DEBUG' -# -# TIMEOUT Socket connection timeout in seconds; default to 5 -# Example: TIMEOUT=10 -# -# IPV6 Enable IPv6 -# Example: IPV6=True -# -# ENCRYPT Encrypt messages -# Example: ENCRYPT=True -# -# MASTER_CERT Master certificate file -# Example: MASTER_CERT='/etc/lava/certs/master.key' -# -# SLAVE_CERT Slave certificate file -# Example: SLAVE_CERT='/etc/lava/certs/slave.key_secret' -# -# Usages: -# /entrypoint.sh : starts the lava-slave service with environment variable -# values in place. - -if [[ -z "${HOSTNAME}" ]]; -then - HOSTNAME=`hostname` -fi - -if [[ -z "${MASTER}" ]]; -then - MASTER='tcp://localhost:5556' -fi - -if [[ -z "${SOCKET_ADDR}" ]]; -then - SOCKET_ADDR='tcp://localhost:5555' -fi - -if [[ -z "${LOG_FILE}" ]]; -then - LOG_FILE='' -else - LOG_FILE='--log-file '${LOG_FILE} -fi - -if [ -z "${LOG_LEVEL}" ] -then - LOG_LEVEL='INFO' -fi - -if [ -z "${TIMEOUT}" ] -then - TIMEOUT=5 -fi - -if [ -z "${ENCRYPT}" ] -then - ENCRYPT='' -else - ENCRYPT='--encrypt' -fi - -if [ -z "${IPV6}" ] -then - IPV6='' -else - IPV6='--ipv6' -fi - -if [ -z "${MASTER_CERT}" ] -then - MASTER_CERT='' -else - MASTER_CERT='--master-cert '${MASTER_CERT} -fi - -if [ -z "${SLAVE_CERT}" ] -then - SLAVE_CERT='' -else - SLAVE_CERT='--slave-cert '${SLAVE_CERT} -fi - -echo "Starting lava-slave with the following command:" - -echo "/usr/bin/python /usr/bin/lava-slave --hostname ${HOSTNAME} \ ---master ${MASTER} --socket-addr ${SOCKET_ADDR} ${LOG_FILE} \ ---level ${LOG_LEVEL} --timeout ${TIMEOUT} ${ENCRYPT} ${IPV6} \ -${MASTER_CERT} ${SLAVE_CERT}" - -/usr/bin/python /usr/bin/lava-slave --hostname ${HOSTNAME} \ ---master ${MASTER} --socket-addr ${SOCKET_ADDR} ${LOG_FILE} \ ---level ${LOG_LEVEL} --timeout ${TIMEOUT} ${ENCRYPT} ${IPV6} \ -${MASTER_CERT} ${SLAVE_CERT} diff --git a/lava/dispatcher/staging/stretch-amd64/Dockerfile b/lava/dispatcher/staging/stretch-amd64/Dockerfile new file mode 100644 index 00000000..f3108f3a --- /dev/null +++ b/lava/dispatcher/staging/stretch-amd64/Dockerfile @@ -0,0 +1,46 @@ +FROM debian:stretch + +# Docker image for LAVA dispatcher with master branch, built daily. + +LABEL maintainer="senthil.kumaran@linaro.org" + +# Install the required dependencies +RUN echo 'locales locales/locales_to_be_generated multiselect C.UTF-8 UTF-8, en_US.UTF-8 UTF-8 ' | debconf-set-selections && \ + echo 'locales locales/default_environment_locale select en_US.UTF-8' | debconf-set-selections && \ + export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && \ + apt-get -y upgrade && \ + apt-get -y install ntp git tftpd-hpa openbsd-inetd ser2net qemu-kvm \ + qemu-system-x86 qemu-system-arm qemu-user-static libguestfs-tools \ + nfs-kernel-server rpcbind u-boot-tools unzip xz-utils debootstrap \ + bridge-utils dfu-util img2simg emacs-nox vim gnupg2 sed expect grep wget \ + openssh-server + +# Add LAVA stretch-backports production repo +RUN wget -qO - http://images.validation.linaro.org/production-repo/production-repo.key.asc | apt-key add - && \ + echo "deb http://images.validation.linaro.org/production-repo stretch-backports main" >/etc/apt/sources.list.d/linaro.list + +RUN echo 'locales locales/locales_to_be_generated multiselect C.UTF-8 UTF-8, en_US.UTF-8 UTF-8 ' | debconf-set-selections && \ + echo 'locales locales/default_environment_locale select en_US.UTF-8' | debconf-set-selections && \ + export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && \ + apt-get -y upgrade && \ + apt-get -y -t stretch-backports install lava-common lava-dispatcher \ + lava-lxc-mocker && \ + apt-get clean && \ + rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* + +# Expose services ports +EXPOSE 22 + +# Set entrypoint script +COPY ./entrypoint.sh /entrypoint.sh +ENTRYPOINT [ "/entrypoint.sh" ] + +# Following is a sample docker run command to use this image +# +# sudo docker run -v /boot:/boot -v /lib/modules:/lib/modules \ +# -v /var/run/docker.sock:/var/run/docker.sock -itd -e HOSTNAME='worker-1' \ +# -e MASTER='tcp://192.168.1.2:5556' -e SOCKET_ADDR='tcp://192.168.1.2:5555' \ +# -e LOG_LEVEL='DEBUG' -p 2222:22 --privileged \ +# --name ld-2017.12 stylesen/lava-dispatcher:2017.12 -- cgit v1.2.3 From 52e9e1e3e6ead2bce0fc49ef824b0b00686f782f Mon Sep 17 00:00:00 2001 From: Benjamin Copeland Date: Wed, 30 May 2018 10:32:17 +0100 Subject: Jenkins: Update plugins Change-Id: I6998d41eb1cbb99ba7529cbabc61576c1a083fb1 --- jessie-amd64-jenkins-master/plugins.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/jessie-amd64-jenkins-master/plugins.txt b/jessie-amd64-jenkins-master/plugins.txt index a435645d..a29b2f2d 100644 --- a/jessie-amd64-jenkins-master/plugins.txt +++ b/jessie-amd64-jenkins-master/plugins.txt @@ -1,16 +1,16 @@ ansicolor:0.5.2 ant:1.8 antisamy-markup-formatter:1.5 -apache-httpcomponents-client-4-api:4.5.5-2.0 +apache-httpcomponents-client-4-api:4.5.5-2.1 bouncycastle-api:2.16.2 build-blocker:1.7.3 -build-monitor-plugin:1.12+build.201708172343 +build-monitor-plugin:1.12+build.201805070054 build-name-setter:1.6.9 build-timeout:1.19 command-launcher:1.2 copy-to-slave:1.4.4 copyartifact:1.39.1 -coverity:1.11.0 +coverity:1.11.1 crowd2:1.8 cvs:2.14 docker-build-publish:1.3.2 @@ -31,7 +31,7 @@ groovy-postbuild:2.4.1 heavy-job:1.1 htmlpublisher:1.16 ircbot:2.30 -jira:2.5.2 +jira:3.0.0 jenkins-multijob-plugin:1.30 jobConfigHistory:2.18 ldap:1.20 @@ -41,7 +41,7 @@ matrix-auth:2.2 matrix-combinations-parameter:1.3.0 matrixtieparent:1.2 mercurial:1.61 -metrics:3.1.2.11 +metrics:3.1.2.12 monitoring:1.72.0 multiple-scms:0.6 naginator:1.17.2 @@ -55,13 +55,13 @@ rebuild:1.28 repo:1.10.7 simple-theme-plugin:0.4 ssh-agent:1.15 -subversion:2.10.5 +subversion:2.10.6 tap:2.2.1 throttle-concurrents:2.0.1 timestamper:1.8.10 translation:1.16 urltrigger:0.41 -warnings:4.66 +warnings:4.67 windows-slaves:1.3.1 workflow-aggregator:2.5 ws-cleanup:0.34 -- cgit v1.2.3 From 6c51576a20ed00b6ba7b3407f220862945b10c2f Mon Sep 17 00:00:00 2001 From: Maxim Kuvyrkov Date: Fri, 1 Jun 2018 11:24:45 +0000 Subject: tcwg-build: Generalize new-user.sh to handle passwd entries as argument .. in preparation to move it to tcwg-base/ Change-Id: I4263bb1b5cde191b85118b5aff4b1773b7ffc1ab --- tcwg-base/tcwg-build/Dockerfile.in | 5 +-- tcwg-base/tcwg-build/new-user.sh | 38 +++++++++++++++++----- .../trusty-amd64-tcwg-build/Dockerfile | 7 ++-- .../trusty-arm64-tcwg-build/Dockerfile | 7 ++-- .../trusty-armhf-tcwg-build/Dockerfile | 7 ++-- .../trusty-i386-tcwg-build/Dockerfile | 7 ++-- .../xenial-amd64-tcwg-build/Dockerfile | 7 ++-- .../xenial-arm64-tcwg-build/Dockerfile | 7 ++-- .../xenial-arm64-tcwg-llvmbot/Dockerfile | 6 ++-- .../xenial-armhf-tcwg-build/Dockerfile | 7 ++-- .../xenial-armhf-tcwg-llvmbot/Dockerfile | 6 ++-- .../xenial-i386-tcwg-build/Dockerfile | 7 ++-- 12 files changed, 70 insertions(+), 41 deletions(-) diff --git a/tcwg-base/tcwg-build/Dockerfile.in b/tcwg-base/tcwg-build/Dockerfile.in index 39ef4f39..cbf4476b 100644 --- a/tcwg-base/tcwg-build/Dockerfile.in +++ b/tcwg-base/tcwg-build/Dockerfile.in @@ -2,8 +2,9 @@ FROM linaro/ci-#{ARCH}-tcwg-base-ubuntu:#{DISTRO} 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 \ +RUN new-user.sh --group tcwg-infra:9000 \ + && new-user.sh --passwd "tcwg-buildslave:x:11827:9000:TCWG Buildslave::/bin/bash" \ + && new-user.sh --passwd "tcwg-benchmark:x:12326:9000:TCWG Benchmark::/bin/bash" \ && mkdir -p /home/tcwg-buildslave/workspace COPY tcwg-buildslave /home/tcwg-buildslave diff --git a/tcwg-base/tcwg-build/new-user.sh b/tcwg-base/tcwg-build/new-user.sh index d1b18953..7bb022dc 100755 --- a/tcwg-base/tcwg-build/new-user.sh +++ b/tcwg-base/tcwg-build/new-user.sh @@ -7,6 +7,7 @@ usage () exit 1 } +passwd_ent="" group="" key="" user="" @@ -14,6 +15,7 @@ verbose=false while [ $# -gt 0 ]; do case "$1" in + --passwd) passwd_ent="$2" ;; --group) group="$2" ;; --key) key="$2" ;; --user) user="$2" ;; @@ -34,22 +36,40 @@ if [ x"$group" != x"" ]; then fi group_opt="-g $group" +elif [ x"$passwd_ent" != x"" ]; then + gid=$(echo $passwd_ent | cut -d: -f 4) + group_opt="-g $gid" else group_opt="" fi +if [ x"$user" = x"" ]; then + user=$(echo "$passwd_ent" | cut -s -d: -f 1,3) +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 +if [ x"$user" != x"" ]; then + if [ x"$passwd_ent" != x"" ]; then + comment=$(echo $passwd_ent | cut -d: -f 5) + shell=$(echo $passwd_ent | cut -d: -f 7) + fi -sudoers_file=/etc/sudoers.d/$(echo $user | tr "." "-") -echo "$user ALL = NOPASSWD: ALL" > $sudoers_file -chmod 0440 $sudoers_file + useradd -m $group_opt -G kvm \ + ${uid:+-u $uid} \ + ${comment:+-c "$comment"} \ + ${shell:+-s "$shell"} \ + $user -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 + 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 fi diff --git a/trusty-amd64-tcwg-base/trusty-amd64-tcwg-build/Dockerfile b/trusty-amd64-tcwg-base/trusty-amd64-tcwg-build/Dockerfile index 280e8c91..984c42a1 100644 --- a/trusty-amd64-tcwg-base/trusty-amd64-tcwg-build/Dockerfile +++ b/trusty-amd64-tcwg-base/trusty-amd64-tcwg-build/Dockerfile @@ -3,8 +3,9 @@ FROM linaro/ci-amd64-tcwg-base-ubuntu:trusty 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 \ +RUN new-user.sh --group tcwg-infra:9000 \ + && new-user.sh --passwd "tcwg-buildslave:x:11827:9000:TCWG Buildslave::/bin/bash" \ + && new-user.sh --passwd "tcwg-benchmark:x:12326:9000:TCWG Benchmark::/bin/bash" \ && mkdir -p /home/tcwg-buildslave/workspace COPY tcwg-buildslave /home/tcwg-buildslave @@ -27,4 +28,4 @@ RUN \ /var/lib/apt/lists/* \ /tmp/* \ /var/tmp/* -# checksum: 847950907becd4d2e0bb2246eed17943 +# checksum: 65209b0c1f6a648cadf5b946d5182849 diff --git a/trusty-arm64-tcwg-base/trusty-arm64-tcwg-build/Dockerfile b/trusty-arm64-tcwg-base/trusty-arm64-tcwg-build/Dockerfile index 91ca9969..c3ba20de 100644 --- a/trusty-arm64-tcwg-base/trusty-arm64-tcwg-build/Dockerfile +++ b/trusty-arm64-tcwg-base/trusty-arm64-tcwg-build/Dockerfile @@ -3,8 +3,9 @@ FROM linaro/ci-arm64-tcwg-base-ubuntu:trusty 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 \ +RUN new-user.sh --group tcwg-infra:9000 \ + && new-user.sh --passwd "tcwg-buildslave:x:11827:9000:TCWG Buildslave::/bin/bash" \ + && new-user.sh --passwd "tcwg-benchmark:x:12326:9000:TCWG Benchmark::/bin/bash" \ && mkdir -p /home/tcwg-buildslave/workspace COPY tcwg-buildslave /home/tcwg-buildslave @@ -15,4 +16,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: d46dab616715909f84717ae49d7542b9 +# checksum: 80c0646d8f957e1f33fd66f3c2c29e48 diff --git a/trusty-armhf-tcwg-base/trusty-armhf-tcwg-build/Dockerfile b/trusty-armhf-tcwg-base/trusty-armhf-tcwg-build/Dockerfile index d1fbe12b..c604beac 100644 --- a/trusty-armhf-tcwg-base/trusty-armhf-tcwg-build/Dockerfile +++ b/trusty-armhf-tcwg-base/trusty-armhf-tcwg-build/Dockerfile @@ -3,8 +3,9 @@ FROM linaro/ci-armhf-tcwg-base-ubuntu:trusty 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 \ +RUN new-user.sh --group tcwg-infra:9000 \ + && new-user.sh --passwd "tcwg-buildslave:x:11827:9000:TCWG Buildslave::/bin/bash" \ + && new-user.sh --passwd "tcwg-benchmark:x:12326:9000:TCWG Benchmark::/bin/bash" \ && mkdir -p /home/tcwg-buildslave/workspace COPY tcwg-buildslave /home/tcwg-buildslave @@ -15,4 +16,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: 719915c4d53c3aaff4bfb874ca144542 +# checksum: e51d292a6d912955404de2b0be008b82 diff --git a/trusty-i386-tcwg-base/trusty-i386-tcwg-build/Dockerfile b/trusty-i386-tcwg-base/trusty-i386-tcwg-build/Dockerfile index b559b08d..9fb066b9 100644 --- a/trusty-i386-tcwg-base/trusty-i386-tcwg-build/Dockerfile +++ b/trusty-i386-tcwg-base/trusty-i386-tcwg-build/Dockerfile @@ -3,8 +3,9 @@ FROM linaro/ci-i386-tcwg-base-ubuntu:trusty 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 \ +RUN new-user.sh --group tcwg-infra:9000 \ + && new-user.sh --passwd "tcwg-buildslave:x:11827:9000:TCWG Buildslave::/bin/bash" \ + && new-user.sh --passwd "tcwg-benchmark:x:12326:9000:TCWG Benchmark::/bin/bash" \ && mkdir -p /home/tcwg-buildslave/workspace COPY tcwg-buildslave /home/tcwg-buildslave @@ -26,4 +27,4 @@ RUN \ /var/lib/apt/lists/* \ /tmp/* \ /var/tmp/* -# checksum: ba06b8439f636dc78d7968329afbf02e +# checksum: 13525739f5c6692bc5239f5b544ae177 diff --git a/xenial-amd64-tcwg-base/xenial-amd64-tcwg-build/Dockerfile b/xenial-amd64-tcwg-base/xenial-amd64-tcwg-build/Dockerfile index 58b1c170..519add68 100644 --- a/xenial-amd64-tcwg-base/xenial-amd64-tcwg-build/Dockerfile +++ b/xenial-amd64-tcwg-base/xenial-amd64-tcwg-build/Dockerfile @@ -3,8 +3,9 @@ FROM linaro/ci-amd64-tcwg-base-ubuntu:xenial 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 \ +RUN new-user.sh --group tcwg-infra:9000 \ + && new-user.sh --passwd "tcwg-buildslave:x:11827:9000:TCWG Buildslave::/bin/bash" \ + && new-user.sh --passwd "tcwg-benchmark:x:12326:9000:TCWG Benchmark::/bin/bash" \ && mkdir -p /home/tcwg-buildslave/workspace COPY tcwg-buildslave /home/tcwg-buildslave @@ -27,4 +28,4 @@ RUN \ /var/lib/apt/lists/* \ /tmp/* \ /var/tmp/* -# checksum: c2cb73fc80affc8312b1959673d8767c +# checksum: 4e6ae7dbe4ddff7b1e792d57fda62ff5 diff --git a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-build/Dockerfile b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-build/Dockerfile index 989ef31e..c9750ffa 100644 --- a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-build/Dockerfile +++ b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-build/Dockerfile @@ -3,8 +3,9 @@ FROM linaro/ci-arm64-tcwg-base-ubuntu:xenial 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 \ +RUN new-user.sh --group tcwg-infra:9000 \ + && new-user.sh --passwd "tcwg-buildslave:x:11827:9000:TCWG Buildslave::/bin/bash" \ + && new-user.sh --passwd "tcwg-benchmark:x:12326:9000:TCWG Benchmark::/bin/bash" \ && mkdir -p /home/tcwg-buildslave/workspace COPY tcwg-buildslave /home/tcwg-buildslave @@ -15,4 +16,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: a9bb4838879761da324a80f74d713b07 +# checksum: bce8eb4d75d9d08883da549d0a4a93c1 diff --git a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-llvmbot/Dockerfile b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-llvmbot/Dockerfile index a5327736..fb8fc11f 100644 --- a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-llvmbot/Dockerfile +++ b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-llvmbot/Dockerfile @@ -32,9 +32,9 @@ RUN git clone -b master https://github.com/maxim-kuvyrkov/ninja.git \ # Add current clang for libcxx bots. RUN \ - clang_ver=clang+llvm-5.0.1-aarch64-linux-gnu \ + clang_ver=clang+llvm-6.0.0-aarch64-linux-gnu \ && 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 @@ -45,4 +45,4 @@ COPY start.sh . ENTRYPOINT ["/run.sh"] CMD ["start.sh"] -# checksum: e518582a2a434e66d9c9388c0bd2fa91 +# checksum: 765b3adb1b9e9f5ee905e980c41f2a32 diff --git a/xenial-armhf-tcwg-base/xenial-armhf-tcwg-build/Dockerfile b/xenial-armhf-tcwg-base/xenial-armhf-tcwg-build/Dockerfile index d685b29a..3de5b1e9 100644 --- a/xenial-armhf-tcwg-base/xenial-armhf-tcwg-build/Dockerfile +++ b/xenial-armhf-tcwg-base/xenial-armhf-tcwg-build/Dockerfile @@ -3,8 +3,9 @@ FROM linaro/ci-armhf-tcwg-base-ubuntu:xenial 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 \ +RUN new-user.sh --group tcwg-infra:9000 \ + && new-user.sh --passwd "tcwg-buildslave:x:11827:9000:TCWG Buildslave::/bin/bash" \ + && new-user.sh --passwd "tcwg-benchmark:x:12326:9000:TCWG Benchmark::/bin/bash" \ && mkdir -p /home/tcwg-buildslave/workspace COPY tcwg-buildslave /home/tcwg-buildslave @@ -15,4 +16,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: 8dcea6cdeb064fe01ee369351717080c +# checksum: 4e31b90135e10180e50c92a82377abea diff --git a/xenial-armhf-tcwg-base/xenial-armhf-tcwg-llvmbot/Dockerfile b/xenial-armhf-tcwg-base/xenial-armhf-tcwg-llvmbot/Dockerfile index 00ed72eb..51f57671 100644 --- a/xenial-armhf-tcwg-base/xenial-armhf-tcwg-llvmbot/Dockerfile +++ b/xenial-armhf-tcwg-base/xenial-armhf-tcwg-llvmbot/Dockerfile @@ -32,9 +32,9 @@ RUN git clone -b master https://github.com/maxim-kuvyrkov/ninja.git \ # Add current clang for libcxx bots. RUN \ - clang_ver=clang+llvm-5.0.1-armv7a-linux-gnueabihf \ + clang_ver=clang+llvm-6.0.0-armv7a-linux-gnueabihf \ && 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 @@ -45,4 +45,4 @@ COPY start.sh . ENTRYPOINT ["linux32", "/run.sh"] CMD ["start.sh"] -# checksum: 478e345cb93c7e7a70535a26606fb9ed +# checksum: fba53876c5cbd698ed2ca6b27da7f04e diff --git a/xenial-i386-tcwg-base/xenial-i386-tcwg-build/Dockerfile b/xenial-i386-tcwg-base/xenial-i386-tcwg-build/Dockerfile index b105a155..c597f700 100644 --- a/xenial-i386-tcwg-base/xenial-i386-tcwg-build/Dockerfile +++ b/xenial-i386-tcwg-base/xenial-i386-tcwg-build/Dockerfile @@ -3,8 +3,9 @@ FROM linaro/ci-i386-tcwg-base-ubuntu:xenial 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 \ +RUN new-user.sh --group tcwg-infra:9000 \ + && new-user.sh --passwd "tcwg-buildslave:x:11827:9000:TCWG Buildslave::/bin/bash" \ + && new-user.sh --passwd "tcwg-benchmark:x:12326:9000:TCWG Benchmark::/bin/bash" \ && mkdir -p /home/tcwg-buildslave/workspace COPY tcwg-buildslave /home/tcwg-buildslave @@ -26,4 +27,4 @@ RUN \ /var/lib/apt/lists/* \ /tmp/* \ /var/tmp/* -# checksum: c4d98a96007fb76a7e5c6114053a3c87 +# checksum: aa092307b16e193c2a39ef6554ac4f4a -- cgit v1.2.3 From bd4718155732038844245da6cafd017a2464e580 Mon Sep 17 00:00:00 2001 From: Maxim Kuvyrkov Date: Fri, 1 Jun 2018 11:29:39 +0000 Subject: tcwg-base/: Move new-user.sh here from tcwg-build/ Change-Id: Idd91d3b71b1980958895bb3e5a0c4a814bb1ed09 --- tcwg-base/Dockerfile.in | 1 + tcwg-base/build.sh | 3 +- tcwg-base/new-user.sh | 75 ++++++++++++++++++++++ tcwg-base/tcwg-build/Dockerfile.in | 2 - tcwg-base/tcwg-build/build.sh | 3 +- tcwg-base/tcwg-build/new-user.sh | 75 ---------------------- trusty-amd64-tcwg-base/Dockerfile | 3 +- .../trusty-amd64-tcwg-build/Dockerfile | 4 +- trusty-arm64-tcwg-base/Dockerfile | 3 +- .../trusty-arm64-tcwg-build/Dockerfile | 4 +- trusty-armhf-tcwg-base/Dockerfile | 3 +- .../trusty-armhf-tcwg-build/Dockerfile | 4 +- trusty-i386-tcwg-base/Dockerfile | 3 +- .../trusty-i386-tcwg-build/Dockerfile | 4 +- xenial-amd64-tcwg-base/Dockerfile | 3 +- .../xenial-amd64-tcwg-build/Dockerfile | 4 +- xenial-arm64-tcwg-base/Dockerfile | 3 +- .../xenial-arm64-tcwg-build/Dockerfile | 4 +- xenial-armhf-tcwg-base/Dockerfile | 3 +- .../xenial-armhf-tcwg-build/Dockerfile | 4 +- xenial-i386-tcwg-base/Dockerfile | 3 +- .../xenial-i386-tcwg-build/Dockerfile | 4 +- 22 files changed, 103 insertions(+), 112 deletions(-) create mode 100755 tcwg-base/new-user.sh delete mode 100755 tcwg-base/tcwg-build/new-user.sh diff --git a/tcwg-base/Dockerfile.in b/tcwg-base/Dockerfile.in index 6abf52dd..6c591a6a 100644 --- a/tcwg-base/Dockerfile.in +++ b/tcwg-base/Dockerfile.in @@ -135,6 +135,7 @@ RUN install -D -p -m0755 /usr/share/doc/git/contrib/workdir/git-new-workdir /usr && echo "MaxStartups 256" >> /etc/ssh/sshd_config \ && echo "MaxSessions 256" >> /etc/ssh/sshd_config +COPY new-user.sh /usr/local/bin/ COPY postfix-main.cf.in /etc/postfix/main.cf COPY postfix-sasl_password.in /etc/postfix/sasl_password diff --git a/tcwg-base/build.sh b/tcwg-base/build.sh index 24ede180..6330582b 100755 --- a/tcwg-base/build.sh +++ b/tcwg-base/build.sh @@ -6,7 +6,7 @@ trap cleanup_exit INT TERM EXIT cleanup_exit() { - rm -rf postfix*.in + rm -rf new-user.sh postfix*.in } export LANG=C @@ -17,6 +17,7 @@ name=$(basename ${PWD} | cut -f3- -d '-') image=linaro/ci-${arch}-${name}-ubuntu:${distro} baseimage=$(grep "^FROM" Dockerfile | head -n 1 | cut -d" " -f 2) +cp $top/tcwg-base/new-user.sh ./ cp $top/tcwg-base/postfix*.in . "$top"/tcwg-base/validate-dockerfile.sh Dockerfile diff --git a/tcwg-base/new-user.sh b/tcwg-base/new-user.sh new file mode 100755 index 00000000..7bb022dc --- /dev/null +++ b/tcwg-base/new-user.sh @@ -0,0 +1,75 @@ +#!/bin/bash + +set -euf -o pipefail + +usage () +{ + exit 1 +} + +passwd_ent="" +group="" +key="" +user="" +verbose=false + +while [ $# -gt 0 ]; do + case "$1" in + --passwd) passwd_ent="$2" ;; + --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" +elif [ x"$passwd_ent" != x"" ]; then + gid=$(echo $passwd_ent | cut -d: -f 4) + group_opt="-g $gid" +else + group_opt="" +fi + +if [ x"$user" = x"" ]; then + user=$(echo "$passwd_ent" | cut -s -d: -f 1,3) +fi + +uid=$(echo "$user" | cut -s -d: -f 2) +user=$(echo "$user" | cut -d: -f 1) + +if [ x"$user" != x"" ]; then + if [ x"$passwd_ent" != x"" ]; then + comment=$(echo $passwd_ent | cut -d: -f 5) + shell=$(echo $passwd_ent | cut -d: -f 7) + fi + + useradd -m $group_opt -G kvm \ + ${uid:+-u $uid} \ + ${comment:+-c "$comment"} \ + ${shell:+-s "$shell"} \ + $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 +fi diff --git a/tcwg-base/tcwg-build/Dockerfile.in b/tcwg-base/tcwg-build/Dockerfile.in index cbf4476b..937d1384 100644 --- a/tcwg-base/tcwg-build/Dockerfile.in +++ b/tcwg-base/tcwg-build/Dockerfile.in @@ -1,7 +1,5 @@ FROM linaro/ci-#{ARCH}-tcwg-base-ubuntu:#{DISTRO} -COPY new-user.sh /usr/local/bin/ - RUN new-user.sh --group tcwg-infra:9000 \ && new-user.sh --passwd "tcwg-buildslave:x:11827:9000:TCWG Buildslave::/bin/bash" \ && new-user.sh --passwd "tcwg-benchmark:x:12326:9000:TCWG Benchmark::/bin/bash" \ diff --git a/tcwg-base/tcwg-build/build.sh b/tcwg-base/tcwg-build/build.sh index 99795026..8624b7fd 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 new-user.sh tcwg-buildslave tcwg-benchmark + rm -rf tcwg-buildslave tcwg-benchmark } export LANG=C @@ -16,7 +16,6 @@ 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 deleted file mode 100755 index 7bb022dc..00000000 --- a/tcwg-base/tcwg-build/new-user.sh +++ /dev/null @@ -1,75 +0,0 @@ -#!/bin/bash - -set -euf -o pipefail - -usage () -{ - exit 1 -} - -passwd_ent="" -group="" -key="" -user="" -verbose=false - -while [ $# -gt 0 ]; do - case "$1" in - --passwd) passwd_ent="$2" ;; - --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" -elif [ x"$passwd_ent" != x"" ]; then - gid=$(echo $passwd_ent | cut -d: -f 4) - group_opt="-g $gid" -else - group_opt="" -fi - -if [ x"$user" = x"" ]; then - user=$(echo "$passwd_ent" | cut -s -d: -f 1,3) -fi - -uid=$(echo "$user" | cut -s -d: -f 2) -user=$(echo "$user" | cut -d: -f 1) - -if [ x"$user" != x"" ]; then - if [ x"$passwd_ent" != x"" ]; then - comment=$(echo $passwd_ent | cut -d: -f 5) - shell=$(echo $passwd_ent | cut -d: -f 7) - fi - - useradd -m $group_opt -G kvm \ - ${uid:+-u $uid} \ - ${comment:+-c "$comment"} \ - ${shell:+-s "$shell"} \ - $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 -fi diff --git a/trusty-amd64-tcwg-base/Dockerfile b/trusty-amd64-tcwg-base/Dockerfile index f94d7e95..98dea6b3 100644 --- a/trusty-amd64-tcwg-base/Dockerfile +++ b/trusty-amd64-tcwg-base/Dockerfile @@ -101,6 +101,7 @@ RUN install -D -p -m0755 /usr/share/doc/git/contrib/workdir/git-new-workdir /usr && echo "MaxStartups 256" >> /etc/ssh/sshd_config \ && echo "MaxSessions 256" >> /etc/ssh/sshd_config +COPY new-user.sh /usr/local/bin/ COPY postfix-main.cf.in /etc/postfix/main.cf COPY postfix-sasl_password.in /etc/postfix/sasl_password @@ -125,4 +126,4 @@ VOLUME /tmp EXPOSE 22 CMD ["/usr/sbin/sshd", "-D"] -# checksum: 59a3af373c3253df2b6690a0c202f412 +# checksum: 663ce36ec5ad703d51a25889cf722a64 diff --git a/trusty-amd64-tcwg-base/trusty-amd64-tcwg-build/Dockerfile b/trusty-amd64-tcwg-base/trusty-amd64-tcwg-build/Dockerfile index 984c42a1..f45cec71 100644 --- a/trusty-amd64-tcwg-base/trusty-amd64-tcwg-build/Dockerfile +++ b/trusty-amd64-tcwg-base/trusty-amd64-tcwg-build/Dockerfile @@ -1,8 +1,6 @@ # Auto generated from tcwg-base/tcwg-build/Dockerfile.in. Do not edit. FROM linaro/ci-amd64-tcwg-base-ubuntu:trusty -COPY new-user.sh /usr/local/bin/ - RUN new-user.sh --group tcwg-infra:9000 \ && new-user.sh --passwd "tcwg-buildslave:x:11827:9000:TCWG Buildslave::/bin/bash" \ && new-user.sh --passwd "tcwg-benchmark:x:12326:9000:TCWG Benchmark::/bin/bash" \ @@ -28,4 +26,4 @@ RUN \ /var/lib/apt/lists/* \ /tmp/* \ /var/tmp/* -# checksum: 65209b0c1f6a648cadf5b946d5182849 +# checksum: 1704daed8e8bb5b9c9b9e61daf602d3e diff --git a/trusty-arm64-tcwg-base/Dockerfile b/trusty-arm64-tcwg-base/Dockerfile index 69366269..a0c193cd 100644 --- a/trusty-arm64-tcwg-base/Dockerfile +++ b/trusty-arm64-tcwg-base/Dockerfile @@ -94,6 +94,7 @@ RUN install -D -p -m0755 /usr/share/doc/git/contrib/workdir/git-new-workdir /usr && echo "MaxStartups 256" >> /etc/ssh/sshd_config \ && echo "MaxSessions 256" >> /etc/ssh/sshd_config +COPY new-user.sh /usr/local/bin/ COPY postfix-main.cf.in /etc/postfix/main.cf COPY postfix-sasl_password.in /etc/postfix/sasl_password @@ -109,4 +110,4 @@ VOLUME /tmp EXPOSE 22 CMD ["/usr/sbin/sshd", "-D"] -# checksum: b553e4f699f9eb1c2496451be411f503 +# checksum: 7ee3d28795dd0a90fb7bd9c9087e30bf diff --git a/trusty-arm64-tcwg-base/trusty-arm64-tcwg-build/Dockerfile b/trusty-arm64-tcwg-base/trusty-arm64-tcwg-build/Dockerfile index c3ba20de..1ad336f4 100644 --- a/trusty-arm64-tcwg-base/trusty-arm64-tcwg-build/Dockerfile +++ b/trusty-arm64-tcwg-base/trusty-arm64-tcwg-build/Dockerfile @@ -1,8 +1,6 @@ # Auto generated from tcwg-base/tcwg-build/Dockerfile.in. Do not edit. FROM linaro/ci-arm64-tcwg-base-ubuntu:trusty -COPY new-user.sh /usr/local/bin/ - RUN new-user.sh --group tcwg-infra:9000 \ && new-user.sh --passwd "tcwg-buildslave:x:11827:9000:TCWG Buildslave::/bin/bash" \ && new-user.sh --passwd "tcwg-benchmark:x:12326:9000:TCWG Benchmark::/bin/bash" \ @@ -16,4 +14,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: 80c0646d8f957e1f33fd66f3c2c29e48 +# checksum: 5904c80fcc6ea2a85a54d41f496a5f96 diff --git a/trusty-armhf-tcwg-base/Dockerfile b/trusty-armhf-tcwg-base/Dockerfile index 4441771d..63d1e6e1 100644 --- a/trusty-armhf-tcwg-base/Dockerfile +++ b/trusty-armhf-tcwg-base/Dockerfile @@ -94,6 +94,7 @@ RUN install -D -p -m0755 /usr/share/doc/git/contrib/workdir/git-new-workdir /usr && echo "MaxStartups 256" >> /etc/ssh/sshd_config \ && echo "MaxSessions 256" >> /etc/ssh/sshd_config +COPY new-user.sh /usr/local/bin/ COPY postfix-main.cf.in /etc/postfix/main.cf COPY postfix-sasl_password.in /etc/postfix/sasl_password @@ -109,4 +110,4 @@ VOLUME /tmp EXPOSE 22 CMD ["linux32", "/usr/sbin/sshd", "-D"] -# checksum: a86a75795b6252fa520a5d910dd3697f +# checksum: 47776efeb9b9a4f08e738296b8011574 diff --git a/trusty-armhf-tcwg-base/trusty-armhf-tcwg-build/Dockerfile b/trusty-armhf-tcwg-base/trusty-armhf-tcwg-build/Dockerfile index c604beac..671f0265 100644 --- a/trusty-armhf-tcwg-base/trusty-armhf-tcwg-build/Dockerfile +++ b/trusty-armhf-tcwg-base/trusty-armhf-tcwg-build/Dockerfile @@ -1,8 +1,6 @@ # Auto generated from tcwg-base/tcwg-build/Dockerfile.in. Do not edit. FROM linaro/ci-armhf-tcwg-base-ubuntu:trusty -COPY new-user.sh /usr/local/bin/ - RUN new-user.sh --group tcwg-infra:9000 \ && new-user.sh --passwd "tcwg-buildslave:x:11827:9000:TCWG Buildslave::/bin/bash" \ && new-user.sh --passwd "tcwg-benchmark:x:12326:9000:TCWG Benchmark::/bin/bash" \ @@ -16,4 +14,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: e51d292a6d912955404de2b0be008b82 +# checksum: b6038e0cfa2fdbc2b1e25fc33bc26cde diff --git a/trusty-i386-tcwg-base/Dockerfile b/trusty-i386-tcwg-base/Dockerfile index a7e08128..c544aa31 100644 --- a/trusty-i386-tcwg-base/Dockerfile +++ b/trusty-i386-tcwg-base/Dockerfile @@ -102,6 +102,7 @@ RUN install -D -p -m0755 /usr/share/doc/git/contrib/workdir/git-new-workdir /usr && echo "MaxStartups 256" >> /etc/ssh/sshd_config \ && echo "MaxSessions 256" >> /etc/ssh/sshd_config +COPY new-user.sh /usr/local/bin/ COPY postfix-main.cf.in /etc/postfix/main.cf COPY postfix-sasl_password.in /etc/postfix/sasl_password @@ -126,4 +127,4 @@ VOLUME /tmp EXPOSE 22 CMD ["linux32", "/usr/sbin/sshd", "-D"] -# checksum: b2adc55929fd7872882ce7c1ee55a26f +# checksum: 85fc2b97a1844f16773e68faa51640f1 diff --git a/trusty-i386-tcwg-base/trusty-i386-tcwg-build/Dockerfile b/trusty-i386-tcwg-base/trusty-i386-tcwg-build/Dockerfile index 9fb066b9..12559ca1 100644 --- a/trusty-i386-tcwg-base/trusty-i386-tcwg-build/Dockerfile +++ b/trusty-i386-tcwg-base/trusty-i386-tcwg-build/Dockerfile @@ -1,8 +1,6 @@ # Auto generated from tcwg-base/tcwg-build/Dockerfile.in. Do not edit. FROM linaro/ci-i386-tcwg-base-ubuntu:trusty -COPY new-user.sh /usr/local/bin/ - RUN new-user.sh --group tcwg-infra:9000 \ && new-user.sh --passwd "tcwg-buildslave:x:11827:9000:TCWG Buildslave::/bin/bash" \ && new-user.sh --passwd "tcwg-benchmark:x:12326:9000:TCWG Benchmark::/bin/bash" \ @@ -27,4 +25,4 @@ RUN \ /var/lib/apt/lists/* \ /tmp/* \ /var/tmp/* -# checksum: 13525739f5c6692bc5239f5b544ae177 +# checksum: 5a3945fc03be2d9463df9c0a9f37c594 diff --git a/xenial-amd64-tcwg-base/Dockerfile b/xenial-amd64-tcwg-base/Dockerfile index 665253db..a7834cf6 100644 --- a/xenial-amd64-tcwg-base/Dockerfile +++ b/xenial-amd64-tcwg-base/Dockerfile @@ -100,6 +100,7 @@ RUN install -D -p -m0755 /usr/share/doc/git/contrib/workdir/git-new-workdir /usr && echo "MaxStartups 256" >> /etc/ssh/sshd_config \ && echo "MaxSessions 256" >> /etc/ssh/sshd_config +COPY new-user.sh /usr/local/bin/ COPY postfix-main.cf.in /etc/postfix/main.cf COPY postfix-sasl_password.in /etc/postfix/sasl_password @@ -124,4 +125,4 @@ VOLUME /tmp EXPOSE 22 CMD ["/usr/sbin/sshd", "-D"] -# checksum: 2c4f845b0ea5b96fda4b80ebee0c24f2 +# checksum: 076425a20c7afb989affdede4481c722 diff --git a/xenial-amd64-tcwg-base/xenial-amd64-tcwg-build/Dockerfile b/xenial-amd64-tcwg-base/xenial-amd64-tcwg-build/Dockerfile index 519add68..62ca534d 100644 --- a/xenial-amd64-tcwg-base/xenial-amd64-tcwg-build/Dockerfile +++ b/xenial-amd64-tcwg-base/xenial-amd64-tcwg-build/Dockerfile @@ -1,8 +1,6 @@ # Auto generated from tcwg-base/tcwg-build/Dockerfile.in. Do not edit. FROM linaro/ci-amd64-tcwg-base-ubuntu:xenial -COPY new-user.sh /usr/local/bin/ - RUN new-user.sh --group tcwg-infra:9000 \ && new-user.sh --passwd "tcwg-buildslave:x:11827:9000:TCWG Buildslave::/bin/bash" \ && new-user.sh --passwd "tcwg-benchmark:x:12326:9000:TCWG Benchmark::/bin/bash" \ @@ -28,4 +26,4 @@ RUN \ /var/lib/apt/lists/* \ /tmp/* \ /var/tmp/* -# checksum: 4e6ae7dbe4ddff7b1e792d57fda62ff5 +# checksum: cb3df93de0a1a7b466665316a38399de diff --git a/xenial-arm64-tcwg-base/Dockerfile b/xenial-arm64-tcwg-base/Dockerfile index 74a08245..6ccee341 100644 --- a/xenial-arm64-tcwg-base/Dockerfile +++ b/xenial-arm64-tcwg-base/Dockerfile @@ -95,6 +95,7 @@ RUN install -D -p -m0755 /usr/share/doc/git/contrib/workdir/git-new-workdir /usr && echo "MaxStartups 256" >> /etc/ssh/sshd_config \ && echo "MaxSessions 256" >> /etc/ssh/sshd_config +COPY new-user.sh /usr/local/bin/ COPY postfix-main.cf.in /etc/postfix/main.cf COPY postfix-sasl_password.in /etc/postfix/sasl_password @@ -110,4 +111,4 @@ VOLUME /tmp EXPOSE 22 CMD ["/usr/sbin/sshd", "-D"] -# checksum: bb32f5a03bcc7864035ebc495cde2ea4 +# checksum: eb5050cf6f8ba0bc4eb41dff0da50073 diff --git a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-build/Dockerfile b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-build/Dockerfile index c9750ffa..19b01205 100644 --- a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-build/Dockerfile +++ b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-build/Dockerfile @@ -1,8 +1,6 @@ # Auto generated from tcwg-base/tcwg-build/Dockerfile.in. Do not edit. FROM linaro/ci-arm64-tcwg-base-ubuntu:xenial -COPY new-user.sh /usr/local/bin/ - RUN new-user.sh --group tcwg-infra:9000 \ && new-user.sh --passwd "tcwg-buildslave:x:11827:9000:TCWG Buildslave::/bin/bash" \ && new-user.sh --passwd "tcwg-benchmark:x:12326:9000:TCWG Benchmark::/bin/bash" \ @@ -16,4 +14,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: bce8eb4d75d9d08883da549d0a4a93c1 +# checksum: 3fe6459b89aac3f2b3935eb472339a56 diff --git a/xenial-armhf-tcwg-base/Dockerfile b/xenial-armhf-tcwg-base/Dockerfile index cb315681..1af411a7 100644 --- a/xenial-armhf-tcwg-base/Dockerfile +++ b/xenial-armhf-tcwg-base/Dockerfile @@ -95,6 +95,7 @@ RUN install -D -p -m0755 /usr/share/doc/git/contrib/workdir/git-new-workdir /usr && echo "MaxStartups 256" >> /etc/ssh/sshd_config \ && echo "MaxSessions 256" >> /etc/ssh/sshd_config +COPY new-user.sh /usr/local/bin/ COPY postfix-main.cf.in /etc/postfix/main.cf COPY postfix-sasl_password.in /etc/postfix/sasl_password @@ -110,4 +111,4 @@ VOLUME /tmp EXPOSE 22 CMD ["linux32", "/usr/sbin/sshd", "-D"] -# checksum: 23b30d538e449e7d3a20a0253ac38224 +# checksum: 92189d9c279c853a1bd178c6fa25d8ae diff --git a/xenial-armhf-tcwg-base/xenial-armhf-tcwg-build/Dockerfile b/xenial-armhf-tcwg-base/xenial-armhf-tcwg-build/Dockerfile index 3de5b1e9..b94c6bed 100644 --- a/xenial-armhf-tcwg-base/xenial-armhf-tcwg-build/Dockerfile +++ b/xenial-armhf-tcwg-base/xenial-armhf-tcwg-build/Dockerfile @@ -1,8 +1,6 @@ # Auto generated from tcwg-base/tcwg-build/Dockerfile.in. Do not edit. FROM linaro/ci-armhf-tcwg-base-ubuntu:xenial -COPY new-user.sh /usr/local/bin/ - RUN new-user.sh --group tcwg-infra:9000 \ && new-user.sh --passwd "tcwg-buildslave:x:11827:9000:TCWG Buildslave::/bin/bash" \ && new-user.sh --passwd "tcwg-benchmark:x:12326:9000:TCWG Benchmark::/bin/bash" \ @@ -16,4 +14,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: 4e31b90135e10180e50c92a82377abea +# checksum: b15ebe17cd47677d87e8489b0d8fd210 diff --git a/xenial-i386-tcwg-base/Dockerfile b/xenial-i386-tcwg-base/Dockerfile index 496d119d..6326e08d 100644 --- a/xenial-i386-tcwg-base/Dockerfile +++ b/xenial-i386-tcwg-base/Dockerfile @@ -102,6 +102,7 @@ RUN install -D -p -m0755 /usr/share/doc/git/contrib/workdir/git-new-workdir /usr && echo "MaxStartups 256" >> /etc/ssh/sshd_config \ && echo "MaxSessions 256" >> /etc/ssh/sshd_config +COPY new-user.sh /usr/local/bin/ COPY postfix-main.cf.in /etc/postfix/main.cf COPY postfix-sasl_password.in /etc/postfix/sasl_password @@ -126,4 +127,4 @@ VOLUME /tmp EXPOSE 22 CMD ["linux32", "/usr/sbin/sshd", "-D"] -# checksum: cb6ee278c0423b5434e71afdb95b02d8 +# checksum: c5b2ed5703c19113f8da87c5912480f3 diff --git a/xenial-i386-tcwg-base/xenial-i386-tcwg-build/Dockerfile b/xenial-i386-tcwg-base/xenial-i386-tcwg-build/Dockerfile index c597f700..b479ae17 100644 --- a/xenial-i386-tcwg-base/xenial-i386-tcwg-build/Dockerfile +++ b/xenial-i386-tcwg-base/xenial-i386-tcwg-build/Dockerfile @@ -1,8 +1,6 @@ # Auto generated from tcwg-base/tcwg-build/Dockerfile.in. Do not edit. FROM linaro/ci-i386-tcwg-base-ubuntu:xenial -COPY new-user.sh /usr/local/bin/ - RUN new-user.sh --group tcwg-infra:9000 \ && new-user.sh --passwd "tcwg-buildslave:x:11827:9000:TCWG Buildslave::/bin/bash" \ && new-user.sh --passwd "tcwg-benchmark:x:12326:9000:TCWG Benchmark::/bin/bash" \ @@ -27,4 +25,4 @@ RUN \ /var/lib/apt/lists/* \ /tmp/* \ /var/tmp/* -# checksum: aa092307b16e193c2a39ef6554ac4f4a +# checksum: be4e179e4b3ce2fd90e92f63564de77f -- cgit v1.2.3 From 06792ad313385fea82b7fa9a0871e76fdd3c9d07 Mon Sep 17 00:00:00 2001 From: Maxim Kuvyrkov Date: Fri, 1 Jun 2018 13:27:36 +0000 Subject: tcwg-base: Adjust handling of "--key file" option ... to require "--key .../authorized_keys-USER" filename format, and deduce user for which key should be installed from that filename. The "--key file" option is not used anywhere yet, so this is a NOP. Change-Id: Ia85d4092fbc3cbc4ef16f337caf83ae410595994 --- tcwg-base/new-user.sh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/tcwg-base/new-user.sh b/tcwg-base/new-user.sh index 7bb022dc..d3abe709 100755 --- a/tcwg-base/new-user.sh +++ b/tcwg-base/new-user.sh @@ -65,11 +65,12 @@ if [ x"$user" != x"" ]; then sudoers_file=/etc/sudoers.d/$(echo $user | tr "." "-") echo "$user ALL = NOPASSWD: ALL" > $sudoers_file chmod 0440 $sudoers_file +fi - 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 +if [ x"$key" != x"" ]; then + key_user=$(echo "$key" | sed -e "s/.*authorized_keys-//") + sudo -i -u $key_user mkdir -p /home/$key_user/.ssh + sudo -i -u $key_user chmod 0700 /home/$key_user/.ssh + cat "$key" | sudo -i -u $key_user tee /home/$key_user/.ssh/authorized_keys > /dev/null + sudo -i -u $key_user chmod 0600 /home/$key_user/.ssh/authorized_keys fi -- cgit v1.2.3 From a7f862f08787fd60e05dfa156459cb32ab475481 Mon Sep 17 00:00:00 2001 From: Maxim Kuvyrkov Date: Fri, 1 Jun 2018 13:35:02 +0000 Subject: tcwg-host: New TCWG images for running "host" containers on vanilla machines. Tcwg-host images allow one-command deployment TCWG environment on vanilla machines. The start.sh script bind-mounts docker socket to allow "build" and "dev" containers to be created from the "host" container. Change-Id: Icbfea97abed6a28b892edd98307d209796827ac0 --- tcwg-base/tcwg-host/Dockerfile.in | 10 ++++ tcwg-base/tcwg-host/authorized_keys-maxim.kuvyrkov | 1 + tcwg-base/tcwg-host/build.sh | 27 ++++++++++ tcwg-base/tcwg-host/gerrit-branches | 1 + tcwg-base/tcwg-host/passwd | 1 + tcwg-base/tcwg-host/start.sh | 59 ++++++++++++++++++++++ .../xenial-amd64-tcwg-host/Dockerfile | 12 +++++ .../xenial-amd64-tcwg-host/build.sh | 1 + .../xenial-amd64-tcwg-host/gerrit-branches | 1 + .../xenial-arm64-tcwg-host/Dockerfile | 12 +++++ .../xenial-arm64-tcwg-host/build.sh | 1 + .../xenial-arm64-tcwg-host/gerrit-branches | 1 + 12 files changed, 127 insertions(+) create mode 100644 tcwg-base/tcwg-host/Dockerfile.in create mode 100644 tcwg-base/tcwg-host/authorized_keys-maxim.kuvyrkov create mode 100755 tcwg-base/tcwg-host/build.sh create mode 120000 tcwg-base/tcwg-host/gerrit-branches create mode 100644 tcwg-base/tcwg-host/passwd create mode 100755 tcwg-base/tcwg-host/start.sh create mode 100644 xenial-amd64-tcwg-base/xenial-amd64-tcwg-host/Dockerfile create mode 120000 xenial-amd64-tcwg-base/xenial-amd64-tcwg-host/build.sh create mode 120000 xenial-amd64-tcwg-base/xenial-amd64-tcwg-host/gerrit-branches create mode 100644 xenial-arm64-tcwg-base/xenial-arm64-tcwg-host/Dockerfile create mode 120000 xenial-arm64-tcwg-base/xenial-arm64-tcwg-host/build.sh create mode 120000 xenial-arm64-tcwg-base/xenial-arm64-tcwg-host/gerrit-branches diff --git a/tcwg-base/tcwg-host/Dockerfile.in b/tcwg-base/tcwg-host/Dockerfile.in new file mode 100644 index 00000000..e28a08dd --- /dev/null +++ b/tcwg-base/tcwg-host/Dockerfile.in @@ -0,0 +1,10 @@ +FROM linaro/ci-#{ARCH}-tcwg-base-ubuntu:#{DISTRO} + +COPY authorized_keys-* passwd / + +RUN new-user.sh --group primary:10000 \ + && while read line; do new-user.sh --passwd "$line"; done /dev/null || true +docker build --tag=$image . +echo $image > .docker-tag diff --git a/tcwg-base/tcwg-host/gerrit-branches b/tcwg-base/tcwg-host/gerrit-branches new file mode 120000 index 00000000..11f6d349 --- /dev/null +++ b/tcwg-base/tcwg-host/gerrit-branches @@ -0,0 +1 @@ +../gerrit-branches \ No newline at end of file diff --git a/tcwg-base/tcwg-host/passwd b/tcwg-base/tcwg-host/passwd new file mode 100644 index 00000000..62479561 --- /dev/null +++ b/tcwg-base/tcwg-host/passwd @@ -0,0 +1 @@ +maxim.kuvyrkov:x:10967:10000:Maxim Kuvyrkov:/home/maxim.kuvyrkov:/bin/bash diff --git a/tcwg-base/tcwg-host/start.sh b/tcwg-base/tcwg-host/start.sh new file mode 100755 index 00000000..e730d95a --- /dev/null +++ b/tcwg-base/tcwg-host/start.sh @@ -0,0 +1,59 @@ +#!/bin/bash + +set -e + +usage () +{ + cat </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. + DOCKER="sudo -u tcwg-buildslave docker" +elif [ x"$(id -u)" = x"0" ] || groups 2>/dev/null | grep -q docker; then + # Run docker straight up if $USER is root or in "docker" group. + DOCKER="docker" +else + # Fallback to sudo otherwise. + DOCKER="sudo docker" +fi + +mounts="" +mounts="$mounts -v host-home:/home" +mounts="$mounts -v /var/run/docker.sock:/var/run/docker.sock" +mounts="$mounts -v $(which docker):$(which docker)" + +# Use at most half of all available RAM. +memlimit=$(($(free -g | awk '/^Mem/ { print $2 }') / 2))G + +$DOCKER run -dt -p 2222:22 --name=host --hostname=$(hostname)-dckr $mounts --memory=$memlimit --pids-limit=5000 --restart=unless-stopped $image diff --git a/xenial-amd64-tcwg-base/xenial-amd64-tcwg-host/Dockerfile b/xenial-amd64-tcwg-base/xenial-amd64-tcwg-host/Dockerfile new file mode 100644 index 00000000..f2cffbb4 --- /dev/null +++ b/xenial-amd64-tcwg-base/xenial-amd64-tcwg-host/Dockerfile @@ -0,0 +1,12 @@ +# Auto generated from tcwg-base/tcwg-host/Dockerfile.in. Do not edit. +FROM linaro/ci-amd64-tcwg-base-ubuntu:xenial + +COPY authorized_keys-* passwd / + +RUN new-user.sh --group primary:10000 \ + && while read line; do new-user.sh --passwd "$line"; done Date: Fri, 1 Jun 2018 19:03:31 +0000 Subject: tcwg-llvmbot: Re-generate Dockerfiles after previous change. Change-Id: I1577f46c7b3fee5b2f3daeab8a62dffc9091434d --- xenial-arm64-tcwg-base/xenial-arm64-tcwg-llvmbot/Dockerfile | 6 +++--- xenial-armhf-tcwg-base/xenial-armhf-tcwg-llvmbot/Dockerfile | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-llvmbot/Dockerfile b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-llvmbot/Dockerfile index a5327736..fb8fc11f 100644 --- a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-llvmbot/Dockerfile +++ b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-llvmbot/Dockerfile @@ -32,9 +32,9 @@ RUN git clone -b master https://github.com/maxim-kuvyrkov/ninja.git \ # Add current clang for libcxx bots. RUN \ - clang_ver=clang+llvm-5.0.1-aarch64-linux-gnu \ + clang_ver=clang+llvm-6.0.0-aarch64-linux-gnu \ && 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 @@ -45,4 +45,4 @@ COPY start.sh . ENTRYPOINT ["/run.sh"] CMD ["start.sh"] -# checksum: e518582a2a434e66d9c9388c0bd2fa91 +# checksum: 765b3adb1b9e9f5ee905e980c41f2a32 diff --git a/xenial-armhf-tcwg-base/xenial-armhf-tcwg-llvmbot/Dockerfile b/xenial-armhf-tcwg-base/xenial-armhf-tcwg-llvmbot/Dockerfile index 00ed72eb..51f57671 100644 --- a/xenial-armhf-tcwg-base/xenial-armhf-tcwg-llvmbot/Dockerfile +++ b/xenial-armhf-tcwg-base/xenial-armhf-tcwg-llvmbot/Dockerfile @@ -32,9 +32,9 @@ RUN git clone -b master https://github.com/maxim-kuvyrkov/ninja.git \ # Add current clang for libcxx bots. RUN \ - clang_ver=clang+llvm-5.0.1-armv7a-linux-gnueabihf \ + clang_ver=clang+llvm-6.0.0-armv7a-linux-gnueabihf \ && 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 @@ -45,4 +45,4 @@ COPY start.sh . ENTRYPOINT ["linux32", "/run.sh"] CMD ["start.sh"] -# checksum: 478e345cb93c7e7a70535a26606fb9ed +# checksum: fba53876c5cbd698ed2ca6b27da7f04e -- cgit v1.2.3 From d3a9d47bdb240bfc6a099579515fa85b9ca66cca Mon Sep 17 00:00:00 2001 From: Maxim Kuvyrkov Date: Mon, 4 Jun 2018 15:40:27 +0000 Subject: tcwg-llvmbot: Add tcwg-tested branch to gerrit-branches. Change-Id: Idd08066fcc3cb2916e201fc4ce40413ad38e6b28 --- tcwg-base/tcwg-llvmbot/gerrit-branches | 1 + 1 file changed, 1 insertion(+) diff --git a/tcwg-base/tcwg-llvmbot/gerrit-branches b/tcwg-base/tcwg-llvmbot/gerrit-branches index fb49cdf8..dd2dd2e9 100644 --- a/tcwg-base/tcwg-llvmbot/gerrit-branches +++ b/tcwg-base/tcwg-llvmbot/gerrit-branches @@ -1,3 +1,4 @@ master +tcwg-tested tcwg-staging tcwg-llvmprod -- cgit v1.2.3 From 1e444e7aa0559784d679be8044c29063bccc7174 Mon Sep 17 00:00:00 2001 From: Maxim Kuvyrkov Date: Mon, 4 Jun 2018 20:14:08 +0000 Subject: tcwg-base: Touch gerrit-branches to force initial build of *-tcwg-tested images Change-Id: I6405895365b0f8126ca9bf7b36f95904518c4614 --- tcwg-base/gerrit-branches | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tcwg-base/gerrit-branches b/tcwg-base/gerrit-branches index 2afcbc2d..ad45dd4e 100644 --- a/tcwg-base/gerrit-branches +++ b/tcwg-base/gerrit-branches @@ -1,3 +1,3 @@ master -tcwg-staging tcwg-tested +tcwg-staging -- cgit v1.2.3 From 47bde2dd97c1bf74dfc2614f7427e93a26794169 Mon Sep 17 00:00:00 2001 From: Maxim Kuvyrkov Date: Tue, 5 Jun 2018 12:24:55 +0000 Subject: tcwg-host: Generalize handling of /home files Change-Id: I33b65cc9657a399367379eb85543408b4687cc5a --- tcwg-base/tcwg-host/Dockerfile.in | 18 +++++++++++------- tcwg-base/tcwg-host/authorized_keys-maxim.kuvyrkov | 1 - tcwg-base/tcwg-host/build.sh | 4 ++-- .../home/maxim.kuvyrkov/.ssh/authorized_keys | 1 + .../xenial-amd64-tcwg-host/Dockerfile | 20 ++++++++++++-------- .../xenial-arm64-tcwg-host/Dockerfile | 20 ++++++++++++-------- 6 files changed, 38 insertions(+), 26 deletions(-) delete mode 100644 tcwg-base/tcwg-host/authorized_keys-maxim.kuvyrkov create mode 100644 tcwg-base/tcwg-host/home/maxim.kuvyrkov/.ssh/authorized_keys diff --git a/tcwg-base/tcwg-host/Dockerfile.in b/tcwg-base/tcwg-host/Dockerfile.in index e28a08dd..3e876f13 100644 --- a/tcwg-base/tcwg-host/Dockerfile.in +++ b/tcwg-base/tcwg-host/Dockerfile.in @@ -1,10 +1,14 @@ FROM linaro/ci-#{ARCH}-tcwg-base-ubuntu:#{DISTRO} -COPY authorized_keys-* passwd / +COPY passwd start.sh / +COPY home/ /home-data/ -RUN new-user.sh --group primary:10000 \ - && while read line; do new-user.sh --passwd "$line"; done Date: Tue, 5 Jun 2018 12:46:44 +0000 Subject: 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 --- .../home-data/maxim.kuvyrkov/.ssh/authorized_keys | 1 + tcwg-base/home-data/tcwg-benchmark/.gitconfig | 3 ++ .../home-data/tcwg-benchmark/.ssh/authorized_keys | 1 + tcwg-base/home-data/tcwg-benchmark/.ssh/config | 60 ++++++++++++++++++++++ .../home-data/tcwg-benchmark/.ssh/known_hosts | 30 +++++++++++ tcwg-base/home-data/tcwg-buildslave/.gitconfig | 3 ++ tcwg-base/home-data/tcwg-buildslave/.mailrc | 1 + .../home-data/tcwg-buildslave/.ssh/authorized_keys | 1 + tcwg-base/home-data/tcwg-buildslave/.ssh/config | 60 ++++++++++++++++++++++ .../home-data/tcwg-buildslave/.ssh/known_hosts | 30 +++++++++++ tcwg-base/tcwg-build/build.sh | 4 +- tcwg-base/tcwg-build/tcwg-benchmark/.gitconfig | 3 -- .../tcwg-build/tcwg-benchmark/.ssh/authorized_keys | 1 - tcwg-base/tcwg-build/tcwg-benchmark/.ssh/config | 60 ---------------------- .../tcwg-build/tcwg-benchmark/.ssh/known_hosts | 30 ----------- tcwg-base/tcwg-build/tcwg-buildslave/.gitconfig | 3 -- tcwg-base/tcwg-build/tcwg-buildslave/.mailrc | 1 - .../tcwg-buildslave/.ssh/authorized_keys | 1 - tcwg-base/tcwg-build/tcwg-buildslave/.ssh/config | 60 ---------------------- .../tcwg-build/tcwg-buildslave/.ssh/known_hosts | 30 ----------- tcwg-base/tcwg-host/Dockerfile.in | 2 +- tcwg-base/tcwg-host/build.sh | 4 +- .../home/maxim.kuvyrkov/.ssh/authorized_keys | 1 - tcwg-base/tcwg-host/passwd | 4 +- .../xenial-amd64-tcwg-host/Dockerfile | 4 +- .../xenial-arm64-tcwg-host/Dockerfile | 4 +- 26 files changed, 202 insertions(+), 200 deletions(-) create mode 100644 tcwg-base/home-data/maxim.kuvyrkov/.ssh/authorized_keys create mode 100644 tcwg-base/home-data/tcwg-benchmark/.gitconfig create mode 100644 tcwg-base/home-data/tcwg-benchmark/.ssh/authorized_keys create mode 100644 tcwg-base/home-data/tcwg-benchmark/.ssh/config create mode 100644 tcwg-base/home-data/tcwg-benchmark/.ssh/known_hosts create mode 100644 tcwg-base/home-data/tcwg-buildslave/.gitconfig create mode 100644 tcwg-base/home-data/tcwg-buildslave/.mailrc create mode 100644 tcwg-base/home-data/tcwg-buildslave/.ssh/authorized_keys create mode 100644 tcwg-base/home-data/tcwg-buildslave/.ssh/config create mode 100644 tcwg-base/home-data/tcwg-buildslave/.ssh/known_hosts delete mode 100644 tcwg-base/tcwg-build/tcwg-benchmark/.gitconfig delete mode 100644 tcwg-base/tcwg-build/tcwg-benchmark/.ssh/authorized_keys delete mode 100644 tcwg-base/tcwg-build/tcwg-benchmark/.ssh/config delete mode 100644 tcwg-base/tcwg-build/tcwg-benchmark/.ssh/known_hosts delete mode 100644 tcwg-base/tcwg-build/tcwg-buildslave/.gitconfig delete mode 100644 tcwg-base/tcwg-build/tcwg-buildslave/.mailrc delete mode 100644 tcwg-base/tcwg-build/tcwg-buildslave/.ssh/authorized_keys delete mode 100644 tcwg-base/tcwg-build/tcwg-buildslave/.ssh/config delete mode 100644 tcwg-base/tcwg-build/tcwg-buildslave/.ssh/known_hosts delete mode 100644 tcwg-base/tcwg-host/home/maxim.kuvyrkov/.ssh/authorized_keys diff --git a/tcwg-base/home-data/maxim.kuvyrkov/.ssh/authorized_keys b/tcwg-base/home-data/maxim.kuvyrkov/.ssh/authorized_keys new file mode 100644 index 00000000..fa17c380 --- /dev/null +++ b/tcwg-base/home-data/maxim.kuvyrkov/.ssh/authorized_keys @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDR1x3iMEd7BSXx6QE3NtfVF8kYUUVoWUKCCC0jxOiLYCY3wf1i7bfQD7YMITEwXMvwQe6thGefBMLRPWr7WdoiUvxdaLYbSB72T4zN5tK/oQhFOHR8cqG68oSZIY89lUzFaGJRMGzSxUvYUWkwUhOIsjOBKFm+/yT4CD4SmUuFwQAadC6/t+jwc1LinYRMqphgfssUk8uzrvB0cqj2UsYrDF0jTVALfyTwWKHBokuZPnUER92v5e70/vAyOzJv13YdsQcwQBa1tBLrJJPpz8uX65bMLXJ6k+9U6bYSeVtRzYtmdDj5BYvdkJTR8diChLRS75roJclYpLEv0U9foCjd maxim.kuvyrkov@linaro.org-20150420 diff --git a/tcwg-base/home-data/tcwg-benchmark/.gitconfig b/tcwg-base/home-data/tcwg-benchmark/.gitconfig new file mode 100644 index 00000000..d0ea2be3 --- /dev/null +++ b/tcwg-base/home-data/tcwg-benchmark/.gitconfig @@ -0,0 +1,3 @@ +[user] + name = TCWG Benchmark + email = tcwg-benchmark@linaro.org diff --git a/tcwg-base/home-data/tcwg-benchmark/.ssh/authorized_keys b/tcwg-base/home-data/tcwg-benchmark/.ssh/authorized_keys new file mode 100644 index 00000000..536483eb --- /dev/null +++ b/tcwg-base/home-data/tcwg-benchmark/.ssh/authorized_keys @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC1u4GVTRNPWVnU9YRUZPeUql0vjm3sD4F6KG68OpMAtbR8F8q1dCOgeOjPOipznJP4ghVakPrEQSOPnbnlMhNg9FQbScwXctmLknKsXrKSCuef+PEs7YRCmb+mD1RBXaoOChaNV1O7dt5tnRbqYT4k97ojwbLqIBwHWF0l8+3kY0R83LJBK2JCdZN2zfzg7xnumx700uGICPRozFMLszuIRu/oDC14bJnOFd9htcW2KzU1/oPPUhDScmVTYKjyRm8QGudElHTy1wGMroApnuc+NCCY8iy8A7GfxIX48aghnb3kh57P0W6jyc8bpBtMieYCwBRMR/imyvbpWF8Tlbnu0C0uMg4mSU15daJLrdv446xmcb2WB/xxz437fpVchAOz0H+Hao24DQFIzzCOnkgDXixP/43kybRi/8IqAXjJhCRO+8bHVXOESDhH6kidERIaSAiT+LG2uTgufxoWuFWm8fftLj7oKBx+SpMymSNofDHRWa4XGBO66dP1Ijmu2jRH5Z4Pnxy25tVPReOVSXyT/fkzd0+kpFUR0mEjl9ahZliZMFSSMdm3vDqqt7oQWxlMc6Dl1MMQ1iWzvRWRVSyofw6Fp2rretVbDmW+kavxxGRrWFr73EWrn47yC+mqR7DouaQ8wC/baU1GXZ6ouoY1kalNMSmGLTMMrLlclpz2mw== tcwg-benchmark diff --git a/tcwg-base/home-data/tcwg-benchmark/.ssh/config b/tcwg-base/home-data/tcwg-benchmark/.ssh/config new file mode 100644 index 00000000..47e5dbf0 --- /dev/null +++ b/tcwg-base/home-data/tcwg-benchmark/.ssh/config @@ -0,0 +1,60 @@ +# === BEGIN: TCWG SSH configuration === +# +# !!! THIS MUST BE COPIED TO THE START OF YOUR ~/.SSH/CONFIG FILE. !!! +# !!! IF YOU REPORT A PROBLEM WITH SSH, AND THIS CONFIGURATION IS NOT !!! +# !!! AT THE START OF YOUR FILE -- YOU HAVE OBVIOUSLY MISSED THIS VERY !!! +# !!! IMPORTANT NOTE. AS PENANCE, YOU WILL READ THIS NOTE OUT LOUD. !!! +# + +Host *.tcwglab *.aus-colo people.linaro.org aus-colo.linaro.org lab.validation.linaro.org + #User @LDAP_USER@ + #IdentityFile ~/.ssh/id_rsa + +# Proxy connections to custom ssh servers (inside containers) on firewalled +# hosts through "main" ssh server on that host. +# E.g., "ssh -p32768 proxy.dev-01.tcwglab" +Host *proxy.* + ProxyCommand ssh $(echo %h | sed -e "s/proxy\.//") nc -q0 localhost %p + +# Access to Austin Colo. E.g., "ssh r1-a7.aus-colo" +Host *.aus-colo + ProxyCommand ssh aus-colo.linaro.org nc -q0 %h %p + +# Access to LAVA Lab. E.g., "ssh root@10.7.0.18.lab" +Host *.lab + ProxyCommand ssh lab.validation.linaro.org nc -q0 $(basename %h .lab) %p + +Host *.tcwglab *.aus-colo *.lab + # Enable automatic multiplexing. + ControlMaster auto + # Soften up potential problems with killing master connection by using + # ControlPersist (which puts the master connection in background). + # Also ControlPersist has an undocumented feature that it will clean-up + # and replace stale ssh socket from a zombie connection. + ControlPersist 5m + # Put the ssh socket on /tmp. Note that overlayfs can't host sockets, + # so we always arrange /tmp to be on a ext4 or equivalent FS. + ControlPath /tmp/ssh-%u-%r@%h:%p + # There is little point in forwarding X11 to machines outside of local network. + ForwardX11 no + # Forward authentication agent and keep private keys in one place. + ForwardAgent yes + # Ping server every 5min to avoid routers dropping connection. + # This matches -o BatchMode=yes setting used in cross-testing (see ABE) + ServerAliveInterval 300 + # Disable checking of host keys for boards behind gateways. + # !!! BE BECAREFUL TO ONLY DO THIS FOR MACHINES BEHIND SSH GATEWAY OR VPN !!! + StrictHostKeyChecking no + # Don't store host keys for one-time containers + UserKnownHostsFile /dev/null + # Don't warn about "adding" host keys to /dev/null + LogLevel FATAL + +# Make sure we can connect to localhost (e.g., to a container running +# on localhost) with the settings for *.tcwglab +Host localhost.tcwglab + Hostname localhost + +Host git.linaro.org dev-private-git.linaro.org + User git +# === END: TCWG SSH configuration === diff --git a/tcwg-base/home-data/tcwg-benchmark/.ssh/known_hosts b/tcwg-base/home-data/tcwg-benchmark/.ssh/known_hosts new file mode 100644 index 00000000..b649d65f --- /dev/null +++ b/tcwg-base/home-data/tcwg-benchmark/.ssh/known_hosts @@ -0,0 +1,30 @@ +aus-colo.linaro.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBP8apVdw/JC+4rOiq/eG2LgjwJPCqKIlG/RwPVDe1VNOdtrmR6VnTQ5oQYkwt00h2rdI6dVzdW8Q9za7PGW6Sls= +aus-colo.linaro.org ssh-dss AAAAB3NzaC1kc3MAAACBALdjDe/FnDjKDz+QzKWD/J1jIVVjied+1EFcxZ/uyGw9uZwVjReHP6ehGQCtQEM+SDklOXc6bz9UeBjG6+gDGXWBmldbS2yXvvxFmmbOf40h/rVFKq0CW/tJxyONoaf75Qj+aOyo3iUXMl+jJowb+LR5j0zbdTrSkM2qEsP8o0b3AAAAFQDfNOi88rFXdks5xpzmiKs0fzyYGQAAAIEAnzYTZ0dDAua6FHgqfoNVZHS4CV/le6G5FFCc4Kp4lB9ijRMjrDZNey5BkCooetqOBuPF8mYYAgZ28NemIUvvTenddfHFzWQTPl0meAdUhBW4EJMq0HWEV+kUKANUah2QlXWx8/g1x3cOhBzABTMOEBUFnlMx9d5A71JZypEN5UQAAACACiH996M1x/DjYmMp6BLwglYMDjQPrfI7QhNwa/8/wukDHlB6puB/HdPyxYZp/IVShHze6C3YpmV+dXxc85/vMNoVRx02ICC2gTkm2MoSFgaW1nO95tRPtyJ4AXa4ev4D22hNPF5SxgXfn2lT4uH8bWxvTrzgHs7JhAzD0oRbOh4= +aus-colo.linaro.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCg5vMfuBLRroqEb6+CFLQikh1Wq6UD++SODY7bSdPDfN1wmurdp60AdVU+22nOXgK78mwYPJ0PEcTBMSE+OmryfZFDZm/+aPbALid/vFs8NuvFmEQ8vecEBPDGxJ3RpVxkNG5BrWMTJjWMJTCFdIh9my5vhBPEloAuDRthRNaRwvgqRw3GJAbSG2Cg4ZgOQi7Lv3ogQ/M3nXzy8KMp4KD7AtncylguPoVwDxNwjl+YoEujZDvpM4UiZDnh+Gxeru3EnEIgDvwbMizlrKL8Tm+2gA+j3cWkgIjCVJM+PW8V0aobp681ChqlbDlzK0oVmwUafdVv3dxzOSrjQH2rkaOn +dev-private-git.linaro.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBOvq8E5HPzrBlxmckzsE3rz9LAx9c0faEfofALaO+UGC4HAst9fMaZcHaCqu+b8SVY/2VcBvMYMwO1ZPgOn0rXs= +dev-private-git.linaro.org ssh-dss AAAAB3NzaC1kc3MAAACBAK10xjDXtqiW6S02TFvIQUmjTyu+tpiT0IVTp5dlZX5rT1EDi4DtRgtoO/R4WncAs0GE8FqaI/IqljuYlJbHOrFCxU3OWKB+z2Ue3oXs3kouoFP3coF4exBZLEBX4JQ/HI5Ii88fnE/U70/+wN/mMAtcOrsgGWGXOv8yFZEQaKJJAAAAFQCfVbaD5KdaABTLwQ8CXRuZ+PAeHwAAAIBmppcf9sx9M4KAgiOQRGW+7/eImJHFRazQSe8Qbiqo0H7OQhIRcLIm6+PAtKgxxSaQErAo4z/xM7d2lhqOyydK5GDpILgV3qHUFAgQ9vajL+ga5/VeRTqg6R91kYgIKnEl3y8/iW6eRcJF/jzYfDcaFG0Z3gsOtHzjTsCuV8KMLwAAAIBupI2LDTsUYa64hSKvGhEVPMj8VKx5RX4NWQU/dlNNhlFRTzV42giujZ146vH5SGqagR3daX+o6Xm++GDJ+AedzJ8zBc9dAwU7ao4fd23bsyURvNxC7K5DKJnlCDS6xk+6wv6Hz9VdbaIEE5TPxSGqZEOK1V+pbgv+cMUGACy43Q== +dev-private-git.linaro.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC34bjTOKJIq8MVSeC5gddQlbR0hyvvTZbrpW7KXgCzkLTFZxa05wbz8VC1l7ruPotQBgrICgLYmrbjrASqcY//9OPLDa1Pf/MUIu2F2lA1W/5E3psGYmyC9GTvmjKgu39Rad5ujXMeMLjuzVPCmo+WhewgugDSV4Fcggd6B6YXHGtoE15ctSw4moerUq1+2BXVgFxUyMoGcpSCeLnbvWpmi6xWoGQOSnrQ4Z/VmZ5WZ87vQsiiWEAsqmMOHHacunnSph7uzQXJlHNajdeGnr2NF+EgcmQ0N6vivZDRLmRYuSmizjCOHSRZxSm/0UJC/ewVzp9BwRepiNKWsjb4gTMb +[dev-private-review.linaro.org]:29418 ssh-dss AAAAB3NzaC1kc3MAAACBAM596jW8Kbsh/ApdoP3r7UvrSOzhnoG1ZHYngER+Dd9e0iGJY1Wbpth7ngngpALl3PQQ99R5xUt8wvcOcICq+vF34FR/Gym+7VjaMLI7DxF48OrUAJnx6zINNlpXbMAI0nptWcKoL/xdmC7AoBOjH1Q+jGTiKISmXTE1w5iK8qp3AAAAFQDwzizM3qhYdknasNV/vp84o19FWQAAAIEAqLjr9vNsgr1snOdyKOhRuyidqf/zThaxuJaUktxLDKU0DDip+FGqLYiS2VzNuSWMaKjkBjITBi0sXktmUhhbPvBHhyzLy3Hz6BOdXpUAoq70QMOcocE9IsEfmqtkOsx/BZ1uCV6W051Gsci4PxK16q9zolpAEp4/3wEWGH+ueJIAAACAERdZ+vCZl6iDzq6XpYFKZ1r6i/CjX5KIBWKCzoN/Z8fo96rZqFA23G5tXM8+YMYnLdwb/qvNSCz6dWpH2FMS4yj7zo2l3GjguC8JOfar0Rt8fihJyaynX+rD/aP3b+h5ot1b/645qrfvpfmeh3gZt3c1kjy5fyopujyGNTUtq6c= +[dev-private-review.linaro.org]:29418 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCofUDWYYwzE4YWotCffwCxLoRuVCMb6DP+eObwbTPHMe5asK94Y1jPNeK1yUVJIuIAUO8aA6pIq3uLKlusyGLZe1YBpM+7YX3HMOBfCOeOemHFxETlj/HC7islYLYT7Sm/DweiN1kxgP8Q/PhPIA5czCZGHS/+T/VLbMApyyzdTmswaqfgJejyK9juHAcmxT3Tupj2SGOuOamyKfhfsPxGwIchivy/mt7xBTk5cNiSDeLAfMn2rHsilfLjb+IoeE6EvtqG3+rTh+ttulHp2vSeZkK79tuyVWt+XOZjD4RDfk1taW9JjaafkyOW0VCF4gqOMfJU24u88xTCgqkgT1bN +dev-private-review.linaro.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBOvq8E5HPzrBlxmckzsE3rz9LAx9c0faEfofALaO+UGC4HAst9fMaZcHaCqu+b8SVY/2VcBvMYMwO1ZPgOn0rXs= +dev-private-review.linaro.org ssh-dss AAAAB3NzaC1kc3MAAACBAK10xjDXtqiW6S02TFvIQUmjTyu+tpiT0IVTp5dlZX5rT1EDi4DtRgtoO/R4WncAs0GE8FqaI/IqljuYlJbHOrFCxU3OWKB+z2Ue3oXs3kouoFP3coF4exBZLEBX4JQ/HI5Ii88fnE/U70/+wN/mMAtcOrsgGWGXOv8yFZEQaKJJAAAAFQCfVbaD5KdaABTLwQ8CXRuZ+PAeHwAAAIBmppcf9sx9M4KAgiOQRGW+7/eImJHFRazQSe8Qbiqo0H7OQhIRcLIm6+PAtKgxxSaQErAo4z/xM7d2lhqOyydK5GDpILgV3qHUFAgQ9vajL+ga5/VeRTqg6R91kYgIKnEl3y8/iW6eRcJF/jzYfDcaFG0Z3gsOtHzjTsCuV8KMLwAAAIBupI2LDTsUYa64hSKvGhEVPMj8VKx5RX4NWQU/dlNNhlFRTzV42giujZ146vH5SGqagR3daX+o6Xm++GDJ+AedzJ8zBc9dAwU7ao4fd23bsyURvNxC7K5DKJnlCDS6xk+6wv6Hz9VdbaIEE5TPxSGqZEOK1V+pbgv+cMUGACy43Q== +dev-private-review.linaro.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC34bjTOKJIq8MVSeC5gddQlbR0hyvvTZbrpW7KXgCzkLTFZxa05wbz8VC1l7ruPotQBgrICgLYmrbjrASqcY//9OPLDa1Pf/MUIu2F2lA1W/5E3psGYmyC9GTvmjKgu39Rad5ujXMeMLjuzVPCmo+WhewgugDSV4Fcggd6B6YXHGtoE15ctSw4moerUq1+2BXVgFxUyMoGcpSCeLnbvWpmi6xWoGQOSnrQ4Z/VmZ5WZ87vQsiiWEAsqmMOHHacunnSph7uzQXJlHNajdeGnr2NF+EgcmQ0N6vivZDRLmRYuSmizjCOHSRZxSm/0UJC/ewVzp9BwRepiNKWsjb4gTMb +ex40-01.tcwglab.linaro.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBBblrQ+VuEY6mQDq10+GgOPYJIsTfaHXYZi0O0mPr+ev1xNodJ0w45hiWWlmsLEiXiGsvvIiOgZcZsryCkGscDI= +ex40-01.tcwglab.linaro.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC37ZZKNZpSxQnWcu/5eNpFpEjIzL5eZyKUbn8ghkmk4jVS7fIbty/6s1ZH94UPwQDb07F4QF89esoH5k2ajAizLMNoLxeHU8ZCcqMFaNcmVWjTxKbiXLwRqcrgLUrNMQIGesV8l+xH+yozG2HKOBAnMVaea9+wCFvJWXgO4u54eEup2JcE3UroWIRA/mOL4KhBbyVVe47NbydYbP5G0mqpJjpLv5TuJwRT/aP/0nRH6cPrzuqGbic7cVR7Bu3f6ipttMAsPQRAoFBVYb5yRAt/RcDBu39r7hLHyhitjw0vBhGGV0B5CEzAqCE3ZyU0H+vmQ2GeN8aEtUWDSK9W7uzJ +git.linaro.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBONeIVl09BaG0iDOqF/qZjDun8fktYdD0Zl2fRAkSGT6Q7ULAXWJZA7IwstvcSs5w9SRV6x/lNc3CqlHwMFaABc= +git.linaro.org ssh-dss AAAAB3NzaC1kc3MAAACBAJbwbYgvbS+8vnlhJLe1AwgvbBqu0kBw7pBjQgF47lXRKqZbzwQc+hHmMbczJOfIoo1PX39Ifhz142u+yN7PQgUlU+jzI2Q9cjSqfrS02rV0cU2TQRKvgTQH89qMk2M0jOimcz1UCZkCgS2wj6hb1HU9pkhzpH7d+1/M/31Xc5uPAAAAFQC82/+3qHmNd8G8mrPJz9LfdUpsmwAAAIASypGV3LlIOE3bDlZwgr3rZ+44MPq7c16SbpjnjqbsOzPAyllD8MeY0eynuDqtGtT4RtC8uRgmgw7MW1HtYnTSlYt0up66LT19LCRKme8CVtggqjwLTUEKWmrdbe+PSvczKjeszOD0R5qGasSvOOKMJ5jLMnJ9jMhHhItc53eM5AAAAIBXWdudBBziVVk9VE+z1kvOYsCGYosLglqzJMsFfVQh948Ci9PowKx8xognWEtdaZW7+2oEIwL8QR+zPtzNY447i6iRuJy1TaDZfJU8nTfr07KoXB4B7rhADByXl4x9Uk25m9n9XjF/ctjIzyspvcRpqZXMHBUuZalID6E39YJqnA== +git.linaro.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8Q8j887I9mBD2va9C7gWl4Cr8agHWxuFHfDUWaqiygI9jA4w2YC7mo5oJMqwUk2DsvPDLuU5Z6yyKSA7Cko+L0MnKfNMzQ8e00ZXGDBq8bh1tRKstFselAFmmg+5DhM9q9HPjpKYzbAxU6rxmdFbSc+ktE0rhtmciThVT3YW3bMs3g+D+6sf6ER9UkSpbdZ7skKFXBHw2t1BWaPrvW4L8GMFAokgXUKOE8e1WZkQuCcseIz8J9Hz1p/liyiiTPVQnjGyleUnUY0pZA3ViB6pS317BH5Kvd8aX8x0vSwCIs30rpkmBam9C0b2uj2jWk3GrmHYjVHebMAW376VSLTZV +git-us.linaro.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBONeIVl09BaG0iDOqF/qZjDun8fktYdD0Zl2fRAkSGT6Q7ULAXWJZA7IwstvcSs5w9SRV6x/lNc3CqlHwMFaABc= +git-us.linaro.org ssh-dss AAAAB3NzaC1kc3MAAACBAJbwbYgvbS+8vnlhJLe1AwgvbBqu0kBw7pBjQgF47lXRKqZbzwQc+hHmMbczJOfIoo1PX39Ifhz142u+yN7PQgUlU+jzI2Q9cjSqfrS02rV0cU2TQRKvgTQH89qMk2M0jOimcz1UCZkCgS2wj6hb1HU9pkhzpH7d+1/M/31Xc5uPAAAAFQC82/+3qHmNd8G8mrPJz9LfdUpsmwAAAIASypGV3LlIOE3bDlZwgr3rZ+44MPq7c16SbpjnjqbsOzPAyllD8MeY0eynuDqtGtT4RtC8uRgmgw7MW1HtYnTSlYt0up66LT19LCRKme8CVtggqjwLTUEKWmrdbe+PSvczKjeszOD0R5qGasSvOOKMJ5jLMnJ9jMhHhItc53eM5AAAAIBXWdudBBziVVk9VE+z1kvOYsCGYosLglqzJMsFfVQh948Ci9PowKx8xognWEtdaZW7+2oEIwL8QR+zPtzNY447i6iRuJy1TaDZfJU8nTfr07KoXB4B7rhADByXl4x9Uk25m9n9XjF/ctjIzyspvcRpqZXMHBUuZalID6E39YJqnA== +git-us.linaro.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8Q8j887I9mBD2va9C7gWl4Cr8agHWxuFHfDUWaqiygI9jA4w2YC7mo5oJMqwUk2DsvPDLuU5Z6yyKSA7Cko+L0MnKfNMzQ8e00ZXGDBq8bh1tRKstFselAFmmg+5DhM9q9HPjpKYzbAxU6rxmdFbSc+ktE0rhtmciThVT3YW3bMs3g+D+6sf6ER9UkSpbdZ7skKFXBHw2t1BWaPrvW4L8GMFAokgXUKOE8e1WZkQuCcseIz8J9Hz1p/liyiiTPVQnjGyleUnUY0pZA3ViB6pS317BH5Kvd8aX8x0vSwCIs30rpkmBam9C0b2uj2jWk3GrmHYjVHebMAW376VSLTZV +lab.validation.linaro.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBFZDLd4f9cph9A64+kXUpGvuRmInB3HAtHU9T6wVIsp4HkYLLZD59I4lF/u2VLfM7j10XMNPO7ybOJMM+1zIZlM= +lab.validation.linaro.org ssh-dss AAAAB3NzaC1kc3MAAACBAK75t/OG68cN0mtVNrliCi8/7tajozJQDGvxgnpben1F84IzWNJpBdtEgaXeo3zD0cQl1nM5IftBjSKMkomdsaDh7u6A57juaANU9NKIXW2BGmaICZxllFAb/Cmnq4mDnZJ33G5UyGPVA49bUEKw8DLe8FLVlO/wcghJhjoy7prZAAAAFQD8zrwLDwd4M4vKKWu9nju7fI3oywAAAIBVE6ykor/q56qYTYqaAvcRkq7331jdYHTqiAVcO9KyrdOS7yCgtb2Dw+O0rq5ftLSF73ad5ACbw+XbzQVJAeKDaDs5mLf3eYF0+3YODFRHYDsbbihO0uZcGHFPvGDD9odBZhWFIZaFSdboodSuyzxIgLu0EZAsHoSP2wjTGdiXFwAAAIAkPcANYxo0jm8BuCEYR+SXXS4aj83dUGbPP54UU7M+jrrfG1M+JVFh3kEsXr9zptZajY+NrqlnXqPp4HZyORUUEN+Szkjbd2p8CCCQvv1PODGJtXFzwpatUP27I2ik/lZG9OXxBQkO+QxjuJ+pcjXPdBRz6DwWoUM63+QFXBLpsw== +lab.validation.linaro.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDtto5bsPJ3NuXsWtwMR8bsAzLvkBstmF1QP+eC6jUBsCDHMtBW/zAWJYNPDr30vRkV7J8D64Pd91rgjbqF8mOPDlyVlln03dYtOV3hzVuXLZfxodslJsw4lB+ZhxLfcZAKqqFURJEhrJNJmtFBprxFRbdS1iQHJHJohg3zS9zlLFvUpZGWooLFEM2z2NdUfSiR12ePvdW1YsEimJR/b3h1it/Wot0uEB6VONZGyMrrWvsntJV1NdQFxJR8waTz1sBvQQBJGX+SgEXY1CB3AUiF4yIy5WZ/4YCOk0kO9qABvV0Ks357OU5uY5GMgalAy2RJyvceNf6erlR4vwmpdnDH +people.linaro.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKKtlH9IGVw1wE3daicRzyOdIM9MzWfUH1tUB8R/md36RDTSqG8VGYrn1E5pJcs7rsk05ZCUQIaglefMytoOvQ8= +people.linaro.org ssh-dss AAAAB3NzaC1kc3MAAACBAOnQwFbvISNteLPMb/Srm2xwFDrxDql+kxtlZyohrSZ72K9GDg+dqb4W7/QiVrOMhfRzaL93Hj/FLCxKqUXdnTQqekqGosRQK7fLNJvh6DNizoJ+aWzKp1EL3kF2GgKP33ZPtRJYrBdxnc+DDc0yP/He3cyrzbg1nsWSedc1MMVpAAAAFQCm3xIrM1iR9ozuyjKRGwhnrKo9GQAAAIBkdN4dNB298m+2aXqMmLOj1Ry9/S6CTiMn5c9T/luYpWFRnsyuHlBIcZFjyOMtU3bc8b7KwqP8t3XTQbolbqtYOWqPeiaIH/VAk7w9o1tePRwtbTadksYw+UJGtn9c+52uQfGZdjfyjsKs7hEWgE72gTeIb9g1QZ+WCoVfSzNacgAAAIA9T2ONJcRFX3heeDcl6gho8Wj264GDhS5/iqdMCClO3wKUY04hPSpXKRhRm/zzFGb9537Qj6LluDAcg+m/D0FnoQkILLXnfiMnrlyoCCA/jZWrVZw8aQdDHM5LlDdDZKZV7djkbjF0nVvWRTrvc20yQeDLLImaTDOfYjmJ75L1vQ== +people.linaro.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8OveP3mffvlzMEGuZQzol8zoDwCdAzrNiBfX9rv6lDGr86Sl4MVKs/6cYdjbtrUJD7ls5gc8cfjH5EXPh/HuoBj7Bi+UNfyyGSqrZgTFPpyLx50QJDeogcUN54NL+N/X6HtQtyvGwEXgb26S9ec7LFfyxqT8Yy370XH/y7qAtJgS3UTkf8kzIWgZQvU5MU3FqhOn9mzI+KqsBMRKt0JpW7H2VRYiaHqpshwpuNHRDEQBMnRVHDpo8SZRq21pwRjdTzuzGJv2enCW018jWC/HMmTaaDWzX6SO+JQs9NFVUpM6hg+ysa5piDXnCNQ8Ry6l0nlAjgUt92NEe4OeANrt9 +[review.linaro.org]:29418 ssh-dss AAAAB3NzaC1kc3MAAACBAPB0SE19HQ0dEtm3Unp7+JiNeHlIWNs4j9yN+2Q/fxmBT2ZZ0a5I4gg63b5rM/1Li/6k0f/CtSYBH/mhmjKaEKIQV/c/lmuZivUAfTPT0ld3voXHwRhgpWI/WOiRdsTRZZW2yUHx/troO53mx4eIISKfab+t+vCU5Af+sgTBF6InAAAAFQDGR2ccfQSWVuSyzgvK8f7FT8olTQAAAIBHZqySRfjEnnx9h0aS6i2H21dmZxUllwIJpdpS6XWzvMzVwBb1DKx8bO0WwZeTnxxs1BKVAjmSDkDGYJWHxyU8kQ8aFsBo0KwbNEKXozaK3Gf2YF289xQsigbtPUWYXDz1PNEXtIS9AXdCRq4i09ujO3ayxq4lX2n0LIQ4IhM+RgAAAIB2SvnzVadjW14AN9F9ZEfnK0JRpBTKjz+kQSS1TJiRI/dSHG6CwwXjD1G9YW8mfGhPOPYHIE2MF2n7d7DfqBdeeee0PnwBQ0YBc5qfhQ9Gpi+hqXSem1YaD2YRG40que5bu/Rd6NksnSLg/93Z3L3fN+qTeApRqHQWRrfswGgi+A== +[review.linaro.org]:29418 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDMfTLkTmsbtahAiVJTKXRFbR9MQ/vDH/JPj4QN3XPHJuubxLhUf8WObEBtML7J11uvVM1oDTwM5YG5yjyBnc+85OaQaB9tMPDheGhfMG40F4vxdSnQL29ihyrls0hrFTY9UZ4Y2FmJwYL0rOnGU7iPyNuExQwfg2bkdw67aH9nEGjSd2eXYl2bI4DHujy5GJiV3dR9TlUF0iaSeHVSIX5t9I/BXK+AiSqHTrvwdGGi9XvL6xEWYMOZOpJnCH8Q4OSibsFfQXnCMgIFeO7J/ZMGXqltXOtztgQMr8VvRRD3S+Lcp8yKb5aUjWwoCxb4YzEUbQE04SRVeAGjsfNJcXgT +review.linaro.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBONeIVl09BaG0iDOqF/qZjDun8fktYdD0Zl2fRAkSGT6Q7ULAXWJZA7IwstvcSs5w9SRV6x/lNc3CqlHwMFaABc= +review.linaro.org ssh-dss AAAAB3NzaC1kc3MAAACBAJbwbYgvbS+8vnlhJLe1AwgvbBqu0kBw7pBjQgF47lXRKqZbzwQc+hHmMbczJOfIoo1PX39Ifhz142u+yN7PQgUlU+jzI2Q9cjSqfrS02rV0cU2TQRKvgTQH89qMk2M0jOimcz1UCZkCgS2wj6hb1HU9pkhzpH7d+1/M/31Xc5uPAAAAFQC82/+3qHmNd8G8mrPJz9LfdUpsmwAAAIASypGV3LlIOE3bDlZwgr3rZ+44MPq7c16SbpjnjqbsOzPAyllD8MeY0eynuDqtGtT4RtC8uRgmgw7MW1HtYnTSlYt0up66LT19LCRKme8CVtggqjwLTUEKWmrdbe+PSvczKjeszOD0R5qGasSvOOKMJ5jLMnJ9jMhHhItc53eM5AAAAIBXWdudBBziVVk9VE+z1kvOYsCGYosLglqzJMsFfVQh948Ci9PowKx8xognWEtdaZW7+2oEIwL8QR+zPtzNY447i6iRuJy1TaDZfJU8nTfr07KoXB4B7rhADByXl4x9Uk25m9n9XjF/ctjIzyspvcRpqZXMHBUuZalID6E39YJqnA== +review.linaro.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8Q8j887I9mBD2va9C7gWl4Cr8agHWxuFHfDUWaqiygI9jA4w2YC7mo5oJMqwUk2DsvPDLuU5Z6yyKSA7Cko+L0MnKfNMzQ8e00ZXGDBq8bh1tRKstFselAFmmg+5DhM9q9HPjpKYzbAxU6rxmdFbSc+ktE0rhtmciThVT3YW3bMs3g+D+6sf6ER9UkSpbdZ7skKFXBHw2t1BWaPrvW4L8GMFAokgXUKOE8e1WZkQuCcseIz8J9Hz1p/liyiiTPVQnjGyleUnUY0pZA3ViB6pS317BH5Kvd8aX8x0vSwCIs30rpkmBam9C0b2uj2jWk3GrmHYjVHebMAW376VSLTZV diff --git a/tcwg-base/home-data/tcwg-buildslave/.gitconfig b/tcwg-base/home-data/tcwg-buildslave/.gitconfig new file mode 100644 index 00000000..d91df92c --- /dev/null +++ b/tcwg-base/home-data/tcwg-buildslave/.gitconfig @@ -0,0 +1,3 @@ +[user] + name = TCWG BuildSlave + email = tcwg-buildslave@linaro.org diff --git a/tcwg-base/home-data/tcwg-buildslave/.mailrc b/tcwg-base/home-data/tcwg-buildslave/.mailrc new file mode 100644 index 00000000..cae73d9b --- /dev/null +++ b/tcwg-base/home-data/tcwg-buildslave/.mailrc @@ -0,0 +1 @@ +set from="LINARO TCWG " diff --git a/tcwg-base/home-data/tcwg-buildslave/.ssh/authorized_keys b/tcwg-base/home-data/tcwg-buildslave/.ssh/authorized_keys new file mode 100644 index 00000000..bb7e338b --- /dev/null +++ b/tcwg-base/home-data/tcwg-buildslave/.ssh/authorized_keys @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCvo00oFPW9t4OOylGA2hpBFu/3S7xjMWolmzZoS234Hej/Y8RvMgyG+jAg/hdG8aMG+PRmCRDDk2R5HSceSTG/51x3DyVkpjiFHaWdafCvy63Okalhu0vLAXHi8pbpSjHv7c5KPorBWdG2L5D2LSv/zwDGm+aXvHOrfE6WDraipYML7lUuruTwpg7Fs+NMPqghroslD+gIWeIr897aFug4Enj4oYJSitHqIHwBuPha//bFJpBHakP2PmnB0hFIBDpHq0QYfyHechm6iO+VOOooKG1MMmsPlPfT5kOZkSo/pIgpBILXwFx+BnVhtvNRhN1a8FyLL5V4fb34HXT7Qyq6bA3qGs+cgjy+ZQtHIOyo2rZmBD5uZNjaUdpJFMpMQs9g+h9dIit57bMJBc1anE3BhOhRzd+bsKhsXkhlioaVKMwPyXbkKgGkRsrLn3VEWgF4f2lO2LyBc6HNdm5t5xnh2u1MxnxmSgw3co+86lSvhh5o36Kth7ebi06OLnJDuborq/uBv33G/6dargIz5ZaMySpQIgO6mo+mTMdJr6QpWGek93MFE0N0tbAAXADkk0hpA7if1UJwmCmBAifFDeAMt0QV+taA9jtHMHHgSZC+a4i4EO06L1u0e9qX9ciQJbqXt65Ynjumo2uZfnK1aBSrWX5zaT0Z0LIwxY2HISA06w== tcwg@linaro.org diff --git a/tcwg-base/home-data/tcwg-buildslave/.ssh/config b/tcwg-base/home-data/tcwg-buildslave/.ssh/config new file mode 100644 index 00000000..47e5dbf0 --- /dev/null +++ b/tcwg-base/home-data/tcwg-buildslave/.ssh/config @@ -0,0 +1,60 @@ +# === BEGIN: TCWG SSH configuration === +# +# !!! THIS MUST BE COPIED TO THE START OF YOUR ~/.SSH/CONFIG FILE. !!! +# !!! IF YOU REPORT A PROBLEM WITH SSH, AND THIS CONFIGURATION IS NOT !!! +# !!! AT THE START OF YOUR FILE -- YOU HAVE OBVIOUSLY MISSED THIS VERY !!! +# !!! IMPORTANT NOTE. AS PENANCE, YOU WILL READ THIS NOTE OUT LOUD. !!! +# + +Host *.tcwglab *.aus-colo people.linaro.org aus-colo.linaro.org lab.validation.linaro.org + #User @LDAP_USER@ + #IdentityFile ~/.ssh/id_rsa + +# Proxy connections to custom ssh servers (inside containers) on firewalled +# hosts through "main" ssh server on that host. +# E.g., "ssh -p32768 proxy.dev-01.tcwglab" +Host *proxy.* + ProxyCommand ssh $(echo %h | sed -e "s/proxy\.//") nc -q0 localhost %p + +# Access to Austin Colo. E.g., "ssh r1-a7.aus-colo" +Host *.aus-colo + ProxyCommand ssh aus-colo.linaro.org nc -q0 %h %p + +# Access to LAVA Lab. E.g., "ssh root@10.7.0.18.lab" +Host *.lab + ProxyCommand ssh lab.validation.linaro.org nc -q0 $(basename %h .lab) %p + +Host *.tcwglab *.aus-colo *.lab + # Enable automatic multiplexing. + ControlMaster auto + # Soften up potential problems with killing master connection by using + # ControlPersist (which puts the master connection in background). + # Also ControlPersist has an undocumented feature that it will clean-up + # and replace stale ssh socket from a zombie connection. + ControlPersist 5m + # Put the ssh socket on /tmp. Note that overlayfs can't host sockets, + # so we always arrange /tmp to be on a ext4 or equivalent FS. + ControlPath /tmp/ssh-%u-%r@%h:%p + # There is little point in forwarding X11 to machines outside of local network. + ForwardX11 no + # Forward authentication agent and keep private keys in one place. + ForwardAgent yes + # Ping server every 5min to avoid routers dropping connection. + # This matches -o BatchMode=yes setting used in cross-testing (see ABE) + ServerAliveInterval 300 + # Disable checking of host keys for boards behind gateways. + # !!! BE BECAREFUL TO ONLY DO THIS FOR MACHINES BEHIND SSH GATEWAY OR VPN !!! + StrictHostKeyChecking no + # Don't store host keys for one-time containers + UserKnownHostsFile /dev/null + # Don't warn about "adding" host keys to /dev/null + LogLevel FATAL + +# Make sure we can connect to localhost (e.g., to a container running +# on localhost) with the settings for *.tcwglab +Host localhost.tcwglab + Hostname localhost + +Host git.linaro.org dev-private-git.linaro.org + User git +# === END: TCWG SSH configuration === diff --git a/tcwg-base/home-data/tcwg-buildslave/.ssh/known_hosts b/tcwg-base/home-data/tcwg-buildslave/.ssh/known_hosts new file mode 100644 index 00000000..b649d65f --- /dev/null +++ b/tcwg-base/home-data/tcwg-buildslave/.ssh/known_hosts @@ -0,0 +1,30 @@ +aus-colo.linaro.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBP8apVdw/JC+4rOiq/eG2LgjwJPCqKIlG/RwPVDe1VNOdtrmR6VnTQ5oQYkwt00h2rdI6dVzdW8Q9za7PGW6Sls= +aus-colo.linaro.org ssh-dss AAAAB3NzaC1kc3MAAACBALdjDe/FnDjKDz+QzKWD/J1jIVVjied+1EFcxZ/uyGw9uZwVjReHP6ehGQCtQEM+SDklOXc6bz9UeBjG6+gDGXWBmldbS2yXvvxFmmbOf40h/rVFKq0CW/tJxyONoaf75Qj+aOyo3iUXMl+jJowb+LR5j0zbdTrSkM2qEsP8o0b3AAAAFQDfNOi88rFXdks5xpzmiKs0fzyYGQAAAIEAnzYTZ0dDAua6FHgqfoNVZHS4CV/le6G5FFCc4Kp4lB9ijRMjrDZNey5BkCooetqOBuPF8mYYAgZ28NemIUvvTenddfHFzWQTPl0meAdUhBW4EJMq0HWEV+kUKANUah2QlXWx8/g1x3cOhBzABTMOEBUFnlMx9d5A71JZypEN5UQAAACACiH996M1x/DjYmMp6BLwglYMDjQPrfI7QhNwa/8/wukDHlB6puB/HdPyxYZp/IVShHze6C3YpmV+dXxc85/vMNoVRx02ICC2gTkm2MoSFgaW1nO95tRPtyJ4AXa4ev4D22hNPF5SxgXfn2lT4uH8bWxvTrzgHs7JhAzD0oRbOh4= +aus-colo.linaro.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCg5vMfuBLRroqEb6+CFLQikh1Wq6UD++SODY7bSdPDfN1wmurdp60AdVU+22nOXgK78mwYPJ0PEcTBMSE+OmryfZFDZm/+aPbALid/vFs8NuvFmEQ8vecEBPDGxJ3RpVxkNG5BrWMTJjWMJTCFdIh9my5vhBPEloAuDRthRNaRwvgqRw3GJAbSG2Cg4ZgOQi7Lv3ogQ/M3nXzy8KMp4KD7AtncylguPoVwDxNwjl+YoEujZDvpM4UiZDnh+Gxeru3EnEIgDvwbMizlrKL8Tm+2gA+j3cWkgIjCVJM+PW8V0aobp681ChqlbDlzK0oVmwUafdVv3dxzOSrjQH2rkaOn +dev-private-git.linaro.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBOvq8E5HPzrBlxmckzsE3rz9LAx9c0faEfofALaO+UGC4HAst9fMaZcHaCqu+b8SVY/2VcBvMYMwO1ZPgOn0rXs= +dev-private-git.linaro.org ssh-dss AAAAB3NzaC1kc3MAAACBAK10xjDXtqiW6S02TFvIQUmjTyu+tpiT0IVTp5dlZX5rT1EDi4DtRgtoO/R4WncAs0GE8FqaI/IqljuYlJbHOrFCxU3OWKB+z2Ue3oXs3kouoFP3coF4exBZLEBX4JQ/HI5Ii88fnE/U70/+wN/mMAtcOrsgGWGXOv8yFZEQaKJJAAAAFQCfVbaD5KdaABTLwQ8CXRuZ+PAeHwAAAIBmppcf9sx9M4KAgiOQRGW+7/eImJHFRazQSe8Qbiqo0H7OQhIRcLIm6+PAtKgxxSaQErAo4z/xM7d2lhqOyydK5GDpILgV3qHUFAgQ9vajL+ga5/VeRTqg6R91kYgIKnEl3y8/iW6eRcJF/jzYfDcaFG0Z3gsOtHzjTsCuV8KMLwAAAIBupI2LDTsUYa64hSKvGhEVPMj8VKx5RX4NWQU/dlNNhlFRTzV42giujZ146vH5SGqagR3daX+o6Xm++GDJ+AedzJ8zBc9dAwU7ao4fd23bsyURvNxC7K5DKJnlCDS6xk+6wv6Hz9VdbaIEE5TPxSGqZEOK1V+pbgv+cMUGACy43Q== +dev-private-git.linaro.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC34bjTOKJIq8MVSeC5gddQlbR0hyvvTZbrpW7KXgCzkLTFZxa05wbz8VC1l7ruPotQBgrICgLYmrbjrASqcY//9OPLDa1Pf/MUIu2F2lA1W/5E3psGYmyC9GTvmjKgu39Rad5ujXMeMLjuzVPCmo+WhewgugDSV4Fcggd6B6YXHGtoE15ctSw4moerUq1+2BXVgFxUyMoGcpSCeLnbvWpmi6xWoGQOSnrQ4Z/VmZ5WZ87vQsiiWEAsqmMOHHacunnSph7uzQXJlHNajdeGnr2NF+EgcmQ0N6vivZDRLmRYuSmizjCOHSRZxSm/0UJC/ewVzp9BwRepiNKWsjb4gTMb +[dev-private-review.linaro.org]:29418 ssh-dss AAAAB3NzaC1kc3MAAACBAM596jW8Kbsh/ApdoP3r7UvrSOzhnoG1ZHYngER+Dd9e0iGJY1Wbpth7ngngpALl3PQQ99R5xUt8wvcOcICq+vF34FR/Gym+7VjaMLI7DxF48OrUAJnx6zINNlpXbMAI0nptWcKoL/xdmC7AoBOjH1Q+jGTiKISmXTE1w5iK8qp3AAAAFQDwzizM3qhYdknasNV/vp84o19FWQAAAIEAqLjr9vNsgr1snOdyKOhRuyidqf/zThaxuJaUktxLDKU0DDip+FGqLYiS2VzNuSWMaKjkBjITBi0sXktmUhhbPvBHhyzLy3Hz6BOdXpUAoq70QMOcocE9IsEfmqtkOsx/BZ1uCV6W051Gsci4PxK16q9zolpAEp4/3wEWGH+ueJIAAACAERdZ+vCZl6iDzq6XpYFKZ1r6i/CjX5KIBWKCzoN/Z8fo96rZqFA23G5tXM8+YMYnLdwb/qvNSCz6dWpH2FMS4yj7zo2l3GjguC8JOfar0Rt8fihJyaynX+rD/aP3b+h5ot1b/645qrfvpfmeh3gZt3c1kjy5fyopujyGNTUtq6c= +[dev-private-review.linaro.org]:29418 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCofUDWYYwzE4YWotCffwCxLoRuVCMb6DP+eObwbTPHMe5asK94Y1jPNeK1yUVJIuIAUO8aA6pIq3uLKlusyGLZe1YBpM+7YX3HMOBfCOeOemHFxETlj/HC7islYLYT7Sm/DweiN1kxgP8Q/PhPIA5czCZGHS/+T/VLbMApyyzdTmswaqfgJejyK9juHAcmxT3Tupj2SGOuOamyKfhfsPxGwIchivy/mt7xBTk5cNiSDeLAfMn2rHsilfLjb+IoeE6EvtqG3+rTh+ttulHp2vSeZkK79tuyVWt+XOZjD4RDfk1taW9JjaafkyOW0VCF4gqOMfJU24u88xTCgqkgT1bN +dev-private-review.linaro.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBOvq8E5HPzrBlxmckzsE3rz9LAx9c0faEfofALaO+UGC4HAst9fMaZcHaCqu+b8SVY/2VcBvMYMwO1ZPgOn0rXs= +dev-private-review.linaro.org ssh-dss AAAAB3NzaC1kc3MAAACBAK10xjDXtqiW6S02TFvIQUmjTyu+tpiT0IVTp5dlZX5rT1EDi4DtRgtoO/R4WncAs0GE8FqaI/IqljuYlJbHOrFCxU3OWKB+z2Ue3oXs3kouoFP3coF4exBZLEBX4JQ/HI5Ii88fnE/U70/+wN/mMAtcOrsgGWGXOv8yFZEQaKJJAAAAFQCfVbaD5KdaABTLwQ8CXRuZ+PAeHwAAAIBmppcf9sx9M4KAgiOQRGW+7/eImJHFRazQSe8Qbiqo0H7OQhIRcLIm6+PAtKgxxSaQErAo4z/xM7d2lhqOyydK5GDpILgV3qHUFAgQ9vajL+ga5/VeRTqg6R91kYgIKnEl3y8/iW6eRcJF/jzYfDcaFG0Z3gsOtHzjTsCuV8KMLwAAAIBupI2LDTsUYa64hSKvGhEVPMj8VKx5RX4NWQU/dlNNhlFRTzV42giujZ146vH5SGqagR3daX+o6Xm++GDJ+AedzJ8zBc9dAwU7ao4fd23bsyURvNxC7K5DKJnlCDS6xk+6wv6Hz9VdbaIEE5TPxSGqZEOK1V+pbgv+cMUGACy43Q== +dev-private-review.linaro.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC34bjTOKJIq8MVSeC5gddQlbR0hyvvTZbrpW7KXgCzkLTFZxa05wbz8VC1l7ruPotQBgrICgLYmrbjrASqcY//9OPLDa1Pf/MUIu2F2lA1W/5E3psGYmyC9GTvmjKgu39Rad5ujXMeMLjuzVPCmo+WhewgugDSV4Fcggd6B6YXHGtoE15ctSw4moerUq1+2BXVgFxUyMoGcpSCeLnbvWpmi6xWoGQOSnrQ4Z/VmZ5WZ87vQsiiWEAsqmMOHHacunnSph7uzQXJlHNajdeGnr2NF+EgcmQ0N6vivZDRLmRYuSmizjCOHSRZxSm/0UJC/ewVzp9BwRepiNKWsjb4gTMb +ex40-01.tcwglab.linaro.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBBblrQ+VuEY6mQDq10+GgOPYJIsTfaHXYZi0O0mPr+ev1xNodJ0w45hiWWlmsLEiXiGsvvIiOgZcZsryCkGscDI= +ex40-01.tcwglab.linaro.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC37ZZKNZpSxQnWcu/5eNpFpEjIzL5eZyKUbn8ghkmk4jVS7fIbty/6s1ZH94UPwQDb07F4QF89esoH5k2ajAizLMNoLxeHU8ZCcqMFaNcmVWjTxKbiXLwRqcrgLUrNMQIGesV8l+xH+yozG2HKOBAnMVaea9+wCFvJWXgO4u54eEup2JcE3UroWIRA/mOL4KhBbyVVe47NbydYbP5G0mqpJjpLv5TuJwRT/aP/0nRH6cPrzuqGbic7cVR7Bu3f6ipttMAsPQRAoFBVYb5yRAt/RcDBu39r7hLHyhitjw0vBhGGV0B5CEzAqCE3ZyU0H+vmQ2GeN8aEtUWDSK9W7uzJ +git.linaro.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBONeIVl09BaG0iDOqF/qZjDun8fktYdD0Zl2fRAkSGT6Q7ULAXWJZA7IwstvcSs5w9SRV6x/lNc3CqlHwMFaABc= +git.linaro.org ssh-dss AAAAB3NzaC1kc3MAAACBAJbwbYgvbS+8vnlhJLe1AwgvbBqu0kBw7pBjQgF47lXRKqZbzwQc+hHmMbczJOfIoo1PX39Ifhz142u+yN7PQgUlU+jzI2Q9cjSqfrS02rV0cU2TQRKvgTQH89qMk2M0jOimcz1UCZkCgS2wj6hb1HU9pkhzpH7d+1/M/31Xc5uPAAAAFQC82/+3qHmNd8G8mrPJz9LfdUpsmwAAAIASypGV3LlIOE3bDlZwgr3rZ+44MPq7c16SbpjnjqbsOzPAyllD8MeY0eynuDqtGtT4RtC8uRgmgw7MW1HtYnTSlYt0up66LT19LCRKme8CVtggqjwLTUEKWmrdbe+PSvczKjeszOD0R5qGasSvOOKMJ5jLMnJ9jMhHhItc53eM5AAAAIBXWdudBBziVVk9VE+z1kvOYsCGYosLglqzJMsFfVQh948Ci9PowKx8xognWEtdaZW7+2oEIwL8QR+zPtzNY447i6iRuJy1TaDZfJU8nTfr07KoXB4B7rhADByXl4x9Uk25m9n9XjF/ctjIzyspvcRpqZXMHBUuZalID6E39YJqnA== +git.linaro.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8Q8j887I9mBD2va9C7gWl4Cr8agHWxuFHfDUWaqiygI9jA4w2YC7mo5oJMqwUk2DsvPDLuU5Z6yyKSA7Cko+L0MnKfNMzQ8e00ZXGDBq8bh1tRKstFselAFmmg+5DhM9q9HPjpKYzbAxU6rxmdFbSc+ktE0rhtmciThVT3YW3bMs3g+D+6sf6ER9UkSpbdZ7skKFXBHw2t1BWaPrvW4L8GMFAokgXUKOE8e1WZkQuCcseIz8J9Hz1p/liyiiTPVQnjGyleUnUY0pZA3ViB6pS317BH5Kvd8aX8x0vSwCIs30rpkmBam9C0b2uj2jWk3GrmHYjVHebMAW376VSLTZV +git-us.linaro.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBONeIVl09BaG0iDOqF/qZjDun8fktYdD0Zl2fRAkSGT6Q7ULAXWJZA7IwstvcSs5w9SRV6x/lNc3CqlHwMFaABc= +git-us.linaro.org ssh-dss AAAAB3NzaC1kc3MAAACBAJbwbYgvbS+8vnlhJLe1AwgvbBqu0kBw7pBjQgF47lXRKqZbzwQc+hHmMbczJOfIoo1PX39Ifhz142u+yN7PQgUlU+jzI2Q9cjSqfrS02rV0cU2TQRKvgTQH89qMk2M0jOimcz1UCZkCgS2wj6hb1HU9pkhzpH7d+1/M/31Xc5uPAAAAFQC82/+3qHmNd8G8mrPJz9LfdUpsmwAAAIASypGV3LlIOE3bDlZwgr3rZ+44MPq7c16SbpjnjqbsOzPAyllD8MeY0eynuDqtGtT4RtC8uRgmgw7MW1HtYnTSlYt0up66LT19LCRKme8CVtggqjwLTUEKWmrdbe+PSvczKjeszOD0R5qGasSvOOKMJ5jLMnJ9jMhHhItc53eM5AAAAIBXWdudBBziVVk9VE+z1kvOYsCGYosLglqzJMsFfVQh948Ci9PowKx8xognWEtdaZW7+2oEIwL8QR+zPtzNY447i6iRuJy1TaDZfJU8nTfr07KoXB4B7rhADByXl4x9Uk25m9n9XjF/ctjIzyspvcRpqZXMHBUuZalID6E39YJqnA== +git-us.linaro.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8Q8j887I9mBD2va9C7gWl4Cr8agHWxuFHfDUWaqiygI9jA4w2YC7mo5oJMqwUk2DsvPDLuU5Z6yyKSA7Cko+L0MnKfNMzQ8e00ZXGDBq8bh1tRKstFselAFmmg+5DhM9q9HPjpKYzbAxU6rxmdFbSc+ktE0rhtmciThVT3YW3bMs3g+D+6sf6ER9UkSpbdZ7skKFXBHw2t1BWaPrvW4L8GMFAokgXUKOE8e1WZkQuCcseIz8J9Hz1p/liyiiTPVQnjGyleUnUY0pZA3ViB6pS317BH5Kvd8aX8x0vSwCIs30rpkmBam9C0b2uj2jWk3GrmHYjVHebMAW376VSLTZV +lab.validation.linaro.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBFZDLd4f9cph9A64+kXUpGvuRmInB3HAtHU9T6wVIsp4HkYLLZD59I4lF/u2VLfM7j10XMNPO7ybOJMM+1zIZlM= +lab.validation.linaro.org ssh-dss AAAAB3NzaC1kc3MAAACBAK75t/OG68cN0mtVNrliCi8/7tajozJQDGvxgnpben1F84IzWNJpBdtEgaXeo3zD0cQl1nM5IftBjSKMkomdsaDh7u6A57juaANU9NKIXW2BGmaICZxllFAb/Cmnq4mDnZJ33G5UyGPVA49bUEKw8DLe8FLVlO/wcghJhjoy7prZAAAAFQD8zrwLDwd4M4vKKWu9nju7fI3oywAAAIBVE6ykor/q56qYTYqaAvcRkq7331jdYHTqiAVcO9KyrdOS7yCgtb2Dw+O0rq5ftLSF73ad5ACbw+XbzQVJAeKDaDs5mLf3eYF0+3YODFRHYDsbbihO0uZcGHFPvGDD9odBZhWFIZaFSdboodSuyzxIgLu0EZAsHoSP2wjTGdiXFwAAAIAkPcANYxo0jm8BuCEYR+SXXS4aj83dUGbPP54UU7M+jrrfG1M+JVFh3kEsXr9zptZajY+NrqlnXqPp4HZyORUUEN+Szkjbd2p8CCCQvv1PODGJtXFzwpatUP27I2ik/lZG9OXxBQkO+QxjuJ+pcjXPdBRz6DwWoUM63+QFXBLpsw== +lab.validation.linaro.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDtto5bsPJ3NuXsWtwMR8bsAzLvkBstmF1QP+eC6jUBsCDHMtBW/zAWJYNPDr30vRkV7J8D64Pd91rgjbqF8mOPDlyVlln03dYtOV3hzVuXLZfxodslJsw4lB+ZhxLfcZAKqqFURJEhrJNJmtFBprxFRbdS1iQHJHJohg3zS9zlLFvUpZGWooLFEM2z2NdUfSiR12ePvdW1YsEimJR/b3h1it/Wot0uEB6VONZGyMrrWvsntJV1NdQFxJR8waTz1sBvQQBJGX+SgEXY1CB3AUiF4yIy5WZ/4YCOk0kO9qABvV0Ks357OU5uY5GMgalAy2RJyvceNf6erlR4vwmpdnDH +people.linaro.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKKtlH9IGVw1wE3daicRzyOdIM9MzWfUH1tUB8R/md36RDTSqG8VGYrn1E5pJcs7rsk05ZCUQIaglefMytoOvQ8= +people.linaro.org ssh-dss AAAAB3NzaC1kc3MAAACBAOnQwFbvISNteLPMb/Srm2xwFDrxDql+kxtlZyohrSZ72K9GDg+dqb4W7/QiVrOMhfRzaL93Hj/FLCxKqUXdnTQqekqGosRQK7fLNJvh6DNizoJ+aWzKp1EL3kF2GgKP33ZPtRJYrBdxnc+DDc0yP/He3cyrzbg1nsWSedc1MMVpAAAAFQCm3xIrM1iR9ozuyjKRGwhnrKo9GQAAAIBkdN4dNB298m+2aXqMmLOj1Ry9/S6CTiMn5c9T/luYpWFRnsyuHlBIcZFjyOMtU3bc8b7KwqP8t3XTQbolbqtYOWqPeiaIH/VAk7w9o1tePRwtbTadksYw+UJGtn9c+52uQfGZdjfyjsKs7hEWgE72gTeIb9g1QZ+WCoVfSzNacgAAAIA9T2ONJcRFX3heeDcl6gho8Wj264GDhS5/iqdMCClO3wKUY04hPSpXKRhRm/zzFGb9537Qj6LluDAcg+m/D0FnoQkILLXnfiMnrlyoCCA/jZWrVZw8aQdDHM5LlDdDZKZV7djkbjF0nVvWRTrvc20yQeDLLImaTDOfYjmJ75L1vQ== +people.linaro.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8OveP3mffvlzMEGuZQzol8zoDwCdAzrNiBfX9rv6lDGr86Sl4MVKs/6cYdjbtrUJD7ls5gc8cfjH5EXPh/HuoBj7Bi+UNfyyGSqrZgTFPpyLx50QJDeogcUN54NL+N/X6HtQtyvGwEXgb26S9ec7LFfyxqT8Yy370XH/y7qAtJgS3UTkf8kzIWgZQvU5MU3FqhOn9mzI+KqsBMRKt0JpW7H2VRYiaHqpshwpuNHRDEQBMnRVHDpo8SZRq21pwRjdTzuzGJv2enCW018jWC/HMmTaaDWzX6SO+JQs9NFVUpM6hg+ysa5piDXnCNQ8Ry6l0nlAjgUt92NEe4OeANrt9 +[review.linaro.org]:29418 ssh-dss AAAAB3NzaC1kc3MAAACBAPB0SE19HQ0dEtm3Unp7+JiNeHlIWNs4j9yN+2Q/fxmBT2ZZ0a5I4gg63b5rM/1Li/6k0f/CtSYBH/mhmjKaEKIQV/c/lmuZivUAfTPT0ld3voXHwRhgpWI/WOiRdsTRZZW2yUHx/troO53mx4eIISKfab+t+vCU5Af+sgTBF6InAAAAFQDGR2ccfQSWVuSyzgvK8f7FT8olTQAAAIBHZqySRfjEnnx9h0aS6i2H21dmZxUllwIJpdpS6XWzvMzVwBb1DKx8bO0WwZeTnxxs1BKVAjmSDkDGYJWHxyU8kQ8aFsBo0KwbNEKXozaK3Gf2YF289xQsigbtPUWYXDz1PNEXtIS9AXdCRq4i09ujO3ayxq4lX2n0LIQ4IhM+RgAAAIB2SvnzVadjW14AN9F9ZEfnK0JRpBTKjz+kQSS1TJiRI/dSHG6CwwXjD1G9YW8mfGhPOPYHIE2MF2n7d7DfqBdeeee0PnwBQ0YBc5qfhQ9Gpi+hqXSem1YaD2YRG40que5bu/Rd6NksnSLg/93Z3L3fN+qTeApRqHQWRrfswGgi+A== +[review.linaro.org]:29418 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDMfTLkTmsbtahAiVJTKXRFbR9MQ/vDH/JPj4QN3XPHJuubxLhUf8WObEBtML7J11uvVM1oDTwM5YG5yjyBnc+85OaQaB9tMPDheGhfMG40F4vxdSnQL29ihyrls0hrFTY9UZ4Y2FmJwYL0rOnGU7iPyNuExQwfg2bkdw67aH9nEGjSd2eXYl2bI4DHujy5GJiV3dR9TlUF0iaSeHVSIX5t9I/BXK+AiSqHTrvwdGGi9XvL6xEWYMOZOpJnCH8Q4OSibsFfQXnCMgIFeO7J/ZMGXqltXOtztgQMr8VvRRD3S+Lcp8yKb5aUjWwoCxb4YzEUbQE04SRVeAGjsfNJcXgT +review.linaro.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBONeIVl09BaG0iDOqF/qZjDun8fktYdD0Zl2fRAkSGT6Q7ULAXWJZA7IwstvcSs5w9SRV6x/lNc3CqlHwMFaABc= +review.linaro.org ssh-dss AAAAB3NzaC1kc3MAAACBAJbwbYgvbS+8vnlhJLe1AwgvbBqu0kBw7pBjQgF47lXRKqZbzwQc+hHmMbczJOfIoo1PX39Ifhz142u+yN7PQgUlU+jzI2Q9cjSqfrS02rV0cU2TQRKvgTQH89qMk2M0jOimcz1UCZkCgS2wj6hb1HU9pkhzpH7d+1/M/31Xc5uPAAAAFQC82/+3qHmNd8G8mrPJz9LfdUpsmwAAAIASypGV3LlIOE3bDlZwgr3rZ+44MPq7c16SbpjnjqbsOzPAyllD8MeY0eynuDqtGtT4RtC8uRgmgw7MW1HtYnTSlYt0up66LT19LCRKme8CVtggqjwLTUEKWmrdbe+PSvczKjeszOD0R5qGasSvOOKMJ5jLMnJ9jMhHhItc53eM5AAAAIBXWdudBBziVVk9VE+z1kvOYsCGYosLglqzJMsFfVQh948Ci9PowKx8xognWEtdaZW7+2oEIwL8QR+zPtzNY447i6iRuJy1TaDZfJU8nTfr07KoXB4B7rhADByXl4x9Uk25m9n9XjF/ctjIzyspvcRpqZXMHBUuZalID6E39YJqnA== +review.linaro.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8Q8j887I9mBD2va9C7gWl4Cr8agHWxuFHfDUWaqiygI9jA4w2YC7mo5oJMqwUk2DsvPDLuU5Z6yyKSA7Cko+L0MnKfNMzQ8e00ZXGDBq8bh1tRKstFselAFmmg+5DhM9q9HPjpKYzbAxU6rxmdFbSc+ktE0rhtmciThVT3YW3bMs3g+D+6sf6ER9UkSpbdZ7skKFXBHw2t1BWaPrvW4L8GMFAokgXUKOE8e1WZkQuCcseIz8J9Hz1p/liyiiTPVQnjGyleUnUY0pZA3ViB6pS317BH5Kvd8aX8x0vSwCIs30rpkmBam9C0b2uj2jWk3GrmHYjVHebMAW376VSLTZV 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-build/tcwg-benchmark/.gitconfig b/tcwg-base/tcwg-build/tcwg-benchmark/.gitconfig deleted file mode 100644 index d0ea2be3..00000000 --- a/tcwg-base/tcwg-build/tcwg-benchmark/.gitconfig +++ /dev/null @@ -1,3 +0,0 @@ -[user] - name = TCWG Benchmark - email = tcwg-benchmark@linaro.org diff --git a/tcwg-base/tcwg-build/tcwg-benchmark/.ssh/authorized_keys b/tcwg-base/tcwg-build/tcwg-benchmark/.ssh/authorized_keys deleted file mode 100644 index 536483eb..00000000 --- a/tcwg-base/tcwg-build/tcwg-benchmark/.ssh/authorized_keys +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC1u4GVTRNPWVnU9YRUZPeUql0vjm3sD4F6KG68OpMAtbR8F8q1dCOgeOjPOipznJP4ghVakPrEQSOPnbnlMhNg9FQbScwXctmLknKsXrKSCuef+PEs7YRCmb+mD1RBXaoOChaNV1O7dt5tnRbqYT4k97ojwbLqIBwHWF0l8+3kY0R83LJBK2JCdZN2zfzg7xnumx700uGICPRozFMLszuIRu/oDC14bJnOFd9htcW2KzU1/oPPUhDScmVTYKjyRm8QGudElHTy1wGMroApnuc+NCCY8iy8A7GfxIX48aghnb3kh57P0W6jyc8bpBtMieYCwBRMR/imyvbpWF8Tlbnu0C0uMg4mSU15daJLrdv446xmcb2WB/xxz437fpVchAOz0H+Hao24DQFIzzCOnkgDXixP/43kybRi/8IqAXjJhCRO+8bHVXOESDhH6kidERIaSAiT+LG2uTgufxoWuFWm8fftLj7oKBx+SpMymSNofDHRWa4XGBO66dP1Ijmu2jRH5Z4Pnxy25tVPReOVSXyT/fkzd0+kpFUR0mEjl9ahZliZMFSSMdm3vDqqt7oQWxlMc6Dl1MMQ1iWzvRWRVSyofw6Fp2rretVbDmW+kavxxGRrWFr73EWrn47yC+mqR7DouaQ8wC/baU1GXZ6ouoY1kalNMSmGLTMMrLlclpz2mw== tcwg-benchmark diff --git a/tcwg-base/tcwg-build/tcwg-benchmark/.ssh/config b/tcwg-base/tcwg-build/tcwg-benchmark/.ssh/config deleted file mode 100644 index 47e5dbf0..00000000 --- a/tcwg-base/tcwg-build/tcwg-benchmark/.ssh/config +++ /dev/null @@ -1,60 +0,0 @@ -# === BEGIN: TCWG SSH configuration === -# -# !!! THIS MUST BE COPIED TO THE START OF YOUR ~/.SSH/CONFIG FILE. !!! -# !!! IF YOU REPORT A PROBLEM WITH SSH, AND THIS CONFIGURATION IS NOT !!! -# !!! AT THE START OF YOUR FILE -- YOU HAVE OBVIOUSLY MISSED THIS VERY !!! -# !!! IMPORTANT NOTE. AS PENANCE, YOU WILL READ THIS NOTE OUT LOUD. !!! -# - -Host *.tcwglab *.aus-colo people.linaro.org aus-colo.linaro.org lab.validation.linaro.org - #User @LDAP_USER@ - #IdentityFile ~/.ssh/id_rsa - -# Proxy connections to custom ssh servers (inside containers) on firewalled -# hosts through "main" ssh server on that host. -# E.g., "ssh -p32768 proxy.dev-01.tcwglab" -Host *proxy.* - ProxyCommand ssh $(echo %h | sed -e "s/proxy\.//") nc -q0 localhost %p - -# Access to Austin Colo. E.g., "ssh r1-a7.aus-colo" -Host *.aus-colo - ProxyCommand ssh aus-colo.linaro.org nc -q0 %h %p - -# Access to LAVA Lab. E.g., "ssh root@10.7.0.18.lab" -Host *.lab - ProxyCommand ssh lab.validation.linaro.org nc -q0 $(basename %h .lab) %p - -Host *.tcwglab *.aus-colo *.lab - # Enable automatic multiplexing. - ControlMaster auto - # Soften up potential problems with killing master connection by using - # ControlPersist (which puts the master connection in background). - # Also ControlPersist has an undocumented feature that it will clean-up - # and replace stale ssh socket from a zombie connection. - ControlPersist 5m - # Put the ssh socket on /tmp. Note that overlayfs can't host sockets, - # so we always arrange /tmp to be on a ext4 or equivalent FS. - ControlPath /tmp/ssh-%u-%r@%h:%p - # There is little point in forwarding X11 to machines outside of local network. - ForwardX11 no - # Forward authentication agent and keep private keys in one place. - ForwardAgent yes - # Ping server every 5min to avoid routers dropping connection. - # This matches -o BatchMode=yes setting used in cross-testing (see ABE) - ServerAliveInterval 300 - # Disable checking of host keys for boards behind gateways. - # !!! BE BECAREFUL TO ONLY DO THIS FOR MACHINES BEHIND SSH GATEWAY OR VPN !!! - StrictHostKeyChecking no - # Don't store host keys for one-time containers - UserKnownHostsFile /dev/null - # Don't warn about "adding" host keys to /dev/null - LogLevel FATAL - -# Make sure we can connect to localhost (e.g., to a container running -# on localhost) with the settings for *.tcwglab -Host localhost.tcwglab - Hostname localhost - -Host git.linaro.org dev-private-git.linaro.org - User git -# === END: TCWG SSH configuration === diff --git a/tcwg-base/tcwg-build/tcwg-benchmark/.ssh/known_hosts b/tcwg-base/tcwg-build/tcwg-benchmark/.ssh/known_hosts deleted file mode 100644 index b649d65f..00000000 --- a/tcwg-base/tcwg-build/tcwg-benchmark/.ssh/known_hosts +++ /dev/null @@ -1,30 +0,0 @@ -aus-colo.linaro.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBP8apVdw/JC+4rOiq/eG2LgjwJPCqKIlG/RwPVDe1VNOdtrmR6VnTQ5oQYkwt00h2rdI6dVzdW8Q9za7PGW6Sls= -aus-colo.linaro.org ssh-dss AAAAB3NzaC1kc3MAAACBALdjDe/FnDjKDz+QzKWD/J1jIVVjied+1EFcxZ/uyGw9uZwVjReHP6ehGQCtQEM+SDklOXc6bz9UeBjG6+gDGXWBmldbS2yXvvxFmmbOf40h/rVFKq0CW/tJxyONoaf75Qj+aOyo3iUXMl+jJowb+LR5j0zbdTrSkM2qEsP8o0b3AAAAFQDfNOi88rFXdks5xpzmiKs0fzyYGQAAAIEAnzYTZ0dDAua6FHgqfoNVZHS4CV/le6G5FFCc4Kp4lB9ijRMjrDZNey5BkCooetqOBuPF8mYYAgZ28NemIUvvTenddfHFzWQTPl0meAdUhBW4EJMq0HWEV+kUKANUah2QlXWx8/g1x3cOhBzABTMOEBUFnlMx9d5A71JZypEN5UQAAACACiH996M1x/DjYmMp6BLwglYMDjQPrfI7QhNwa/8/wukDHlB6puB/HdPyxYZp/IVShHze6C3YpmV+dXxc85/vMNoVRx02ICC2gTkm2MoSFgaW1nO95tRPtyJ4AXa4ev4D22hNPF5SxgXfn2lT4uH8bWxvTrzgHs7JhAzD0oRbOh4= -aus-colo.linaro.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCg5vMfuBLRroqEb6+CFLQikh1Wq6UD++SODY7bSdPDfN1wmurdp60AdVU+22nOXgK78mwYPJ0PEcTBMSE+OmryfZFDZm/+aPbALid/vFs8NuvFmEQ8vecEBPDGxJ3RpVxkNG5BrWMTJjWMJTCFdIh9my5vhBPEloAuDRthRNaRwvgqRw3GJAbSG2Cg4ZgOQi7Lv3ogQ/M3nXzy8KMp4KD7AtncylguPoVwDxNwjl+YoEujZDvpM4UiZDnh+Gxeru3EnEIgDvwbMizlrKL8Tm+2gA+j3cWkgIjCVJM+PW8V0aobp681ChqlbDlzK0oVmwUafdVv3dxzOSrjQH2rkaOn -dev-private-git.linaro.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBOvq8E5HPzrBlxmckzsE3rz9LAx9c0faEfofALaO+UGC4HAst9fMaZcHaCqu+b8SVY/2VcBvMYMwO1ZPgOn0rXs= -dev-private-git.linaro.org ssh-dss AAAAB3NzaC1kc3MAAACBAK10xjDXtqiW6S02TFvIQUmjTyu+tpiT0IVTp5dlZX5rT1EDi4DtRgtoO/R4WncAs0GE8FqaI/IqljuYlJbHOrFCxU3OWKB+z2Ue3oXs3kouoFP3coF4exBZLEBX4JQ/HI5Ii88fnE/U70/+wN/mMAtcOrsgGWGXOv8yFZEQaKJJAAAAFQCfVbaD5KdaABTLwQ8CXRuZ+PAeHwAAAIBmppcf9sx9M4KAgiOQRGW+7/eImJHFRazQSe8Qbiqo0H7OQhIRcLIm6+PAtKgxxSaQErAo4z/xM7d2lhqOyydK5GDpILgV3qHUFAgQ9vajL+ga5/VeRTqg6R91kYgIKnEl3y8/iW6eRcJF/jzYfDcaFG0Z3gsOtHzjTsCuV8KMLwAAAIBupI2LDTsUYa64hSKvGhEVPMj8VKx5RX4NWQU/dlNNhlFRTzV42giujZ146vH5SGqagR3daX+o6Xm++GDJ+AedzJ8zBc9dAwU7ao4fd23bsyURvNxC7K5DKJnlCDS6xk+6wv6Hz9VdbaIEE5TPxSGqZEOK1V+pbgv+cMUGACy43Q== -dev-private-git.linaro.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC34bjTOKJIq8MVSeC5gddQlbR0hyvvTZbrpW7KXgCzkLTFZxa05wbz8VC1l7ruPotQBgrICgLYmrbjrASqcY//9OPLDa1Pf/MUIu2F2lA1W/5E3psGYmyC9GTvmjKgu39Rad5ujXMeMLjuzVPCmo+WhewgugDSV4Fcggd6B6YXHGtoE15ctSw4moerUq1+2BXVgFxUyMoGcpSCeLnbvWpmi6xWoGQOSnrQ4Z/VmZ5WZ87vQsiiWEAsqmMOHHacunnSph7uzQXJlHNajdeGnr2NF+EgcmQ0N6vivZDRLmRYuSmizjCOHSRZxSm/0UJC/ewVzp9BwRepiNKWsjb4gTMb -[dev-private-review.linaro.org]:29418 ssh-dss AAAAB3NzaC1kc3MAAACBAM596jW8Kbsh/ApdoP3r7UvrSOzhnoG1ZHYngER+Dd9e0iGJY1Wbpth7ngngpALl3PQQ99R5xUt8wvcOcICq+vF34FR/Gym+7VjaMLI7DxF48OrUAJnx6zINNlpXbMAI0nptWcKoL/xdmC7AoBOjH1Q+jGTiKISmXTE1w5iK8qp3AAAAFQDwzizM3qhYdknasNV/vp84o19FWQAAAIEAqLjr9vNsgr1snOdyKOhRuyidqf/zThaxuJaUktxLDKU0DDip+FGqLYiS2VzNuSWMaKjkBjITBi0sXktmUhhbPvBHhyzLy3Hz6BOdXpUAoq70QMOcocE9IsEfmqtkOsx/BZ1uCV6W051Gsci4PxK16q9zolpAEp4/3wEWGH+ueJIAAACAERdZ+vCZl6iDzq6XpYFKZ1r6i/CjX5KIBWKCzoN/Z8fo96rZqFA23G5tXM8+YMYnLdwb/qvNSCz6dWpH2FMS4yj7zo2l3GjguC8JOfar0Rt8fihJyaynX+rD/aP3b+h5ot1b/645qrfvpfmeh3gZt3c1kjy5fyopujyGNTUtq6c= -[dev-private-review.linaro.org]:29418 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCofUDWYYwzE4YWotCffwCxLoRuVCMb6DP+eObwbTPHMe5asK94Y1jPNeK1yUVJIuIAUO8aA6pIq3uLKlusyGLZe1YBpM+7YX3HMOBfCOeOemHFxETlj/HC7islYLYT7Sm/DweiN1kxgP8Q/PhPIA5czCZGHS/+T/VLbMApyyzdTmswaqfgJejyK9juHAcmxT3Tupj2SGOuOamyKfhfsPxGwIchivy/mt7xBTk5cNiSDeLAfMn2rHsilfLjb+IoeE6EvtqG3+rTh+ttulHp2vSeZkK79tuyVWt+XOZjD4RDfk1taW9JjaafkyOW0VCF4gqOMfJU24u88xTCgqkgT1bN -dev-private-review.linaro.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBOvq8E5HPzrBlxmckzsE3rz9LAx9c0faEfofALaO+UGC4HAst9fMaZcHaCqu+b8SVY/2VcBvMYMwO1ZPgOn0rXs= -dev-private-review.linaro.org ssh-dss AAAAB3NzaC1kc3MAAACBAK10xjDXtqiW6S02TFvIQUmjTyu+tpiT0IVTp5dlZX5rT1EDi4DtRgtoO/R4WncAs0GE8FqaI/IqljuYlJbHOrFCxU3OWKB+z2Ue3oXs3kouoFP3coF4exBZLEBX4JQ/HI5Ii88fnE/U70/+wN/mMAtcOrsgGWGXOv8yFZEQaKJJAAAAFQCfVbaD5KdaABTLwQ8CXRuZ+PAeHwAAAIBmppcf9sx9M4KAgiOQRGW+7/eImJHFRazQSe8Qbiqo0H7OQhIRcLIm6+PAtKgxxSaQErAo4z/xM7d2lhqOyydK5GDpILgV3qHUFAgQ9vajL+ga5/VeRTqg6R91kYgIKnEl3y8/iW6eRcJF/jzYfDcaFG0Z3gsOtHzjTsCuV8KMLwAAAIBupI2LDTsUYa64hSKvGhEVPMj8VKx5RX4NWQU/dlNNhlFRTzV42giujZ146vH5SGqagR3daX+o6Xm++GDJ+AedzJ8zBc9dAwU7ao4fd23bsyURvNxC7K5DKJnlCDS6xk+6wv6Hz9VdbaIEE5TPxSGqZEOK1V+pbgv+cMUGACy43Q== -dev-private-review.linaro.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC34bjTOKJIq8MVSeC5gddQlbR0hyvvTZbrpW7KXgCzkLTFZxa05wbz8VC1l7ruPotQBgrICgLYmrbjrASqcY//9OPLDa1Pf/MUIu2F2lA1W/5E3psGYmyC9GTvmjKgu39Rad5ujXMeMLjuzVPCmo+WhewgugDSV4Fcggd6B6YXHGtoE15ctSw4moerUq1+2BXVgFxUyMoGcpSCeLnbvWpmi6xWoGQOSnrQ4Z/VmZ5WZ87vQsiiWEAsqmMOHHacunnSph7uzQXJlHNajdeGnr2NF+EgcmQ0N6vivZDRLmRYuSmizjCOHSRZxSm/0UJC/ewVzp9BwRepiNKWsjb4gTMb -ex40-01.tcwglab.linaro.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBBblrQ+VuEY6mQDq10+GgOPYJIsTfaHXYZi0O0mPr+ev1xNodJ0w45hiWWlmsLEiXiGsvvIiOgZcZsryCkGscDI= -ex40-01.tcwglab.linaro.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC37ZZKNZpSxQnWcu/5eNpFpEjIzL5eZyKUbn8ghkmk4jVS7fIbty/6s1ZH94UPwQDb07F4QF89esoH5k2ajAizLMNoLxeHU8ZCcqMFaNcmVWjTxKbiXLwRqcrgLUrNMQIGesV8l+xH+yozG2HKOBAnMVaea9+wCFvJWXgO4u54eEup2JcE3UroWIRA/mOL4KhBbyVVe47NbydYbP5G0mqpJjpLv5TuJwRT/aP/0nRH6cPrzuqGbic7cVR7Bu3f6ipttMAsPQRAoFBVYb5yRAt/RcDBu39r7hLHyhitjw0vBhGGV0B5CEzAqCE3ZyU0H+vmQ2GeN8aEtUWDSK9W7uzJ -git.linaro.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBONeIVl09BaG0iDOqF/qZjDun8fktYdD0Zl2fRAkSGT6Q7ULAXWJZA7IwstvcSs5w9SRV6x/lNc3CqlHwMFaABc= -git.linaro.org ssh-dss AAAAB3NzaC1kc3MAAACBAJbwbYgvbS+8vnlhJLe1AwgvbBqu0kBw7pBjQgF47lXRKqZbzwQc+hHmMbczJOfIoo1PX39Ifhz142u+yN7PQgUlU+jzI2Q9cjSqfrS02rV0cU2TQRKvgTQH89qMk2M0jOimcz1UCZkCgS2wj6hb1HU9pkhzpH7d+1/M/31Xc5uPAAAAFQC82/+3qHmNd8G8mrPJz9LfdUpsmwAAAIASypGV3LlIOE3bDlZwgr3rZ+44MPq7c16SbpjnjqbsOzPAyllD8MeY0eynuDqtGtT4RtC8uRgmgw7MW1HtYnTSlYt0up66LT19LCRKme8CVtggqjwLTUEKWmrdbe+PSvczKjeszOD0R5qGasSvOOKMJ5jLMnJ9jMhHhItc53eM5AAAAIBXWdudBBziVVk9VE+z1kvOYsCGYosLglqzJMsFfVQh948Ci9PowKx8xognWEtdaZW7+2oEIwL8QR+zPtzNY447i6iRuJy1TaDZfJU8nTfr07KoXB4B7rhADByXl4x9Uk25m9n9XjF/ctjIzyspvcRpqZXMHBUuZalID6E39YJqnA== -git.linaro.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8Q8j887I9mBD2va9C7gWl4Cr8agHWxuFHfDUWaqiygI9jA4w2YC7mo5oJMqwUk2DsvPDLuU5Z6yyKSA7Cko+L0MnKfNMzQ8e00ZXGDBq8bh1tRKstFselAFmmg+5DhM9q9HPjpKYzbAxU6rxmdFbSc+ktE0rhtmciThVT3YW3bMs3g+D+6sf6ER9UkSpbdZ7skKFXBHw2t1BWaPrvW4L8GMFAokgXUKOE8e1WZkQuCcseIz8J9Hz1p/liyiiTPVQnjGyleUnUY0pZA3ViB6pS317BH5Kvd8aX8x0vSwCIs30rpkmBam9C0b2uj2jWk3GrmHYjVHebMAW376VSLTZV -git-us.linaro.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBONeIVl09BaG0iDOqF/qZjDun8fktYdD0Zl2fRAkSGT6Q7ULAXWJZA7IwstvcSs5w9SRV6x/lNc3CqlHwMFaABc= -git-us.linaro.org ssh-dss AAAAB3NzaC1kc3MAAACBAJbwbYgvbS+8vnlhJLe1AwgvbBqu0kBw7pBjQgF47lXRKqZbzwQc+hHmMbczJOfIoo1PX39Ifhz142u+yN7PQgUlU+jzI2Q9cjSqfrS02rV0cU2TQRKvgTQH89qMk2M0jOimcz1UCZkCgS2wj6hb1HU9pkhzpH7d+1/M/31Xc5uPAAAAFQC82/+3qHmNd8G8mrPJz9LfdUpsmwAAAIASypGV3LlIOE3bDlZwgr3rZ+44MPq7c16SbpjnjqbsOzPAyllD8MeY0eynuDqtGtT4RtC8uRgmgw7MW1HtYnTSlYt0up66LT19LCRKme8CVtggqjwLTUEKWmrdbe+PSvczKjeszOD0R5qGasSvOOKMJ5jLMnJ9jMhHhItc53eM5AAAAIBXWdudBBziVVk9VE+z1kvOYsCGYosLglqzJMsFfVQh948Ci9PowKx8xognWEtdaZW7+2oEIwL8QR+zPtzNY447i6iRuJy1TaDZfJU8nTfr07KoXB4B7rhADByXl4x9Uk25m9n9XjF/ctjIzyspvcRpqZXMHBUuZalID6E39YJqnA== -git-us.linaro.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8Q8j887I9mBD2va9C7gWl4Cr8agHWxuFHfDUWaqiygI9jA4w2YC7mo5oJMqwUk2DsvPDLuU5Z6yyKSA7Cko+L0MnKfNMzQ8e00ZXGDBq8bh1tRKstFselAFmmg+5DhM9q9HPjpKYzbAxU6rxmdFbSc+ktE0rhtmciThVT3YW3bMs3g+D+6sf6ER9UkSpbdZ7skKFXBHw2t1BWaPrvW4L8GMFAokgXUKOE8e1WZkQuCcseIz8J9Hz1p/liyiiTPVQnjGyleUnUY0pZA3ViB6pS317BH5Kvd8aX8x0vSwCIs30rpkmBam9C0b2uj2jWk3GrmHYjVHebMAW376VSLTZV -lab.validation.linaro.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBFZDLd4f9cph9A64+kXUpGvuRmInB3HAtHU9T6wVIsp4HkYLLZD59I4lF/u2VLfM7j10XMNPO7ybOJMM+1zIZlM= -lab.validation.linaro.org ssh-dss AAAAB3NzaC1kc3MAAACBAK75t/OG68cN0mtVNrliCi8/7tajozJQDGvxgnpben1F84IzWNJpBdtEgaXeo3zD0cQl1nM5IftBjSKMkomdsaDh7u6A57juaANU9NKIXW2BGmaICZxllFAb/Cmnq4mDnZJ33G5UyGPVA49bUEKw8DLe8FLVlO/wcghJhjoy7prZAAAAFQD8zrwLDwd4M4vKKWu9nju7fI3oywAAAIBVE6ykor/q56qYTYqaAvcRkq7331jdYHTqiAVcO9KyrdOS7yCgtb2Dw+O0rq5ftLSF73ad5ACbw+XbzQVJAeKDaDs5mLf3eYF0+3YODFRHYDsbbihO0uZcGHFPvGDD9odBZhWFIZaFSdboodSuyzxIgLu0EZAsHoSP2wjTGdiXFwAAAIAkPcANYxo0jm8BuCEYR+SXXS4aj83dUGbPP54UU7M+jrrfG1M+JVFh3kEsXr9zptZajY+NrqlnXqPp4HZyORUUEN+Szkjbd2p8CCCQvv1PODGJtXFzwpatUP27I2ik/lZG9OXxBQkO+QxjuJ+pcjXPdBRz6DwWoUM63+QFXBLpsw== -lab.validation.linaro.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDtto5bsPJ3NuXsWtwMR8bsAzLvkBstmF1QP+eC6jUBsCDHMtBW/zAWJYNPDr30vRkV7J8D64Pd91rgjbqF8mOPDlyVlln03dYtOV3hzVuXLZfxodslJsw4lB+ZhxLfcZAKqqFURJEhrJNJmtFBprxFRbdS1iQHJHJohg3zS9zlLFvUpZGWooLFEM2z2NdUfSiR12ePvdW1YsEimJR/b3h1it/Wot0uEB6VONZGyMrrWvsntJV1NdQFxJR8waTz1sBvQQBJGX+SgEXY1CB3AUiF4yIy5WZ/4YCOk0kO9qABvV0Ks357OU5uY5GMgalAy2RJyvceNf6erlR4vwmpdnDH -people.linaro.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKKtlH9IGVw1wE3daicRzyOdIM9MzWfUH1tUB8R/md36RDTSqG8VGYrn1E5pJcs7rsk05ZCUQIaglefMytoOvQ8= -people.linaro.org ssh-dss AAAAB3NzaC1kc3MAAACBAOnQwFbvISNteLPMb/Srm2xwFDrxDql+kxtlZyohrSZ72K9GDg+dqb4W7/QiVrOMhfRzaL93Hj/FLCxKqUXdnTQqekqGosRQK7fLNJvh6DNizoJ+aWzKp1EL3kF2GgKP33ZPtRJYrBdxnc+DDc0yP/He3cyrzbg1nsWSedc1MMVpAAAAFQCm3xIrM1iR9ozuyjKRGwhnrKo9GQAAAIBkdN4dNB298m+2aXqMmLOj1Ry9/S6CTiMn5c9T/luYpWFRnsyuHlBIcZFjyOMtU3bc8b7KwqP8t3XTQbolbqtYOWqPeiaIH/VAk7w9o1tePRwtbTadksYw+UJGtn9c+52uQfGZdjfyjsKs7hEWgE72gTeIb9g1QZ+WCoVfSzNacgAAAIA9T2ONJcRFX3heeDcl6gho8Wj264GDhS5/iqdMCClO3wKUY04hPSpXKRhRm/zzFGb9537Qj6LluDAcg+m/D0FnoQkILLXnfiMnrlyoCCA/jZWrVZw8aQdDHM5LlDdDZKZV7djkbjF0nVvWRTrvc20yQeDLLImaTDOfYjmJ75L1vQ== -people.linaro.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8OveP3mffvlzMEGuZQzol8zoDwCdAzrNiBfX9rv6lDGr86Sl4MVKs/6cYdjbtrUJD7ls5gc8cfjH5EXPh/HuoBj7Bi+UNfyyGSqrZgTFPpyLx50QJDeogcUN54NL+N/X6HtQtyvGwEXgb26S9ec7LFfyxqT8Yy370XH/y7qAtJgS3UTkf8kzIWgZQvU5MU3FqhOn9mzI+KqsBMRKt0JpW7H2VRYiaHqpshwpuNHRDEQBMnRVHDpo8SZRq21pwRjdTzuzGJv2enCW018jWC/HMmTaaDWzX6SO+JQs9NFVUpM6hg+ysa5piDXnCNQ8Ry6l0nlAjgUt92NEe4OeANrt9 -[review.linaro.org]:29418 ssh-dss AAAAB3NzaC1kc3MAAACBAPB0SE19HQ0dEtm3Unp7+JiNeHlIWNs4j9yN+2Q/fxmBT2ZZ0a5I4gg63b5rM/1Li/6k0f/CtSYBH/mhmjKaEKIQV/c/lmuZivUAfTPT0ld3voXHwRhgpWI/WOiRdsTRZZW2yUHx/troO53mx4eIISKfab+t+vCU5Af+sgTBF6InAAAAFQDGR2ccfQSWVuSyzgvK8f7FT8olTQAAAIBHZqySRfjEnnx9h0aS6i2H21dmZxUllwIJpdpS6XWzvMzVwBb1DKx8bO0WwZeTnxxs1BKVAjmSDkDGYJWHxyU8kQ8aFsBo0KwbNEKXozaK3Gf2YF289xQsigbtPUWYXDz1PNEXtIS9AXdCRq4i09ujO3ayxq4lX2n0LIQ4IhM+RgAAAIB2SvnzVadjW14AN9F9ZEfnK0JRpBTKjz+kQSS1TJiRI/dSHG6CwwXjD1G9YW8mfGhPOPYHIE2MF2n7d7DfqBdeeee0PnwBQ0YBc5qfhQ9Gpi+hqXSem1YaD2YRG40que5bu/Rd6NksnSLg/93Z3L3fN+qTeApRqHQWRrfswGgi+A== -[review.linaro.org]:29418 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDMfTLkTmsbtahAiVJTKXRFbR9MQ/vDH/JPj4QN3XPHJuubxLhUf8WObEBtML7J11uvVM1oDTwM5YG5yjyBnc+85OaQaB9tMPDheGhfMG40F4vxdSnQL29ihyrls0hrFTY9UZ4Y2FmJwYL0rOnGU7iPyNuExQwfg2bkdw67aH9nEGjSd2eXYl2bI4DHujy5GJiV3dR9TlUF0iaSeHVSIX5t9I/BXK+AiSqHTrvwdGGi9XvL6xEWYMOZOpJnCH8Q4OSibsFfQXnCMgIFeO7J/ZMGXqltXOtztgQMr8VvRRD3S+Lcp8yKb5aUjWwoCxb4YzEUbQE04SRVeAGjsfNJcXgT -review.linaro.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBONeIVl09BaG0iDOqF/qZjDun8fktYdD0Zl2fRAkSGT6Q7ULAXWJZA7IwstvcSs5w9SRV6x/lNc3CqlHwMFaABc= -review.linaro.org ssh-dss AAAAB3NzaC1kc3MAAACBAJbwbYgvbS+8vnlhJLe1AwgvbBqu0kBw7pBjQgF47lXRKqZbzwQc+hHmMbczJOfIoo1PX39Ifhz142u+yN7PQgUlU+jzI2Q9cjSqfrS02rV0cU2TQRKvgTQH89qMk2M0jOimcz1UCZkCgS2wj6hb1HU9pkhzpH7d+1/M/31Xc5uPAAAAFQC82/+3qHmNd8G8mrPJz9LfdUpsmwAAAIASypGV3LlIOE3bDlZwgr3rZ+44MPq7c16SbpjnjqbsOzPAyllD8MeY0eynuDqtGtT4RtC8uRgmgw7MW1HtYnTSlYt0up66LT19LCRKme8CVtggqjwLTUEKWmrdbe+PSvczKjeszOD0R5qGasSvOOKMJ5jLMnJ9jMhHhItc53eM5AAAAIBXWdudBBziVVk9VE+z1kvOYsCGYosLglqzJMsFfVQh948Ci9PowKx8xognWEtdaZW7+2oEIwL8QR+zPtzNY447i6iRuJy1TaDZfJU8nTfr07KoXB4B7rhADByXl4x9Uk25m9n9XjF/ctjIzyspvcRpqZXMHBUuZalID6E39YJqnA== -review.linaro.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8Q8j887I9mBD2va9C7gWl4Cr8agHWxuFHfDUWaqiygI9jA4w2YC7mo5oJMqwUk2DsvPDLuU5Z6yyKSA7Cko+L0MnKfNMzQ8e00ZXGDBq8bh1tRKstFselAFmmg+5DhM9q9HPjpKYzbAxU6rxmdFbSc+ktE0rhtmciThVT3YW3bMs3g+D+6sf6ER9UkSpbdZ7skKFXBHw2t1BWaPrvW4L8GMFAokgXUKOE8e1WZkQuCcseIz8J9Hz1p/liyiiTPVQnjGyleUnUY0pZA3ViB6pS317BH5Kvd8aX8x0vSwCIs30rpkmBam9C0b2uj2jWk3GrmHYjVHebMAW376VSLTZV diff --git a/tcwg-base/tcwg-build/tcwg-buildslave/.gitconfig b/tcwg-base/tcwg-build/tcwg-buildslave/.gitconfig deleted file mode 100644 index d91df92c..00000000 --- a/tcwg-base/tcwg-build/tcwg-buildslave/.gitconfig +++ /dev/null @@ -1,3 +0,0 @@ -[user] - name = TCWG BuildSlave - email = tcwg-buildslave@linaro.org diff --git a/tcwg-base/tcwg-build/tcwg-buildslave/.mailrc b/tcwg-base/tcwg-build/tcwg-buildslave/.mailrc deleted file mode 100644 index cae73d9b..00000000 --- a/tcwg-base/tcwg-build/tcwg-buildslave/.mailrc +++ /dev/null @@ -1 +0,0 @@ -set from="LINARO TCWG " diff --git a/tcwg-base/tcwg-build/tcwg-buildslave/.ssh/authorized_keys b/tcwg-base/tcwg-build/tcwg-buildslave/.ssh/authorized_keys deleted file mode 100644 index bb7e338b..00000000 --- a/tcwg-base/tcwg-build/tcwg-buildslave/.ssh/authorized_keys +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCvo00oFPW9t4OOylGA2hpBFu/3S7xjMWolmzZoS234Hej/Y8RvMgyG+jAg/hdG8aMG+PRmCRDDk2R5HSceSTG/51x3DyVkpjiFHaWdafCvy63Okalhu0vLAXHi8pbpSjHv7c5KPorBWdG2L5D2LSv/zwDGm+aXvHOrfE6WDraipYML7lUuruTwpg7Fs+NMPqghroslD+gIWeIr897aFug4Enj4oYJSitHqIHwBuPha//bFJpBHakP2PmnB0hFIBDpHq0QYfyHechm6iO+VOOooKG1MMmsPlPfT5kOZkSo/pIgpBILXwFx+BnVhtvNRhN1a8FyLL5V4fb34HXT7Qyq6bA3qGs+cgjy+ZQtHIOyo2rZmBD5uZNjaUdpJFMpMQs9g+h9dIit57bMJBc1anE3BhOhRzd+bsKhsXkhlioaVKMwPyXbkKgGkRsrLn3VEWgF4f2lO2LyBc6HNdm5t5xnh2u1MxnxmSgw3co+86lSvhh5o36Kth7ebi06OLnJDuborq/uBv33G/6dargIz5ZaMySpQIgO6mo+mTMdJr6QpWGek93MFE0N0tbAAXADkk0hpA7if1UJwmCmBAifFDeAMt0QV+taA9jtHMHHgSZC+a4i4EO06L1u0e9qX9ciQJbqXt65Ynjumo2uZfnK1aBSrWX5zaT0Z0LIwxY2HISA06w== tcwg@linaro.org diff --git a/tcwg-base/tcwg-build/tcwg-buildslave/.ssh/config b/tcwg-base/tcwg-build/tcwg-buildslave/.ssh/config deleted file mode 100644 index 47e5dbf0..00000000 --- a/tcwg-base/tcwg-build/tcwg-buildslave/.ssh/config +++ /dev/null @@ -1,60 +0,0 @@ -# === BEGIN: TCWG SSH configuration === -# -# !!! THIS MUST BE COPIED TO THE START OF YOUR ~/.SSH/CONFIG FILE. !!! -# !!! IF YOU REPORT A PROBLEM WITH SSH, AND THIS CONFIGURATION IS NOT !!! -# !!! AT THE START OF YOUR FILE -- YOU HAVE OBVIOUSLY MISSED THIS VERY !!! -# !!! IMPORTANT NOTE. AS PENANCE, YOU WILL READ THIS NOTE OUT LOUD. !!! -# - -Host *.tcwglab *.aus-colo people.linaro.org aus-colo.linaro.org lab.validation.linaro.org - #User @LDAP_USER@ - #IdentityFile ~/.ssh/id_rsa - -# Proxy connections to custom ssh servers (inside containers) on firewalled -# hosts through "main" ssh server on that host. -# E.g., "ssh -p32768 proxy.dev-01.tcwglab" -Host *proxy.* - ProxyCommand ssh $(echo %h | sed -e "s/proxy\.//") nc -q0 localhost %p - -# Access to Austin Colo. E.g., "ssh r1-a7.aus-colo" -Host *.aus-colo - ProxyCommand ssh aus-colo.linaro.org nc -q0 %h %p - -# Access to LAVA Lab. E.g., "ssh root@10.7.0.18.lab" -Host *.lab - ProxyCommand ssh lab.validation.linaro.org nc -q0 $(basename %h .lab) %p - -Host *.tcwglab *.aus-colo *.lab - # Enable automatic multiplexing. - ControlMaster auto - # Soften up potential problems with killing master connection by using - # ControlPersist (which puts the master connection in background). - # Also ControlPersist has an undocumented feature that it will clean-up - # and replace stale ssh socket from a zombie connection. - ControlPersist 5m - # Put the ssh socket on /tmp. Note that overlayfs can't host sockets, - # so we always arrange /tmp to be on a ext4 or equivalent FS. - ControlPath /tmp/ssh-%u-%r@%h:%p - # There is little point in forwarding X11 to machines outside of local network. - ForwardX11 no - # Forward authentication agent and keep private keys in one place. - ForwardAgent yes - # Ping server every 5min to avoid routers dropping connection. - # This matches -o BatchMode=yes setting used in cross-testing (see ABE) - ServerAliveInterval 300 - # Disable checking of host keys for boards behind gateways. - # !!! BE BECAREFUL TO ONLY DO THIS FOR MACHINES BEHIND SSH GATEWAY OR VPN !!! - StrictHostKeyChecking no - # Don't store host keys for one-time containers - UserKnownHostsFile /dev/null - # Don't warn about "adding" host keys to /dev/null - LogLevel FATAL - -# Make sure we can connect to localhost (e.g., to a container running -# on localhost) with the settings for *.tcwglab -Host localhost.tcwglab - Hostname localhost - -Host git.linaro.org dev-private-git.linaro.org - User git -# === END: TCWG SSH configuration === diff --git a/tcwg-base/tcwg-build/tcwg-buildslave/.ssh/known_hosts b/tcwg-base/tcwg-build/tcwg-buildslave/.ssh/known_hosts deleted file mode 100644 index b649d65f..00000000 --- a/tcwg-base/tcwg-build/tcwg-buildslave/.ssh/known_hosts +++ /dev/null @@ -1,30 +0,0 @@ -aus-colo.linaro.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBP8apVdw/JC+4rOiq/eG2LgjwJPCqKIlG/RwPVDe1VNOdtrmR6VnTQ5oQYkwt00h2rdI6dVzdW8Q9za7PGW6Sls= -aus-colo.linaro.org ssh-dss AAAAB3NzaC1kc3MAAACBALdjDe/FnDjKDz+QzKWD/J1jIVVjied+1EFcxZ/uyGw9uZwVjReHP6ehGQCtQEM+SDklOXc6bz9UeBjG6+gDGXWBmldbS2yXvvxFmmbOf40h/rVFKq0CW/tJxyONoaf75Qj+aOyo3iUXMl+jJowb+LR5j0zbdTrSkM2qEsP8o0b3AAAAFQDfNOi88rFXdks5xpzmiKs0fzyYGQAAAIEAnzYTZ0dDAua6FHgqfoNVZHS4CV/le6G5FFCc4Kp4lB9ijRMjrDZNey5BkCooetqOBuPF8mYYAgZ28NemIUvvTenddfHFzWQTPl0meAdUhBW4EJMq0HWEV+kUKANUah2QlXWx8/g1x3cOhBzABTMOEBUFnlMx9d5A71JZypEN5UQAAACACiH996M1x/DjYmMp6BLwglYMDjQPrfI7QhNwa/8/wukDHlB6puB/HdPyxYZp/IVShHze6C3YpmV+dXxc85/vMNoVRx02ICC2gTkm2MoSFgaW1nO95tRPtyJ4AXa4ev4D22hNPF5SxgXfn2lT4uH8bWxvTrzgHs7JhAzD0oRbOh4= -aus-colo.linaro.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCg5vMfuBLRroqEb6+CFLQikh1Wq6UD++SODY7bSdPDfN1wmurdp60AdVU+22nOXgK78mwYPJ0PEcTBMSE+OmryfZFDZm/+aPbALid/vFs8NuvFmEQ8vecEBPDGxJ3RpVxkNG5BrWMTJjWMJTCFdIh9my5vhBPEloAuDRthRNaRwvgqRw3GJAbSG2Cg4ZgOQi7Lv3ogQ/M3nXzy8KMp4KD7AtncylguPoVwDxNwjl+YoEujZDvpM4UiZDnh+Gxeru3EnEIgDvwbMizlrKL8Tm+2gA+j3cWkgIjCVJM+PW8V0aobp681ChqlbDlzK0oVmwUafdVv3dxzOSrjQH2rkaOn -dev-private-git.linaro.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBOvq8E5HPzrBlxmckzsE3rz9LAx9c0faEfofALaO+UGC4HAst9fMaZcHaCqu+b8SVY/2VcBvMYMwO1ZPgOn0rXs= -dev-private-git.linaro.org ssh-dss AAAAB3NzaC1kc3MAAACBAK10xjDXtqiW6S02TFvIQUmjTyu+tpiT0IVTp5dlZX5rT1EDi4DtRgtoO/R4WncAs0GE8FqaI/IqljuYlJbHOrFCxU3OWKB+z2Ue3oXs3kouoFP3coF4exBZLEBX4JQ/HI5Ii88fnE/U70/+wN/mMAtcOrsgGWGXOv8yFZEQaKJJAAAAFQCfVbaD5KdaABTLwQ8CXRuZ+PAeHwAAAIBmppcf9sx9M4KAgiOQRGW+7/eImJHFRazQSe8Qbiqo0H7OQhIRcLIm6+PAtKgxxSaQErAo4z/xM7d2lhqOyydK5GDpILgV3qHUFAgQ9vajL+ga5/VeRTqg6R91kYgIKnEl3y8/iW6eRcJF/jzYfDcaFG0Z3gsOtHzjTsCuV8KMLwAAAIBupI2LDTsUYa64hSKvGhEVPMj8VKx5RX4NWQU/dlNNhlFRTzV42giujZ146vH5SGqagR3daX+o6Xm++GDJ+AedzJ8zBc9dAwU7ao4fd23bsyURvNxC7K5DKJnlCDS6xk+6wv6Hz9VdbaIEE5TPxSGqZEOK1V+pbgv+cMUGACy43Q== -dev-private-git.linaro.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC34bjTOKJIq8MVSeC5gddQlbR0hyvvTZbrpW7KXgCzkLTFZxa05wbz8VC1l7ruPotQBgrICgLYmrbjrASqcY//9OPLDa1Pf/MUIu2F2lA1W/5E3psGYmyC9GTvmjKgu39Rad5ujXMeMLjuzVPCmo+WhewgugDSV4Fcggd6B6YXHGtoE15ctSw4moerUq1+2BXVgFxUyMoGcpSCeLnbvWpmi6xWoGQOSnrQ4Z/VmZ5WZ87vQsiiWEAsqmMOHHacunnSph7uzQXJlHNajdeGnr2NF+EgcmQ0N6vivZDRLmRYuSmizjCOHSRZxSm/0UJC/ewVzp9BwRepiNKWsjb4gTMb -[dev-private-review.linaro.org]:29418 ssh-dss AAAAB3NzaC1kc3MAAACBAM596jW8Kbsh/ApdoP3r7UvrSOzhnoG1ZHYngER+Dd9e0iGJY1Wbpth7ngngpALl3PQQ99R5xUt8wvcOcICq+vF34FR/Gym+7VjaMLI7DxF48OrUAJnx6zINNlpXbMAI0nptWcKoL/xdmC7AoBOjH1Q+jGTiKISmXTE1w5iK8qp3AAAAFQDwzizM3qhYdknasNV/vp84o19FWQAAAIEAqLjr9vNsgr1snOdyKOhRuyidqf/zThaxuJaUktxLDKU0DDip+FGqLYiS2VzNuSWMaKjkBjITBi0sXktmUhhbPvBHhyzLy3Hz6BOdXpUAoq70QMOcocE9IsEfmqtkOsx/BZ1uCV6W051Gsci4PxK16q9zolpAEp4/3wEWGH+ueJIAAACAERdZ+vCZl6iDzq6XpYFKZ1r6i/CjX5KIBWKCzoN/Z8fo96rZqFA23G5tXM8+YMYnLdwb/qvNSCz6dWpH2FMS4yj7zo2l3GjguC8JOfar0Rt8fihJyaynX+rD/aP3b+h5ot1b/645qrfvpfmeh3gZt3c1kjy5fyopujyGNTUtq6c= -[dev-private-review.linaro.org]:29418 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCofUDWYYwzE4YWotCffwCxLoRuVCMb6DP+eObwbTPHMe5asK94Y1jPNeK1yUVJIuIAUO8aA6pIq3uLKlusyGLZe1YBpM+7YX3HMOBfCOeOemHFxETlj/HC7islYLYT7Sm/DweiN1kxgP8Q/PhPIA5czCZGHS/+T/VLbMApyyzdTmswaqfgJejyK9juHAcmxT3Tupj2SGOuOamyKfhfsPxGwIchivy/mt7xBTk5cNiSDeLAfMn2rHsilfLjb+IoeE6EvtqG3+rTh+ttulHp2vSeZkK79tuyVWt+XOZjD4RDfk1taW9JjaafkyOW0VCF4gqOMfJU24u88xTCgqkgT1bN -dev-private-review.linaro.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBOvq8E5HPzrBlxmckzsE3rz9LAx9c0faEfofALaO+UGC4HAst9fMaZcHaCqu+b8SVY/2VcBvMYMwO1ZPgOn0rXs= -dev-private-review.linaro.org ssh-dss AAAAB3NzaC1kc3MAAACBAK10xjDXtqiW6S02TFvIQUmjTyu+tpiT0IVTp5dlZX5rT1EDi4DtRgtoO/R4WncAs0GE8FqaI/IqljuYlJbHOrFCxU3OWKB+z2Ue3oXs3kouoFP3coF4exBZLEBX4JQ/HI5Ii88fnE/U70/+wN/mMAtcOrsgGWGXOv8yFZEQaKJJAAAAFQCfVbaD5KdaABTLwQ8CXRuZ+PAeHwAAAIBmppcf9sx9M4KAgiOQRGW+7/eImJHFRazQSe8Qbiqo0H7OQhIRcLIm6+PAtKgxxSaQErAo4z/xM7d2lhqOyydK5GDpILgV3qHUFAgQ9vajL+ga5/VeRTqg6R91kYgIKnEl3y8/iW6eRcJF/jzYfDcaFG0Z3gsOtHzjTsCuV8KMLwAAAIBupI2LDTsUYa64hSKvGhEVPMj8VKx5RX4NWQU/dlNNhlFRTzV42giujZ146vH5SGqagR3daX+o6Xm++GDJ+AedzJ8zBc9dAwU7ao4fd23bsyURvNxC7K5DKJnlCDS6xk+6wv6Hz9VdbaIEE5TPxSGqZEOK1V+pbgv+cMUGACy43Q== -dev-private-review.linaro.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC34bjTOKJIq8MVSeC5gddQlbR0hyvvTZbrpW7KXgCzkLTFZxa05wbz8VC1l7ruPotQBgrICgLYmrbjrASqcY//9OPLDa1Pf/MUIu2F2lA1W/5E3psGYmyC9GTvmjKgu39Rad5ujXMeMLjuzVPCmo+WhewgugDSV4Fcggd6B6YXHGtoE15ctSw4moerUq1+2BXVgFxUyMoGcpSCeLnbvWpmi6xWoGQOSnrQ4Z/VmZ5WZ87vQsiiWEAsqmMOHHacunnSph7uzQXJlHNajdeGnr2NF+EgcmQ0N6vivZDRLmRYuSmizjCOHSRZxSm/0UJC/ewVzp9BwRepiNKWsjb4gTMb -ex40-01.tcwglab.linaro.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBBblrQ+VuEY6mQDq10+GgOPYJIsTfaHXYZi0O0mPr+ev1xNodJ0w45hiWWlmsLEiXiGsvvIiOgZcZsryCkGscDI= -ex40-01.tcwglab.linaro.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC37ZZKNZpSxQnWcu/5eNpFpEjIzL5eZyKUbn8ghkmk4jVS7fIbty/6s1ZH94UPwQDb07F4QF89esoH5k2ajAizLMNoLxeHU8ZCcqMFaNcmVWjTxKbiXLwRqcrgLUrNMQIGesV8l+xH+yozG2HKOBAnMVaea9+wCFvJWXgO4u54eEup2JcE3UroWIRA/mOL4KhBbyVVe47NbydYbP5G0mqpJjpLv5TuJwRT/aP/0nRH6cPrzuqGbic7cVR7Bu3f6ipttMAsPQRAoFBVYb5yRAt/RcDBu39r7hLHyhitjw0vBhGGV0B5CEzAqCE3ZyU0H+vmQ2GeN8aEtUWDSK9W7uzJ -git.linaro.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBONeIVl09BaG0iDOqF/qZjDun8fktYdD0Zl2fRAkSGT6Q7ULAXWJZA7IwstvcSs5w9SRV6x/lNc3CqlHwMFaABc= -git.linaro.org ssh-dss AAAAB3NzaC1kc3MAAACBAJbwbYgvbS+8vnlhJLe1AwgvbBqu0kBw7pBjQgF47lXRKqZbzwQc+hHmMbczJOfIoo1PX39Ifhz142u+yN7PQgUlU+jzI2Q9cjSqfrS02rV0cU2TQRKvgTQH89qMk2M0jOimcz1UCZkCgS2wj6hb1HU9pkhzpH7d+1/M/31Xc5uPAAAAFQC82/+3qHmNd8G8mrPJz9LfdUpsmwAAAIASypGV3LlIOE3bDlZwgr3rZ+44MPq7c16SbpjnjqbsOzPAyllD8MeY0eynuDqtGtT4RtC8uRgmgw7MW1HtYnTSlYt0up66LT19LCRKme8CVtggqjwLTUEKWmrdbe+PSvczKjeszOD0R5qGasSvOOKMJ5jLMnJ9jMhHhItc53eM5AAAAIBXWdudBBziVVk9VE+z1kvOYsCGYosLglqzJMsFfVQh948Ci9PowKx8xognWEtdaZW7+2oEIwL8QR+zPtzNY447i6iRuJy1TaDZfJU8nTfr07KoXB4B7rhADByXl4x9Uk25m9n9XjF/ctjIzyspvcRpqZXMHBUuZalID6E39YJqnA== -git.linaro.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8Q8j887I9mBD2va9C7gWl4Cr8agHWxuFHfDUWaqiygI9jA4w2YC7mo5oJMqwUk2DsvPDLuU5Z6yyKSA7Cko+L0MnKfNMzQ8e00ZXGDBq8bh1tRKstFselAFmmg+5DhM9q9HPjpKYzbAxU6rxmdFbSc+ktE0rhtmciThVT3YW3bMs3g+D+6sf6ER9UkSpbdZ7skKFXBHw2t1BWaPrvW4L8GMFAokgXUKOE8e1WZkQuCcseIz8J9Hz1p/liyiiTPVQnjGyleUnUY0pZA3ViB6pS317BH5Kvd8aX8x0vSwCIs30rpkmBam9C0b2uj2jWk3GrmHYjVHebMAW376VSLTZV -git-us.linaro.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBONeIVl09BaG0iDOqF/qZjDun8fktYdD0Zl2fRAkSGT6Q7ULAXWJZA7IwstvcSs5w9SRV6x/lNc3CqlHwMFaABc= -git-us.linaro.org ssh-dss AAAAB3NzaC1kc3MAAACBAJbwbYgvbS+8vnlhJLe1AwgvbBqu0kBw7pBjQgF47lXRKqZbzwQc+hHmMbczJOfIoo1PX39Ifhz142u+yN7PQgUlU+jzI2Q9cjSqfrS02rV0cU2TQRKvgTQH89qMk2M0jOimcz1UCZkCgS2wj6hb1HU9pkhzpH7d+1/M/31Xc5uPAAAAFQC82/+3qHmNd8G8mrPJz9LfdUpsmwAAAIASypGV3LlIOE3bDlZwgr3rZ+44MPq7c16SbpjnjqbsOzPAyllD8MeY0eynuDqtGtT4RtC8uRgmgw7MW1HtYnTSlYt0up66LT19LCRKme8CVtggqjwLTUEKWmrdbe+PSvczKjeszOD0R5qGasSvOOKMJ5jLMnJ9jMhHhItc53eM5AAAAIBXWdudBBziVVk9VE+z1kvOYsCGYosLglqzJMsFfVQh948Ci9PowKx8xognWEtdaZW7+2oEIwL8QR+zPtzNY447i6iRuJy1TaDZfJU8nTfr07KoXB4B7rhADByXl4x9Uk25m9n9XjF/ctjIzyspvcRpqZXMHBUuZalID6E39YJqnA== -git-us.linaro.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8Q8j887I9mBD2va9C7gWl4Cr8agHWxuFHfDUWaqiygI9jA4w2YC7mo5oJMqwUk2DsvPDLuU5Z6yyKSA7Cko+L0MnKfNMzQ8e00ZXGDBq8bh1tRKstFselAFmmg+5DhM9q9HPjpKYzbAxU6rxmdFbSc+ktE0rhtmciThVT3YW3bMs3g+D+6sf6ER9UkSpbdZ7skKFXBHw2t1BWaPrvW4L8GMFAokgXUKOE8e1WZkQuCcseIz8J9Hz1p/liyiiTPVQnjGyleUnUY0pZA3ViB6pS317BH5Kvd8aX8x0vSwCIs30rpkmBam9C0b2uj2jWk3GrmHYjVHebMAW376VSLTZV -lab.validation.linaro.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBFZDLd4f9cph9A64+kXUpGvuRmInB3HAtHU9T6wVIsp4HkYLLZD59I4lF/u2VLfM7j10XMNPO7ybOJMM+1zIZlM= -lab.validation.linaro.org ssh-dss AAAAB3NzaC1kc3MAAACBAK75t/OG68cN0mtVNrliCi8/7tajozJQDGvxgnpben1F84IzWNJpBdtEgaXeo3zD0cQl1nM5IftBjSKMkomdsaDh7u6A57juaANU9NKIXW2BGmaICZxllFAb/Cmnq4mDnZJ33G5UyGPVA49bUEKw8DLe8FLVlO/wcghJhjoy7prZAAAAFQD8zrwLDwd4M4vKKWu9nju7fI3oywAAAIBVE6ykor/q56qYTYqaAvcRkq7331jdYHTqiAVcO9KyrdOS7yCgtb2Dw+O0rq5ftLSF73ad5ACbw+XbzQVJAeKDaDs5mLf3eYF0+3YODFRHYDsbbihO0uZcGHFPvGDD9odBZhWFIZaFSdboodSuyzxIgLu0EZAsHoSP2wjTGdiXFwAAAIAkPcANYxo0jm8BuCEYR+SXXS4aj83dUGbPP54UU7M+jrrfG1M+JVFh3kEsXr9zptZajY+NrqlnXqPp4HZyORUUEN+Szkjbd2p8CCCQvv1PODGJtXFzwpatUP27I2ik/lZG9OXxBQkO+QxjuJ+pcjXPdBRz6DwWoUM63+QFXBLpsw== -lab.validation.linaro.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDtto5bsPJ3NuXsWtwMR8bsAzLvkBstmF1QP+eC6jUBsCDHMtBW/zAWJYNPDr30vRkV7J8D64Pd91rgjbqF8mOPDlyVlln03dYtOV3hzVuXLZfxodslJsw4lB+ZhxLfcZAKqqFURJEhrJNJmtFBprxFRbdS1iQHJHJohg3zS9zlLFvUpZGWooLFEM2z2NdUfSiR12ePvdW1YsEimJR/b3h1it/Wot0uEB6VONZGyMrrWvsntJV1NdQFxJR8waTz1sBvQQBJGX+SgEXY1CB3AUiF4yIy5WZ/4YCOk0kO9qABvV0Ks357OU5uY5GMgalAy2RJyvceNf6erlR4vwmpdnDH -people.linaro.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKKtlH9IGVw1wE3daicRzyOdIM9MzWfUH1tUB8R/md36RDTSqG8VGYrn1E5pJcs7rsk05ZCUQIaglefMytoOvQ8= -people.linaro.org ssh-dss AAAAB3NzaC1kc3MAAACBAOnQwFbvISNteLPMb/Srm2xwFDrxDql+kxtlZyohrSZ72K9GDg+dqb4W7/QiVrOMhfRzaL93Hj/FLCxKqUXdnTQqekqGosRQK7fLNJvh6DNizoJ+aWzKp1EL3kF2GgKP33ZPtRJYrBdxnc+DDc0yP/He3cyrzbg1nsWSedc1MMVpAAAAFQCm3xIrM1iR9ozuyjKRGwhnrKo9GQAAAIBkdN4dNB298m+2aXqMmLOj1Ry9/S6CTiMn5c9T/luYpWFRnsyuHlBIcZFjyOMtU3bc8b7KwqP8t3XTQbolbqtYOWqPeiaIH/VAk7w9o1tePRwtbTadksYw+UJGtn9c+52uQfGZdjfyjsKs7hEWgE72gTeIb9g1QZ+WCoVfSzNacgAAAIA9T2ONJcRFX3heeDcl6gho8Wj264GDhS5/iqdMCClO3wKUY04hPSpXKRhRm/zzFGb9537Qj6LluDAcg+m/D0FnoQkILLXnfiMnrlyoCCA/jZWrVZw8aQdDHM5LlDdDZKZV7djkbjF0nVvWRTrvc20yQeDLLImaTDOfYjmJ75L1vQ== -people.linaro.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8OveP3mffvlzMEGuZQzol8zoDwCdAzrNiBfX9rv6lDGr86Sl4MVKs/6cYdjbtrUJD7ls5gc8cfjH5EXPh/HuoBj7Bi+UNfyyGSqrZgTFPpyLx50QJDeogcUN54NL+N/X6HtQtyvGwEXgb26S9ec7LFfyxqT8Yy370XH/y7qAtJgS3UTkf8kzIWgZQvU5MU3FqhOn9mzI+KqsBMRKt0JpW7H2VRYiaHqpshwpuNHRDEQBMnRVHDpo8SZRq21pwRjdTzuzGJv2enCW018jWC/HMmTaaDWzX6SO+JQs9NFVUpM6hg+ysa5piDXnCNQ8Ry6l0nlAjgUt92NEe4OeANrt9 -[review.linaro.org]:29418 ssh-dss AAAAB3NzaC1kc3MAAACBAPB0SE19HQ0dEtm3Unp7+JiNeHlIWNs4j9yN+2Q/fxmBT2ZZ0a5I4gg63b5rM/1Li/6k0f/CtSYBH/mhmjKaEKIQV/c/lmuZivUAfTPT0ld3voXHwRhgpWI/WOiRdsTRZZW2yUHx/troO53mx4eIISKfab+t+vCU5Af+sgTBF6InAAAAFQDGR2ccfQSWVuSyzgvK8f7FT8olTQAAAIBHZqySRfjEnnx9h0aS6i2H21dmZxUllwIJpdpS6XWzvMzVwBb1DKx8bO0WwZeTnxxs1BKVAjmSDkDGYJWHxyU8kQ8aFsBo0KwbNEKXozaK3Gf2YF289xQsigbtPUWYXDz1PNEXtIS9AXdCRq4i09ujO3ayxq4lX2n0LIQ4IhM+RgAAAIB2SvnzVadjW14AN9F9ZEfnK0JRpBTKjz+kQSS1TJiRI/dSHG6CwwXjD1G9YW8mfGhPOPYHIE2MF2n7d7DfqBdeeee0PnwBQ0YBc5qfhQ9Gpi+hqXSem1YaD2YRG40que5bu/Rd6NksnSLg/93Z3L3fN+qTeApRqHQWRrfswGgi+A== -[review.linaro.org]:29418 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDMfTLkTmsbtahAiVJTKXRFbR9MQ/vDH/JPj4QN3XPHJuubxLhUf8WObEBtML7J11uvVM1oDTwM5YG5yjyBnc+85OaQaB9tMPDheGhfMG40F4vxdSnQL29ihyrls0hrFTY9UZ4Y2FmJwYL0rOnGU7iPyNuExQwfg2bkdw67aH9nEGjSd2eXYl2bI4DHujy5GJiV3dR9TlUF0iaSeHVSIX5t9I/BXK+AiSqHTrvwdGGi9XvL6xEWYMOZOpJnCH8Q4OSibsFfQXnCMgIFeO7J/ZMGXqltXOtztgQMr8VvRRD3S+Lcp8yKb5aUjWwoCxb4YzEUbQE04SRVeAGjsfNJcXgT -review.linaro.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBONeIVl09BaG0iDOqF/qZjDun8fktYdD0Zl2fRAkSGT6Q7ULAXWJZA7IwstvcSs5w9SRV6x/lNc3CqlHwMFaABc= -review.linaro.org ssh-dss AAAAB3NzaC1kc3MAAACBAJbwbYgvbS+8vnlhJLe1AwgvbBqu0kBw7pBjQgF47lXRKqZbzwQc+hHmMbczJOfIoo1PX39Ifhz142u+yN7PQgUlU+jzI2Q9cjSqfrS02rV0cU2TQRKvgTQH89qMk2M0jOimcz1UCZkCgS2wj6hb1HU9pkhzpH7d+1/M/31Xc5uPAAAAFQC82/+3qHmNd8G8mrPJz9LfdUpsmwAAAIASypGV3LlIOE3bDlZwgr3rZ+44MPq7c16SbpjnjqbsOzPAyllD8MeY0eynuDqtGtT4RtC8uRgmgw7MW1HtYnTSlYt0up66LT19LCRKme8CVtggqjwLTUEKWmrdbe+PSvczKjeszOD0R5qGasSvOOKMJ5jLMnJ9jMhHhItc53eM5AAAAIBXWdudBBziVVk9VE+z1kvOYsCGYosLglqzJMsFfVQh948Ci9PowKx8xognWEtdaZW7+2oEIwL8QR+zPtzNY447i6iRuJy1TaDZfJU8nTfr07KoXB4B7rhADByXl4x9Uk25m9n9XjF/ctjIzyspvcRpqZXMHBUuZalID6E39YJqnA== -review.linaro.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8Q8j887I9mBD2va9C7gWl4Cr8agHWxuFHfDUWaqiygI9jA4w2YC7mo5oJMqwUk2DsvPDLuU5Z6yyKSA7Cko+L0MnKfNMzQ8e00ZXGDBq8bh1tRKstFselAFmmg+5DhM9q9HPjpKYzbAxU6rxmdFbSc+ktE0rhtmciThVT3YW3bMs3g+D+6sf6ER9UkSpbdZ7skKFXBHw2t1BWaPrvW4L8GMFAokgXUKOE8e1WZkQuCcseIz8J9Hz1p/liyiiTPVQnjGyleUnUY0pZA3ViB6pS317BH5Kvd8aX8x0vSwCIs30rpkmBam9C0b2uj2jWk3GrmHYjVHebMAW376VSLTZV 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/home/maxim.kuvyrkov/.ssh/authorized_keys b/tcwg-base/tcwg-host/home/maxim.kuvyrkov/.ssh/authorized_keys deleted file mode 100644 index fa17c380..00000000 --- a/tcwg-base/tcwg-host/home/maxim.kuvyrkov/.ssh/authorized_keys +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDR1x3iMEd7BSXx6QE3NtfVF8kYUUVoWUKCCC0jxOiLYCY3wf1i7bfQD7YMITEwXMvwQe6thGefBMLRPWr7WdoiUvxdaLYbSB72T4zN5tK/oQhFOHR8cqG68oSZIY89lUzFaGJRMGzSxUvYUWkwUhOIsjOBKFm+/yT4CD4SmUuFwQAadC6/t+jwc1LinYRMqphgfssUk8uzrvB0cqj2UsYrDF0jTVALfyTwWKHBokuZPnUER92v5e70/vAyOzJv13YdsQcwQBa1tBLrJJPpz8uX65bMLXJ6k+9U6bYSeVtRzYtmdDj5BYvdkJTR8diChLRS75roJclYpLEv0U9foCjd maxim.kuvyrkov@linaro.org-20150420 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 diff --git a/xenial-amd64-tcwg-base/xenial-amd64-tcwg-host/Dockerfile b/xenial-amd64-tcwg-base/xenial-amd64-tcwg-host/Dockerfile index 2417b52f..742a54a5 100644 --- a/xenial-amd64-tcwg-base/xenial-amd64-tcwg-host/Dockerfile +++ b/xenial-amd64-tcwg-base/xenial-amd64-tcwg-host/Dockerfile @@ -2,7 +2,7 @@ FROM linaro/ci-amd64-tcwg-base-ubuntu:xenial 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 \ @@ -13,4 +13,4 @@ RUN new-user.sh --group tcwg-infra:9000 && new-user.sh --group primary:10000 \ rsync -a /home-data/$user/ /home/$user/; \ done Date: Tue, 5 Jun 2018 12:50:28 +0000 Subject: tcwg-base: Symlink common files from tcwg-buildslave's home-data/ . Change-Id: I32f2563eab9e592be323c9fae81049c14b12a94a --- tcwg-base/home-data/maxim.kuvyrkov/.ssh/config | 1 + .../home-data/maxim.kuvyrkov/.ssh/known_hosts | 1 + tcwg-base/home-data/tcwg-benchmark/.ssh/config | 61 +--------------------- .../home-data/tcwg-benchmark/.ssh/known_hosts | 31 +---------- tcwg-base/tcwg-build/build.sh | 4 +- 5 files changed, 6 insertions(+), 92 deletions(-) create mode 120000 tcwg-base/home-data/maxim.kuvyrkov/.ssh/config create mode 120000 tcwg-base/home-data/maxim.kuvyrkov/.ssh/known_hosts mode change 100644 => 120000 tcwg-base/home-data/tcwg-benchmark/.ssh/config mode change 100644 => 120000 tcwg-base/home-data/tcwg-benchmark/.ssh/known_hosts diff --git a/tcwg-base/home-data/maxim.kuvyrkov/.ssh/config b/tcwg-base/home-data/maxim.kuvyrkov/.ssh/config new file mode 120000 index 00000000..5f9d8251 --- /dev/null +++ b/tcwg-base/home-data/maxim.kuvyrkov/.ssh/config @@ -0,0 +1 @@ +../../tcwg-buildslave/.ssh/config \ No newline at end of file diff --git a/tcwg-base/home-data/maxim.kuvyrkov/.ssh/known_hosts b/tcwg-base/home-data/maxim.kuvyrkov/.ssh/known_hosts new file mode 120000 index 00000000..936136a2 --- /dev/null +++ b/tcwg-base/home-data/maxim.kuvyrkov/.ssh/known_hosts @@ -0,0 +1 @@ +../../tcwg-buildslave/.ssh/known_hosts \ No newline at end of file diff --git a/tcwg-base/home-data/tcwg-benchmark/.ssh/config b/tcwg-base/home-data/tcwg-benchmark/.ssh/config deleted file mode 100644 index 47e5dbf0..00000000 --- a/tcwg-base/home-data/tcwg-benchmark/.ssh/config +++ /dev/null @@ -1,60 +0,0 @@ -# === BEGIN: TCWG SSH configuration === -# -# !!! THIS MUST BE COPIED TO THE START OF YOUR ~/.SSH/CONFIG FILE. !!! -# !!! IF YOU REPORT A PROBLEM WITH SSH, AND THIS CONFIGURATION IS NOT !!! -# !!! AT THE START OF YOUR FILE -- YOU HAVE OBVIOUSLY MISSED THIS VERY !!! -# !!! IMPORTANT NOTE. AS PENANCE, YOU WILL READ THIS NOTE OUT LOUD. !!! -# - -Host *.tcwglab *.aus-colo people.linaro.org aus-colo.linaro.org lab.validation.linaro.org - #User @LDAP_USER@ - #IdentityFile ~/.ssh/id_rsa - -# Proxy connections to custom ssh servers (inside containers) on firewalled -# hosts through "main" ssh server on that host. -# E.g., "ssh -p32768 proxy.dev-01.tcwglab" -Host *proxy.* - ProxyCommand ssh $(echo %h | sed -e "s/proxy\.//") nc -q0 localhost %p - -# Access to Austin Colo. E.g., "ssh r1-a7.aus-colo" -Host *.aus-colo - ProxyCommand ssh aus-colo.linaro.org nc -q0 %h %p - -# Access to LAVA Lab. E.g., "ssh root@10.7.0.18.lab" -Host *.lab - ProxyCommand ssh lab.validation.linaro.org nc -q0 $(basename %h .lab) %p - -Host *.tcwglab *.aus-colo *.lab - # Enable automatic multiplexing. - ControlMaster auto - # Soften up potential problems with killing master connection by using - # ControlPersist (which puts the master connection in background). - # Also ControlPersist has an undocumented feature that it will clean-up - # and replace stale ssh socket from a zombie connection. - ControlPersist 5m - # Put the ssh socket on /tmp. Note that overlayfs can't host sockets, - # so we always arrange /tmp to be on a ext4 or equivalent FS. - ControlPath /tmp/ssh-%u-%r@%h:%p - # There is little point in forwarding X11 to machines outside of local network. - ForwardX11 no - # Forward authentication agent and keep private keys in one place. - ForwardAgent yes - # Ping server every 5min to avoid routers dropping connection. - # This matches -o BatchMode=yes setting used in cross-testing (see ABE) - ServerAliveInterval 300 - # Disable checking of host keys for boards behind gateways. - # !!! BE BECAREFUL TO ONLY DO THIS FOR MACHINES BEHIND SSH GATEWAY OR VPN !!! - StrictHostKeyChecking no - # Don't store host keys for one-time containers - UserKnownHostsFile /dev/null - # Don't warn about "adding" host keys to /dev/null - LogLevel FATAL - -# Make sure we can connect to localhost (e.g., to a container running -# on localhost) with the settings for *.tcwglab -Host localhost.tcwglab - Hostname localhost - -Host git.linaro.org dev-private-git.linaro.org - User git -# === END: TCWG SSH configuration === diff --git a/tcwg-base/home-data/tcwg-benchmark/.ssh/config b/tcwg-base/home-data/tcwg-benchmark/.ssh/config new file mode 120000 index 00000000..5f9d8251 --- /dev/null +++ b/tcwg-base/home-data/tcwg-benchmark/.ssh/config @@ -0,0 +1 @@ +../../tcwg-buildslave/.ssh/config \ No newline at end of file diff --git a/tcwg-base/home-data/tcwg-benchmark/.ssh/known_hosts b/tcwg-base/home-data/tcwg-benchmark/.ssh/known_hosts deleted file mode 100644 index b649d65f..00000000 --- a/tcwg-base/home-data/tcwg-benchmark/.ssh/known_hosts +++ /dev/null @@ -1,30 +0,0 @@ -aus-colo.linaro.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBP8apVdw/JC+4rOiq/eG2LgjwJPCqKIlG/RwPVDe1VNOdtrmR6VnTQ5oQYkwt00h2rdI6dVzdW8Q9za7PGW6Sls= -aus-colo.linaro.org ssh-dss AAAAB3NzaC1kc3MAAACBALdjDe/FnDjKDz+QzKWD/J1jIVVjied+1EFcxZ/uyGw9uZwVjReHP6ehGQCtQEM+SDklOXc6bz9UeBjG6+gDGXWBmldbS2yXvvxFmmbOf40h/rVFKq0CW/tJxyONoaf75Qj+aOyo3iUXMl+jJowb+LR5j0zbdTrSkM2qEsP8o0b3AAAAFQDfNOi88rFXdks5xpzmiKs0fzyYGQAAAIEAnzYTZ0dDAua6FHgqfoNVZHS4CV/le6G5FFCc4Kp4lB9ijRMjrDZNey5BkCooetqOBuPF8mYYAgZ28NemIUvvTenddfHFzWQTPl0meAdUhBW4EJMq0HWEV+kUKANUah2QlXWx8/g1x3cOhBzABTMOEBUFnlMx9d5A71JZypEN5UQAAACACiH996M1x/DjYmMp6BLwglYMDjQPrfI7QhNwa/8/wukDHlB6puB/HdPyxYZp/IVShHze6C3YpmV+dXxc85/vMNoVRx02ICC2gTkm2MoSFgaW1nO95tRPtyJ4AXa4ev4D22hNPF5SxgXfn2lT4uH8bWxvTrzgHs7JhAzD0oRbOh4= -aus-colo.linaro.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCg5vMfuBLRroqEb6+CFLQikh1Wq6UD++SODY7bSdPDfN1wmurdp60AdVU+22nOXgK78mwYPJ0PEcTBMSE+OmryfZFDZm/+aPbALid/vFs8NuvFmEQ8vecEBPDGxJ3RpVxkNG5BrWMTJjWMJTCFdIh9my5vhBPEloAuDRthRNaRwvgqRw3GJAbSG2Cg4ZgOQi7Lv3ogQ/M3nXzy8KMp4KD7AtncylguPoVwDxNwjl+YoEujZDvpM4UiZDnh+Gxeru3EnEIgDvwbMizlrKL8Tm+2gA+j3cWkgIjCVJM+PW8V0aobp681ChqlbDlzK0oVmwUafdVv3dxzOSrjQH2rkaOn -dev-private-git.linaro.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBOvq8E5HPzrBlxmckzsE3rz9LAx9c0faEfofALaO+UGC4HAst9fMaZcHaCqu+b8SVY/2VcBvMYMwO1ZPgOn0rXs= -dev-private-git.linaro.org ssh-dss AAAAB3NzaC1kc3MAAACBAK10xjDXtqiW6S02TFvIQUmjTyu+tpiT0IVTp5dlZX5rT1EDi4DtRgtoO/R4WncAs0GE8FqaI/IqljuYlJbHOrFCxU3OWKB+z2Ue3oXs3kouoFP3coF4exBZLEBX4JQ/HI5Ii88fnE/U70/+wN/mMAtcOrsgGWGXOv8yFZEQaKJJAAAAFQCfVbaD5KdaABTLwQ8CXRuZ+PAeHwAAAIBmppcf9sx9M4KAgiOQRGW+7/eImJHFRazQSe8Qbiqo0H7OQhIRcLIm6+PAtKgxxSaQErAo4z/xM7d2lhqOyydK5GDpILgV3qHUFAgQ9vajL+ga5/VeRTqg6R91kYgIKnEl3y8/iW6eRcJF/jzYfDcaFG0Z3gsOtHzjTsCuV8KMLwAAAIBupI2LDTsUYa64hSKvGhEVPMj8VKx5RX4NWQU/dlNNhlFRTzV42giujZ146vH5SGqagR3daX+o6Xm++GDJ+AedzJ8zBc9dAwU7ao4fd23bsyURvNxC7K5DKJnlCDS6xk+6wv6Hz9VdbaIEE5TPxSGqZEOK1V+pbgv+cMUGACy43Q== -dev-private-git.linaro.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC34bjTOKJIq8MVSeC5gddQlbR0hyvvTZbrpW7KXgCzkLTFZxa05wbz8VC1l7ruPotQBgrICgLYmrbjrASqcY//9OPLDa1Pf/MUIu2F2lA1W/5E3psGYmyC9GTvmjKgu39Rad5ujXMeMLjuzVPCmo+WhewgugDSV4Fcggd6B6YXHGtoE15ctSw4moerUq1+2BXVgFxUyMoGcpSCeLnbvWpmi6xWoGQOSnrQ4Z/VmZ5WZ87vQsiiWEAsqmMOHHacunnSph7uzQXJlHNajdeGnr2NF+EgcmQ0N6vivZDRLmRYuSmizjCOHSRZxSm/0UJC/ewVzp9BwRepiNKWsjb4gTMb -[dev-private-review.linaro.org]:29418 ssh-dss AAAAB3NzaC1kc3MAAACBAM596jW8Kbsh/ApdoP3r7UvrSOzhnoG1ZHYngER+Dd9e0iGJY1Wbpth7ngngpALl3PQQ99R5xUt8wvcOcICq+vF34FR/Gym+7VjaMLI7DxF48OrUAJnx6zINNlpXbMAI0nptWcKoL/xdmC7AoBOjH1Q+jGTiKISmXTE1w5iK8qp3AAAAFQDwzizM3qhYdknasNV/vp84o19FWQAAAIEAqLjr9vNsgr1snOdyKOhRuyidqf/zThaxuJaUktxLDKU0DDip+FGqLYiS2VzNuSWMaKjkBjITBi0sXktmUhhbPvBHhyzLy3Hz6BOdXpUAoq70QMOcocE9IsEfmqtkOsx/BZ1uCV6W051Gsci4PxK16q9zolpAEp4/3wEWGH+ueJIAAACAERdZ+vCZl6iDzq6XpYFKZ1r6i/CjX5KIBWKCzoN/Z8fo96rZqFA23G5tXM8+YMYnLdwb/qvNSCz6dWpH2FMS4yj7zo2l3GjguC8JOfar0Rt8fihJyaynX+rD/aP3b+h5ot1b/645qrfvpfmeh3gZt3c1kjy5fyopujyGNTUtq6c= -[dev-private-review.linaro.org]:29418 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCofUDWYYwzE4YWotCffwCxLoRuVCMb6DP+eObwbTPHMe5asK94Y1jPNeK1yUVJIuIAUO8aA6pIq3uLKlusyGLZe1YBpM+7YX3HMOBfCOeOemHFxETlj/HC7islYLYT7Sm/DweiN1kxgP8Q/PhPIA5czCZGHS/+T/VLbMApyyzdTmswaqfgJejyK9juHAcmxT3Tupj2SGOuOamyKfhfsPxGwIchivy/mt7xBTk5cNiSDeLAfMn2rHsilfLjb+IoeE6EvtqG3+rTh+ttulHp2vSeZkK79tuyVWt+XOZjD4RDfk1taW9JjaafkyOW0VCF4gqOMfJU24u88xTCgqkgT1bN -dev-private-review.linaro.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBOvq8E5HPzrBlxmckzsE3rz9LAx9c0faEfofALaO+UGC4HAst9fMaZcHaCqu+b8SVY/2VcBvMYMwO1ZPgOn0rXs= -dev-private-review.linaro.org ssh-dss AAAAB3NzaC1kc3MAAACBAK10xjDXtqiW6S02TFvIQUmjTyu+tpiT0IVTp5dlZX5rT1EDi4DtRgtoO/R4WncAs0GE8FqaI/IqljuYlJbHOrFCxU3OWKB+z2Ue3oXs3kouoFP3coF4exBZLEBX4JQ/HI5Ii88fnE/U70/+wN/mMAtcOrsgGWGXOv8yFZEQaKJJAAAAFQCfVbaD5KdaABTLwQ8CXRuZ+PAeHwAAAIBmppcf9sx9M4KAgiOQRGW+7/eImJHFRazQSe8Qbiqo0H7OQhIRcLIm6+PAtKgxxSaQErAo4z/xM7d2lhqOyydK5GDpILgV3qHUFAgQ9vajL+ga5/VeRTqg6R91kYgIKnEl3y8/iW6eRcJF/jzYfDcaFG0Z3gsOtHzjTsCuV8KMLwAAAIBupI2LDTsUYa64hSKvGhEVPMj8VKx5RX4NWQU/dlNNhlFRTzV42giujZ146vH5SGqagR3daX+o6Xm++GDJ+AedzJ8zBc9dAwU7ao4fd23bsyURvNxC7K5DKJnlCDS6xk+6wv6Hz9VdbaIEE5TPxSGqZEOK1V+pbgv+cMUGACy43Q== -dev-private-review.linaro.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC34bjTOKJIq8MVSeC5gddQlbR0hyvvTZbrpW7KXgCzkLTFZxa05wbz8VC1l7ruPotQBgrICgLYmrbjrASqcY//9OPLDa1Pf/MUIu2F2lA1W/5E3psGYmyC9GTvmjKgu39Rad5ujXMeMLjuzVPCmo+WhewgugDSV4Fcggd6B6YXHGtoE15ctSw4moerUq1+2BXVgFxUyMoGcpSCeLnbvWpmi6xWoGQOSnrQ4Z/VmZ5WZ87vQsiiWEAsqmMOHHacunnSph7uzQXJlHNajdeGnr2NF+EgcmQ0N6vivZDRLmRYuSmizjCOHSRZxSm/0UJC/ewVzp9BwRepiNKWsjb4gTMb -ex40-01.tcwglab.linaro.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBBblrQ+VuEY6mQDq10+GgOPYJIsTfaHXYZi0O0mPr+ev1xNodJ0w45hiWWlmsLEiXiGsvvIiOgZcZsryCkGscDI= -ex40-01.tcwglab.linaro.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC37ZZKNZpSxQnWcu/5eNpFpEjIzL5eZyKUbn8ghkmk4jVS7fIbty/6s1ZH94UPwQDb07F4QF89esoH5k2ajAizLMNoLxeHU8ZCcqMFaNcmVWjTxKbiXLwRqcrgLUrNMQIGesV8l+xH+yozG2HKOBAnMVaea9+wCFvJWXgO4u54eEup2JcE3UroWIRA/mOL4KhBbyVVe47NbydYbP5G0mqpJjpLv5TuJwRT/aP/0nRH6cPrzuqGbic7cVR7Bu3f6ipttMAsPQRAoFBVYb5yRAt/RcDBu39r7hLHyhitjw0vBhGGV0B5CEzAqCE3ZyU0H+vmQ2GeN8aEtUWDSK9W7uzJ -git.linaro.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBONeIVl09BaG0iDOqF/qZjDun8fktYdD0Zl2fRAkSGT6Q7ULAXWJZA7IwstvcSs5w9SRV6x/lNc3CqlHwMFaABc= -git.linaro.org ssh-dss AAAAB3NzaC1kc3MAAACBAJbwbYgvbS+8vnlhJLe1AwgvbBqu0kBw7pBjQgF47lXRKqZbzwQc+hHmMbczJOfIoo1PX39Ifhz142u+yN7PQgUlU+jzI2Q9cjSqfrS02rV0cU2TQRKvgTQH89qMk2M0jOimcz1UCZkCgS2wj6hb1HU9pkhzpH7d+1/M/31Xc5uPAAAAFQC82/+3qHmNd8G8mrPJz9LfdUpsmwAAAIASypGV3LlIOE3bDlZwgr3rZ+44MPq7c16SbpjnjqbsOzPAyllD8MeY0eynuDqtGtT4RtC8uRgmgw7MW1HtYnTSlYt0up66LT19LCRKme8CVtggqjwLTUEKWmrdbe+PSvczKjeszOD0R5qGasSvOOKMJ5jLMnJ9jMhHhItc53eM5AAAAIBXWdudBBziVVk9VE+z1kvOYsCGYosLglqzJMsFfVQh948Ci9PowKx8xognWEtdaZW7+2oEIwL8QR+zPtzNY447i6iRuJy1TaDZfJU8nTfr07KoXB4B7rhADByXl4x9Uk25m9n9XjF/ctjIzyspvcRpqZXMHBUuZalID6E39YJqnA== -git.linaro.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8Q8j887I9mBD2va9C7gWl4Cr8agHWxuFHfDUWaqiygI9jA4w2YC7mo5oJMqwUk2DsvPDLuU5Z6yyKSA7Cko+L0MnKfNMzQ8e00ZXGDBq8bh1tRKstFselAFmmg+5DhM9q9HPjpKYzbAxU6rxmdFbSc+ktE0rhtmciThVT3YW3bMs3g+D+6sf6ER9UkSpbdZ7skKFXBHw2t1BWaPrvW4L8GMFAokgXUKOE8e1WZkQuCcseIz8J9Hz1p/liyiiTPVQnjGyleUnUY0pZA3ViB6pS317BH5Kvd8aX8x0vSwCIs30rpkmBam9C0b2uj2jWk3GrmHYjVHebMAW376VSLTZV -git-us.linaro.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBONeIVl09BaG0iDOqF/qZjDun8fktYdD0Zl2fRAkSGT6Q7ULAXWJZA7IwstvcSs5w9SRV6x/lNc3CqlHwMFaABc= -git-us.linaro.org ssh-dss AAAAB3NzaC1kc3MAAACBAJbwbYgvbS+8vnlhJLe1AwgvbBqu0kBw7pBjQgF47lXRKqZbzwQc+hHmMbczJOfIoo1PX39Ifhz142u+yN7PQgUlU+jzI2Q9cjSqfrS02rV0cU2TQRKvgTQH89qMk2M0jOimcz1UCZkCgS2wj6hb1HU9pkhzpH7d+1/M/31Xc5uPAAAAFQC82/+3qHmNd8G8mrPJz9LfdUpsmwAAAIASypGV3LlIOE3bDlZwgr3rZ+44MPq7c16SbpjnjqbsOzPAyllD8MeY0eynuDqtGtT4RtC8uRgmgw7MW1HtYnTSlYt0up66LT19LCRKme8CVtggqjwLTUEKWmrdbe+PSvczKjeszOD0R5qGasSvOOKMJ5jLMnJ9jMhHhItc53eM5AAAAIBXWdudBBziVVk9VE+z1kvOYsCGYosLglqzJMsFfVQh948Ci9PowKx8xognWEtdaZW7+2oEIwL8QR+zPtzNY447i6iRuJy1TaDZfJU8nTfr07KoXB4B7rhADByXl4x9Uk25m9n9XjF/ctjIzyspvcRpqZXMHBUuZalID6E39YJqnA== -git-us.linaro.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8Q8j887I9mBD2va9C7gWl4Cr8agHWxuFHfDUWaqiygI9jA4w2YC7mo5oJMqwUk2DsvPDLuU5Z6yyKSA7Cko+L0MnKfNMzQ8e00ZXGDBq8bh1tRKstFselAFmmg+5DhM9q9HPjpKYzbAxU6rxmdFbSc+ktE0rhtmciThVT3YW3bMs3g+D+6sf6ER9UkSpbdZ7skKFXBHw2t1BWaPrvW4L8GMFAokgXUKOE8e1WZkQuCcseIz8J9Hz1p/liyiiTPVQnjGyleUnUY0pZA3ViB6pS317BH5Kvd8aX8x0vSwCIs30rpkmBam9C0b2uj2jWk3GrmHYjVHebMAW376VSLTZV -lab.validation.linaro.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBFZDLd4f9cph9A64+kXUpGvuRmInB3HAtHU9T6wVIsp4HkYLLZD59I4lF/u2VLfM7j10XMNPO7ybOJMM+1zIZlM= -lab.validation.linaro.org ssh-dss AAAAB3NzaC1kc3MAAACBAK75t/OG68cN0mtVNrliCi8/7tajozJQDGvxgnpben1F84IzWNJpBdtEgaXeo3zD0cQl1nM5IftBjSKMkomdsaDh7u6A57juaANU9NKIXW2BGmaICZxllFAb/Cmnq4mDnZJ33G5UyGPVA49bUEKw8DLe8FLVlO/wcghJhjoy7prZAAAAFQD8zrwLDwd4M4vKKWu9nju7fI3oywAAAIBVE6ykor/q56qYTYqaAvcRkq7331jdYHTqiAVcO9KyrdOS7yCgtb2Dw+O0rq5ftLSF73ad5ACbw+XbzQVJAeKDaDs5mLf3eYF0+3YODFRHYDsbbihO0uZcGHFPvGDD9odBZhWFIZaFSdboodSuyzxIgLu0EZAsHoSP2wjTGdiXFwAAAIAkPcANYxo0jm8BuCEYR+SXXS4aj83dUGbPP54UU7M+jrrfG1M+JVFh3kEsXr9zptZajY+NrqlnXqPp4HZyORUUEN+Szkjbd2p8CCCQvv1PODGJtXFzwpatUP27I2ik/lZG9OXxBQkO+QxjuJ+pcjXPdBRz6DwWoUM63+QFXBLpsw== -lab.validation.linaro.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDtto5bsPJ3NuXsWtwMR8bsAzLvkBstmF1QP+eC6jUBsCDHMtBW/zAWJYNPDr30vRkV7J8D64Pd91rgjbqF8mOPDlyVlln03dYtOV3hzVuXLZfxodslJsw4lB+ZhxLfcZAKqqFURJEhrJNJmtFBprxFRbdS1iQHJHJohg3zS9zlLFvUpZGWooLFEM2z2NdUfSiR12ePvdW1YsEimJR/b3h1it/Wot0uEB6VONZGyMrrWvsntJV1NdQFxJR8waTz1sBvQQBJGX+SgEXY1CB3AUiF4yIy5WZ/4YCOk0kO9qABvV0Ks357OU5uY5GMgalAy2RJyvceNf6erlR4vwmpdnDH -people.linaro.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKKtlH9IGVw1wE3daicRzyOdIM9MzWfUH1tUB8R/md36RDTSqG8VGYrn1E5pJcs7rsk05ZCUQIaglefMytoOvQ8= -people.linaro.org ssh-dss AAAAB3NzaC1kc3MAAACBAOnQwFbvISNteLPMb/Srm2xwFDrxDql+kxtlZyohrSZ72K9GDg+dqb4W7/QiVrOMhfRzaL93Hj/FLCxKqUXdnTQqekqGosRQK7fLNJvh6DNizoJ+aWzKp1EL3kF2GgKP33ZPtRJYrBdxnc+DDc0yP/He3cyrzbg1nsWSedc1MMVpAAAAFQCm3xIrM1iR9ozuyjKRGwhnrKo9GQAAAIBkdN4dNB298m+2aXqMmLOj1Ry9/S6CTiMn5c9T/luYpWFRnsyuHlBIcZFjyOMtU3bc8b7KwqP8t3XTQbolbqtYOWqPeiaIH/VAk7w9o1tePRwtbTadksYw+UJGtn9c+52uQfGZdjfyjsKs7hEWgE72gTeIb9g1QZ+WCoVfSzNacgAAAIA9T2ONJcRFX3heeDcl6gho8Wj264GDhS5/iqdMCClO3wKUY04hPSpXKRhRm/zzFGb9537Qj6LluDAcg+m/D0FnoQkILLXnfiMnrlyoCCA/jZWrVZw8aQdDHM5LlDdDZKZV7djkbjF0nVvWRTrvc20yQeDLLImaTDOfYjmJ75L1vQ== -people.linaro.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8OveP3mffvlzMEGuZQzol8zoDwCdAzrNiBfX9rv6lDGr86Sl4MVKs/6cYdjbtrUJD7ls5gc8cfjH5EXPh/HuoBj7Bi+UNfyyGSqrZgTFPpyLx50QJDeogcUN54NL+N/X6HtQtyvGwEXgb26S9ec7LFfyxqT8Yy370XH/y7qAtJgS3UTkf8kzIWgZQvU5MU3FqhOn9mzI+KqsBMRKt0JpW7H2VRYiaHqpshwpuNHRDEQBMnRVHDpo8SZRq21pwRjdTzuzGJv2enCW018jWC/HMmTaaDWzX6SO+JQs9NFVUpM6hg+ysa5piDXnCNQ8Ry6l0nlAjgUt92NEe4OeANrt9 -[review.linaro.org]:29418 ssh-dss AAAAB3NzaC1kc3MAAACBAPB0SE19HQ0dEtm3Unp7+JiNeHlIWNs4j9yN+2Q/fxmBT2ZZ0a5I4gg63b5rM/1Li/6k0f/CtSYBH/mhmjKaEKIQV/c/lmuZivUAfTPT0ld3voXHwRhgpWI/WOiRdsTRZZW2yUHx/troO53mx4eIISKfab+t+vCU5Af+sgTBF6InAAAAFQDGR2ccfQSWVuSyzgvK8f7FT8olTQAAAIBHZqySRfjEnnx9h0aS6i2H21dmZxUllwIJpdpS6XWzvMzVwBb1DKx8bO0WwZeTnxxs1BKVAjmSDkDGYJWHxyU8kQ8aFsBo0KwbNEKXozaK3Gf2YF289xQsigbtPUWYXDz1PNEXtIS9AXdCRq4i09ujO3ayxq4lX2n0LIQ4IhM+RgAAAIB2SvnzVadjW14AN9F9ZEfnK0JRpBTKjz+kQSS1TJiRI/dSHG6CwwXjD1G9YW8mfGhPOPYHIE2MF2n7d7DfqBdeeee0PnwBQ0YBc5qfhQ9Gpi+hqXSem1YaD2YRG40que5bu/Rd6NksnSLg/93Z3L3fN+qTeApRqHQWRrfswGgi+A== -[review.linaro.org]:29418 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDMfTLkTmsbtahAiVJTKXRFbR9MQ/vDH/JPj4QN3XPHJuubxLhUf8WObEBtML7J11uvVM1oDTwM5YG5yjyBnc+85OaQaB9tMPDheGhfMG40F4vxdSnQL29ihyrls0hrFTY9UZ4Y2FmJwYL0rOnGU7iPyNuExQwfg2bkdw67aH9nEGjSd2eXYl2bI4DHujy5GJiV3dR9TlUF0iaSeHVSIX5t9I/BXK+AiSqHTrvwdGGi9XvL6xEWYMOZOpJnCH8Q4OSibsFfQXnCMgIFeO7J/ZMGXqltXOtztgQMr8VvRRD3S+Lcp8yKb5aUjWwoCxb4YzEUbQE04SRVeAGjsfNJcXgT -review.linaro.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBONeIVl09BaG0iDOqF/qZjDun8fktYdD0Zl2fRAkSGT6Q7ULAXWJZA7IwstvcSs5w9SRV6x/lNc3CqlHwMFaABc= -review.linaro.org ssh-dss AAAAB3NzaC1kc3MAAACBAJbwbYgvbS+8vnlhJLe1AwgvbBqu0kBw7pBjQgF47lXRKqZbzwQc+hHmMbczJOfIoo1PX39Ifhz142u+yN7PQgUlU+jzI2Q9cjSqfrS02rV0cU2TQRKvgTQH89qMk2M0jOimcz1UCZkCgS2wj6hb1HU9pkhzpH7d+1/M/31Xc5uPAAAAFQC82/+3qHmNd8G8mrPJz9LfdUpsmwAAAIASypGV3LlIOE3bDlZwgr3rZ+44MPq7c16SbpjnjqbsOzPAyllD8MeY0eynuDqtGtT4RtC8uRgmgw7MW1HtYnTSlYt0up66LT19LCRKme8CVtggqjwLTUEKWmrdbe+PSvczKjeszOD0R5qGasSvOOKMJ5jLMnJ9jMhHhItc53eM5AAAAIBXWdudBBziVVk9VE+z1kvOYsCGYosLglqzJMsFfVQh948Ci9PowKx8xognWEtdaZW7+2oEIwL8QR+zPtzNY447i6iRuJy1TaDZfJU8nTfr07KoXB4B7rhADByXl4x9Uk25m9n9XjF/ctjIzyspvcRpqZXMHBUuZalID6E39YJqnA== -review.linaro.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8Q8j887I9mBD2va9C7gWl4Cr8agHWxuFHfDUWaqiygI9jA4w2YC7mo5oJMqwUk2DsvPDLuU5Z6yyKSA7Cko+L0MnKfNMzQ8e00ZXGDBq8bh1tRKstFselAFmmg+5DhM9q9HPjpKYzbAxU6rxmdFbSc+ktE0rhtmciThVT3YW3bMs3g+D+6sf6ER9UkSpbdZ7skKFXBHw2t1BWaPrvW4L8GMFAokgXUKOE8e1WZkQuCcseIz8J9Hz1p/liyiiTPVQnjGyleUnUY0pZA3ViB6pS317BH5Kvd8aX8x0vSwCIs30rpkmBam9C0b2uj2jWk3GrmHYjVHebMAW376VSLTZV diff --git a/tcwg-base/home-data/tcwg-benchmark/.ssh/known_hosts b/tcwg-base/home-data/tcwg-benchmark/.ssh/known_hosts new file mode 120000 index 00000000..936136a2 --- /dev/null +++ b/tcwg-base/home-data/tcwg-benchmark/.ssh/known_hosts @@ -0,0 +1 @@ +../../tcwg-buildslave/.ssh/known_hosts \ No newline at end of file diff --git a/tcwg-base/tcwg-build/build.sh b/tcwg-base/tcwg-build/build.sh index 1e14577d..2cc96d04 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/home-data/tcwg-buildslave/ ./tcwg-buildslave/ -rsync -a $top/tcwg-base/home-data/tcwg-benchmark/ ./tcwg-benchmark/ +rsync -aL $top/tcwg-base/home-data/tcwg-buildslave/ ./tcwg-buildslave/ +rsync -aL $top/tcwg-base/home-data/tcwg-benchmark/ ./tcwg-benchmark/ (cd ..; ./build.sh) "$top"/tcwg-base/validate-dockerfile.sh Dockerfile -- cgit v1.2.3 From 5f4811ff114af8cf612efd897103401dc1b0f2a8 Mon Sep 17 00:00:00 2001 From: Maxim Kuvyrkov Date: Tue, 5 Jun 2018 13:04:48 +0000 Subject: tcwg-host: Restrict access to /home/$USER/.ssh directories of users. Change-Id: Iee82239f4280a908e019f9cf15337f9ee87fa572 --- tcwg-base/tcwg-host/Dockerfile.in | 3 ++- xenial-amd64-tcwg-base/xenial-amd64-tcwg-host/Dockerfile | 5 +++-- xenial-arm64-tcwg-base/xenial-arm64-tcwg-host/Dockerfile | 5 +++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/tcwg-base/tcwg-host/Dockerfile.in b/tcwg-base/tcwg-host/Dockerfile.in index 18050ecf..d660245f 100644 --- a/tcwg-base/tcwg-host/Dockerfile.in +++ b/tcwg-base/tcwg-host/Dockerfile.in @@ -3,12 +3,13 @@ FROM linaro/ci-#{ARCH}-tcwg-base-ubuntu:#{DISTRO} COPY passwd start.sh / COPY home-data/ /home-data/ -RUN new-user.sh --group tcwg-infra:9000 && new-user.sh --group primary:10000 \ +RUN new-user.sh --group tcwg-infra:9000 && new-user.sh --group tcwg-users:10000 \ && while read line; do \ new-user.sh --passwd "$line"; \ user=$(echo "$line" | cut -d: -f 1); \ gid=$(echo "$line" | cut -d: -f 4); \ chown -R $user:$gid /home-data/$user/; \ + chmod -R go-rwx /home-data/$user/.ssh/ ; \ rsync -a /home-data/$user/ /home/$user/; \ done Date: Tue, 5 Jun 2018 13:21:24 +0000 Subject: tcwg-host, tcwg-build: Simplify and unify handling of /home files Replace "new-user.sh --key KEY" interface with "new-user.sh --home-data DIR" interface. Use the new interface in both tcwg-host and tcwg-build images. Change-Id: I58e7e6506daa70bd10b4f29deebcf85ca0c5bc4f --- tcwg-base/new-user.sh | 17 ++++++++--------- tcwg-base/tcwg-build/Dockerfile.in | 16 ++++++---------- tcwg-base/tcwg-host/Dockerfile.in | 7 +------ .../trusty-amd64-tcwg-build/Dockerfile | 18 +++++++----------- .../trusty-arm64-tcwg-build/Dockerfile | 18 +++++++----------- .../trusty-armhf-tcwg-build/Dockerfile | 18 +++++++----------- .../trusty-i386-tcwg-build/Dockerfile | 18 +++++++----------- .../xenial-amd64-tcwg-build/Dockerfile | 18 +++++++----------- .../xenial-amd64-tcwg-host/Dockerfile | 9 ++------- .../xenial-arm64-tcwg-build/Dockerfile | 18 +++++++----------- .../xenial-arm64-tcwg-host/Dockerfile | 9 ++------- .../xenial-armhf-tcwg-build/Dockerfile | 18 +++++++----------- .../xenial-i386-tcwg-build/Dockerfile | 18 +++++++----------- 13 files changed, 75 insertions(+), 127 deletions(-) diff --git a/tcwg-base/new-user.sh b/tcwg-base/new-user.sh index d3abe709..5f36b5f8 100755 --- a/tcwg-base/new-user.sh +++ b/tcwg-base/new-user.sh @@ -9,7 +9,7 @@ usage () passwd_ent="" group="" -key="" +home_data="" user="" verbose=false @@ -17,7 +17,7 @@ while [ $# -gt 0 ]; do case "$1" in --passwd) passwd_ent="$2" ;; --group) group="$2" ;; - --key) key="$2" ;; + --home-data) home_data="$2" ;; --user) user="$2" ;; --verbose) verbose="$2"; shift ;; *) echo "ERROR: Wrong option: $1"; usage ;; @@ -41,6 +41,7 @@ elif [ x"$passwd_ent" != x"" ]; then group_opt="-g $gid" else group_opt="" + gid="" fi if [ x"$user" = x"" ]; then @@ -65,12 +66,10 @@ if [ x"$user" != x"" ]; then sudoers_file=/etc/sudoers.d/$(echo $user | tr "." "-") echo "$user ALL = NOPASSWD: ALL" > $sudoers_file chmod 0440 $sudoers_file -fi -if [ x"$key" != x"" ]; then - key_user=$(echo "$key" | sed -e "s/.*authorized_keys-//") - sudo -i -u $key_user mkdir -p /home/$key_user/.ssh - sudo -i -u $key_user chmod 0700 /home/$key_user/.ssh - cat "$key" | sudo -i -u $key_user tee /home/$key_user/.ssh/authorized_keys > /dev/null - sudo -i -u $key_user chmod 0600 /home/$key_user/.ssh/authorized_keys + if [ x"$home_data" != x"" ]; then + chown -R $user${gid:+:$gid} /home-data/$user/; \ + chmod -R go-rwx /home-data/$user/.ssh/ ; \ + rsync -a /home-data/$user/ /home/$user/; \ + fi fi diff --git a/tcwg-base/tcwg-build/Dockerfile.in b/tcwg-base/tcwg-build/Dockerfile.in index 937d1384..2af68b2c 100644 --- a/tcwg-base/tcwg-build/Dockerfile.in +++ b/tcwg-base/tcwg-build/Dockerfile.in @@ -1,18 +1,14 @@ FROM linaro/ci-#{ARCH}-tcwg-base-ubuntu:#{DISTRO} +COPY tcwg-buildslave /home-data/tcwg-buildslave +COPY tcwg-benchmark /home-data/tcwg-benchmark + RUN new-user.sh --group tcwg-infra:9000 \ - && new-user.sh --passwd "tcwg-buildslave:x:11827:9000:TCWG Buildslave::/bin/bash" \ - && new-user.sh --passwd "tcwg-benchmark:x:12326:9000:TCWG Benchmark::/bin/bash" \ + && new-user.sh --passwd "tcwg-buildslave:x:11827:9000:TCWG Buildslave::/bin/bash" --home-data /home-data \ + && new-user.sh --passwd "tcwg-benchmark:x:12326:9000:TCWG Benchmark::/bin/bash" --home-data /home-data \ + && rm -rf /home-data/ \ && 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/ \ - && 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/* - #if ARCH_amd64 || ARCH_i386 # Install wine. On amd64 arch we need to enable i386, otherwise wine # won't meet dependencies (this is the case at least for trusty and xenial). diff --git a/tcwg-base/tcwg-host/Dockerfile.in b/tcwg-base/tcwg-host/Dockerfile.in index d660245f..94d45a1e 100644 --- a/tcwg-base/tcwg-host/Dockerfile.in +++ b/tcwg-base/tcwg-host/Dockerfile.in @@ -5,11 +5,6 @@ COPY home-data/ /home-data/ RUN new-user.sh --group tcwg-infra:9000 && new-user.sh --group tcwg-users:10000 \ && while read line; do \ - new-user.sh --passwd "$line"; \ - user=$(echo "$line" | cut -d: -f 1); \ - gid=$(echo "$line" | cut -d: -f 4); \ - chown -R $user:$gid /home-data/$user/; \ - chmod -R go-rwx /home-data/$user/.ssh/ ; \ - rsync -a /home-data/$user/ /home/$user/; \ + new-user.sh --passwd "$line" --home-data /home-data; \ done Date: Wed, 6 Jun 2018 10:50:42 +0300 Subject: jenkins: update plugins Change-Id: I3daef88022311762c0530511f4ddee9d571edcef Signed-off-by: Fathi Boudra --- jessie-amd64-jenkins-master/plugins.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jessie-amd64-jenkins-master/plugins.txt b/jessie-amd64-jenkins-master/plugins.txt index a29b2f2d..97b7c570 100644 --- a/jessie-amd64-jenkins-master/plugins.txt +++ b/jessie-amd64-jenkins-master/plugins.txt @@ -23,7 +23,7 @@ email-ext:2.62 embeddable-build-status:1.9 extended-read-permission:2.0 external-monitor-job:1.7 -ghprb:1.40.0 +ghprb:1.42.0 gerrit-trigger:2.27.5 github-organization-folder:1.6 greenballs:1.15 @@ -60,7 +60,7 @@ tap:2.2.1 throttle-concurrents:2.0.1 timestamper:1.8.10 translation:1.16 -urltrigger:0.41 +urltrigger:0.43 warnings:4.67 windows-slaves:1.3.1 workflow-aggregator:2.5 -- cgit v1.2.3 From d6d118dcd94f8d086743653c43b9042fb7a6e18c Mon Sep 17 00:00:00 2001 From: Maxim Kuvyrkov Date: Wed, 6 Jun 2018 08:48:23 +0000 Subject: tcwg-build: Use user data from home-data/passwd Move passwd file to home-data/, and update tcwg-build to use it. Change-Id: Ie409103ae4e47a8f9cf393a4052ddec92509a8af --- tcwg-base/home-data/passwd | 3 +++ tcwg-base/tcwg-build/Dockerfile.in | 11 +++++++---- tcwg-base/tcwg-build/build.sh | 5 ++--- tcwg-base/tcwg-host/Dockerfile.in | 10 ++++++---- tcwg-base/tcwg-host/build.sh | 3 +-- tcwg-base/tcwg-host/passwd | 3 --- trusty-amd64-tcwg-base/trusty-amd64-tcwg-build/Dockerfile | 13 ++++++++----- trusty-arm64-tcwg-base/trusty-arm64-tcwg-build/Dockerfile | 13 ++++++++----- trusty-armhf-tcwg-base/trusty-armhf-tcwg-build/Dockerfile | 13 ++++++++----- trusty-i386-tcwg-base/trusty-i386-tcwg-build/Dockerfile | 13 ++++++++----- xenial-amd64-tcwg-base/xenial-amd64-tcwg-build/Dockerfile | 13 ++++++++----- xenial-amd64-tcwg-base/xenial-amd64-tcwg-host/Dockerfile | 12 +++++++----- xenial-arm64-tcwg-base/xenial-arm64-tcwg-build/Dockerfile | 13 ++++++++----- xenial-arm64-tcwg-base/xenial-arm64-tcwg-host/Dockerfile | 12 +++++++----- xenial-armhf-tcwg-base/xenial-armhf-tcwg-build/Dockerfile | 13 ++++++++----- xenial-i386-tcwg-base/xenial-i386-tcwg-build/Dockerfile | 13 ++++++++----- 16 files changed, 97 insertions(+), 66 deletions(-) create mode 100644 tcwg-base/home-data/passwd delete mode 100644 tcwg-base/tcwg-host/passwd diff --git a/tcwg-base/home-data/passwd b/tcwg-base/home-data/passwd new file mode 100644 index 00000000..c63d1163 --- /dev/null +++ b/tcwg-base/home-data/passwd @@ -0,0 +1,3 @@ +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 diff --git a/tcwg-base/tcwg-build/Dockerfile.in b/tcwg-base/tcwg-build/Dockerfile.in index 2af68b2c..74b0ccd3 100644 --- a/tcwg-base/tcwg-build/Dockerfile.in +++ b/tcwg-base/tcwg-build/Dockerfile.in @@ -1,11 +1,14 @@ FROM linaro/ci-#{ARCH}-tcwg-base-ubuntu:#{DISTRO} -COPY tcwg-buildslave /home-data/tcwg-buildslave -COPY tcwg-benchmark /home-data/tcwg-benchmark +COPY home-data/ /home-data/ RUN new-user.sh --group tcwg-infra:9000 \ - && new-user.sh --passwd "tcwg-buildslave:x:11827:9000:TCWG Buildslave::/bin/bash" --home-data /home-data \ - && new-user.sh --passwd "tcwg-benchmark:x:12326:9000:TCWG Benchmark::/bin/bash" --home-data /home-data \ + && while read line; do \ + if [ x"$(echo "$line" | cut -d: -f 4)" != x"9000" ]; then \ + continue; \ + fi; \ + new-user.sh --passwd "$line" --home-data /home-data; \ + done Date: Wed, 6 Jun 2018 08:49:30 +0000 Subject: tcwg-host: Keep /home-data in the final image ... to be able to re-use /home volume from previous container instance, where some entries might not exist. We plan to re-use host-home:/home volume from previous container/image version, so we need a way to initialize /home/$new_user directories. With /home-data around this is as simple as "mv /home-data/$new_user /home/$new_user". Change-Id: I416e81c05d3efea8cfdbb905863929db0d0714ec --- tcwg-base/new-user.sh | 10 +++++++--- tcwg-base/tcwg-host/Dockerfile.in | 3 +-- xenial-amd64-tcwg-base/xenial-amd64-tcwg-host/Dockerfile | 5 ++--- xenial-arm64-tcwg-base/xenial-arm64-tcwg-host/Dockerfile | 5 ++--- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/tcwg-base/new-user.sh b/tcwg-base/new-user.sh index 5f36b5f8..210d5de2 100755 --- a/tcwg-base/new-user.sh +++ b/tcwg-base/new-user.sh @@ -68,8 +68,12 @@ if [ x"$user" != x"" ]; then chmod 0440 $sudoers_file if [ x"$home_data" != x"" ]; then - chown -R $user${gid:+:$gid} /home-data/$user/; \ - chmod -R go-rwx /home-data/$user/.ssh/ ; \ - rsync -a /home-data/$user/ /home/$user/; \ + chown -R $user${gid:+:$gid} /home-data/$user/ + chmod -R go-rwx /home-data/$user/.ssh/ + rsync -a /home-data/$user/ /home/$user/ + # Make /home-data/$user a prestine copy of $user's /home to have + # access to files even when /home volume is reused from previous + # container instance. + rsync -a /home/$user/ /home-data/$user/ fi fi diff --git a/tcwg-base/tcwg-host/Dockerfile.in b/tcwg-base/tcwg-host/Dockerfile.in index 5f8e5123..81b53009 100644 --- a/tcwg-base/tcwg-host/Dockerfile.in +++ b/tcwg-base/tcwg-host/Dockerfile.in @@ -6,7 +6,6 @@ RUN new-user.sh --group tcwg-infra:9000 \ && new-user.sh --group tcwg-users:10000 \ && while read line; do \ new-user.sh --passwd "$line" --home-data /home-data; \ - done Date: Wed, 6 Jun 2018 08:56:11 +0000 Subject: tcwg-build: Remove workaround. We now create directories for mount-points in start-container-docker.sh. Change-Id: I4996616399ed87420dbd64eba36895f632f6af3f --- tcwg-base/tcwg-build/Dockerfile.in | 3 +-- trusty-amd64-tcwg-base/trusty-amd64-tcwg-build/Dockerfile | 5 ++--- trusty-arm64-tcwg-base/trusty-arm64-tcwg-build/Dockerfile | 5 ++--- trusty-armhf-tcwg-base/trusty-armhf-tcwg-build/Dockerfile | 5 ++--- trusty-i386-tcwg-base/trusty-i386-tcwg-build/Dockerfile | 5 ++--- xenial-amd64-tcwg-base/xenial-amd64-tcwg-build/Dockerfile | 5 ++--- xenial-arm64-tcwg-base/xenial-arm64-tcwg-build/Dockerfile | 5 ++--- xenial-armhf-tcwg-base/xenial-armhf-tcwg-build/Dockerfile | 5 ++--- xenial-i386-tcwg-base/xenial-i386-tcwg-build/Dockerfile | 5 ++--- 9 files changed, 17 insertions(+), 26 deletions(-) diff --git a/tcwg-base/tcwg-build/Dockerfile.in b/tcwg-base/tcwg-build/Dockerfile.in index 74b0ccd3..9444dedf 100644 --- a/tcwg-base/tcwg-build/Dockerfile.in +++ b/tcwg-base/tcwg-build/Dockerfile.in @@ -9,8 +9,7 @@ RUN new-user.sh --group tcwg-infra:9000 \ fi; \ new-user.sh --passwd "$line" --home-data /home-data; \ done Date: Thu, 7 Jun 2018 10:14:40 +0000 Subject: tcwg-base: Fix ssh login problems from bad permissions users' $HOME. SSH server refuses to use /home/user/.ssh/authorized_keys if /home/user directory is writable by "group" or "other" users. This change ensures that permissions on home files are OK. Change-Id: Icf7bf737023a359ab87138524f0ca40492583a14 --- tcwg-base/new-user.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tcwg-base/new-user.sh b/tcwg-base/new-user.sh index 210d5de2..07a1f3ec 100755 --- a/tcwg-base/new-user.sh +++ b/tcwg-base/new-user.sh @@ -69,6 +69,7 @@ if [ x"$user" != x"" ]; then if [ x"$home_data" != x"" ]; then chown -R $user${gid:+:$gid} /home-data/$user/ + chmod -R go-w /home-data/$user/ chmod -R go-rwx /home-data/$user/.ssh/ rsync -a /home-data/$user/ /home/$user/ # Make /home-data/$user a prestine copy of $user's /home to have -- cgit v1.2.3 From 936f59a8122913366a3be358193d962de5ed293a Mon Sep 17 00:00:00 2001 From: Senthil Kumaran S Date: Tue, 12 Jun 2018 15:21:50 +0530 Subject: lava-dispatcher: Install android tools by default in docker image. These docker images run without LXC and android tools should be available within the container. Change-Id: I0b9f4a5419f3518bcab04b381dca49c181025cc6 --- lava/dispatcher/production/stretch-amd64/Dockerfile | 2 +- lava/dispatcher/staging/stretch-amd64/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lava/dispatcher/production/stretch-amd64/Dockerfile b/lava/dispatcher/production/stretch-amd64/Dockerfile index 4fc9110f..a9291f5c 100644 --- a/lava/dispatcher/production/stretch-amd64/Dockerfile +++ b/lava/dispatcher/production/stretch-amd64/Dockerfile @@ -14,7 +14,7 @@ RUN echo 'locales locales/locales_to_be_generated multiselect C.UTF-8 UTF-8, en_ qemu-system-x86 qemu-system-arm qemu-user-static libguestfs-tools \ nfs-kernel-server rpcbind u-boot-tools unzip xz-utils debootstrap \ bridge-utils dfu-util img2simg emacs-nox vim gnupg2 sed expect grep wget \ - openssh-server + openssh-server adb fastboot simg2img img2simg # Add LAVA stretch-backports production repo RUN wget -qO - http://images.validation.linaro.org/production-repo/production-repo.key.asc | apt-key add - && \ diff --git a/lava/dispatcher/staging/stretch-amd64/Dockerfile b/lava/dispatcher/staging/stretch-amd64/Dockerfile index f3108f3a..970218d2 100644 --- a/lava/dispatcher/staging/stretch-amd64/Dockerfile +++ b/lava/dispatcher/staging/stretch-amd64/Dockerfile @@ -14,7 +14,7 @@ RUN echo 'locales locales/locales_to_be_generated multiselect C.UTF-8 UTF-8, en_ qemu-system-x86 qemu-system-arm qemu-user-static libguestfs-tools \ nfs-kernel-server rpcbind u-boot-tools unzip xz-utils debootstrap \ bridge-utils dfu-util img2simg emacs-nox vim gnupg2 sed expect grep wget \ - openssh-server + openssh-server adb fastboot simg2img img2simg # Add LAVA stretch-backports production repo RUN wget -qO - http://images.validation.linaro.org/production-repo/production-repo.key.asc | apt-key add - && \ -- cgit v1.2.3 From ea485a5059afdac2598402ea2e244e109f71ab8b Mon Sep 17 00:00:00 2001 From: Maxim Kuvyrkov Date: Wed, 6 Jun 2018 14:28:15 +0000 Subject: tcwg-base: Add home-data/ to avoid duplication in dependent images. Images are not re-generated on purpose. This will be committed with a subsequent change re-generate all images. Change-Id: I359eca43a961bd3468baba1bcd8d43d9b92b9b01 --- tcwg-base/Dockerfile.in | 5 +++++ tcwg-base/build.sh | 3 ++- tcwg-base/tcwg-build/Dockerfile.in | 8 ++------ tcwg-base/tcwg-build/build.sh | 4 +--- tcwg-base/tcwg-host/Dockerfile.in | 6 +----- tcwg-base/tcwg-host/build.sh | 3 +-- 6 files changed, 12 insertions(+), 17 deletions(-) diff --git a/tcwg-base/Dockerfile.in b/tcwg-base/Dockerfile.in index 6c591a6a..53d9705e 100644 --- a/tcwg-base/Dockerfile.in +++ b/tcwg-base/Dockerfile.in @@ -153,6 +153,11 @@ RUN mkdir /tmp/docker-install-qemu.$$ \ && cd && rm -rf /tmp/docker-install-qemu.$$ #endif +COPY home-data/ /home-data/ + +RUN new-user.sh --group tcwg-infra:9000 \ + && new-user.sh --group tcwg-users:10000 + # We use ssh multiplexing, which creates sockets in /tmp. Overlayfs, # which docker is using, can't host sockets, so we use a scratch mount # for /tmp. This requires that we add --rm option to "docker run" diff --git a/tcwg-base/build.sh b/tcwg-base/build.sh index 6330582b..f12ee09b 100755 --- a/tcwg-base/build.sh +++ b/tcwg-base/build.sh @@ -6,7 +6,7 @@ trap cleanup_exit INT TERM EXIT cleanup_exit() { - rm -rf new-user.sh postfix*.in + rm -rf home-data/ new-user.sh postfix*.in } export LANG=C @@ -17,6 +17,7 @@ name=$(basename ${PWD} | cut -f3- -d '-') image=linaro/ci-${arch}-${name}-ubuntu:${distro} baseimage=$(grep "^FROM" Dockerfile | head -n 1 | cut -d" " -f 2) +rsync -aL $top/tcwg-base/home-data/ ./home-data/ cp $top/tcwg-base/new-user.sh ./ cp $top/tcwg-base/postfix*.in . diff --git a/tcwg-base/tcwg-build/Dockerfile.in b/tcwg-base/tcwg-build/Dockerfile.in index 9444dedf..4f5cab9e 100644 --- a/tcwg-base/tcwg-build/Dockerfile.in +++ b/tcwg-base/tcwg-build/Dockerfile.in @@ -1,15 +1,11 @@ FROM linaro/ci-#{ARCH}-tcwg-base-ubuntu:#{DISTRO} -COPY home-data/ /home-data/ - -RUN new-user.sh --group tcwg-infra:9000 \ - && while read line; do \ +RUN while read line; do \ if [ x"$(echo "$line" | cut -d: -f 4)" != x"9000" ]; then \ continue; \ fi; \ new-user.sh --passwd "$line" --home-data /home-data; \ - done /dev/null || true diff --git a/tcwg-base/tcwg-host/Dockerfile.in b/tcwg-base/tcwg-host/Dockerfile.in index 81b53009..968098ef 100644 --- a/tcwg-base/tcwg-host/Dockerfile.in +++ b/tcwg-base/tcwg-host/Dockerfile.in @@ -1,10 +1,6 @@ FROM linaro/ci-#{ARCH}-tcwg-base-ubuntu:#{DISTRO} -COPY home-data/ /home-data/ - -RUN new-user.sh --group tcwg-infra:9000 \ - && new-user.sh --group tcwg-users:10000 \ - && while read line; do \ +RUN while read line; do \ new-user.sh --passwd "$line" --home-data /home-data; \ done Date: Wed, 6 Jun 2018 14:30:43 +0000 Subject: tcwg-base: Allow "new-user.sh --user USER" interface to create users. User data will be fetched from image's /home-data for USER. Change-Id: Ic3a2808dbad196766cb440842fee497ab269c924 --- tcwg-base/new-user.sh | 23 +++++++++++++++++------ tcwg-base/tcwg-build/Dockerfile.in | 2 +- tcwg-base/tcwg-host/Dockerfile.in | 2 +- 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/tcwg-base/new-user.sh b/tcwg-base/new-user.sh index 07a1f3ec..727982a1 100755 --- a/tcwg-base/new-user.sh +++ b/tcwg-base/new-user.sh @@ -9,7 +9,7 @@ usage () passwd_ent="" group="" -home_data="" +home_data="default" user="" verbose=false @@ -27,6 +27,17 @@ done if $verbose; then set -x; fi +if [ x"$home_data" = "default" ]; then + home_data="" + if [ -d /home-data/ ]; then + home_data="/home-data" + fi +fi + +if [ x"$passwd_ent" = x"" -a x"$home_data" != x"" -a x"$user" != x"" ]; then + passwd_ent=$(grep "^${user%%:*}:" "$home_data/passwd") +fi + if [ x"$group" != x"" ]; then gid=$(echo "$group" | cut -s -d: -f 2) group=$(echo "$group" | cut -d: -f 1) @@ -68,13 +79,13 @@ if [ x"$user" != x"" ]; then chmod 0440 $sudoers_file if [ x"$home_data" != x"" ]; then - chown -R $user${gid:+:$gid} /home-data/$user/ - chmod -R go-w /home-data/$user/ - chmod -R go-rwx /home-data/$user/.ssh/ - rsync -a /home-data/$user/ /home/$user/ + chown -R $user${gid:+:$gid} $home_data/$user/ + chmod -R go-w $home_data/$user/ + chmod -R go-rwx $home_data/$user/.ssh/ + rsync -a $home_data/$user/ /home/$user/ # Make /home-data/$user a prestine copy of $user's /home to have # access to files even when /home volume is reused from previous # container instance. - rsync -a /home/$user/ /home-data/$user/ + rsync -a /home/$user/ $home_data/$user/ fi fi diff --git a/tcwg-base/tcwg-build/Dockerfile.in b/tcwg-base/tcwg-build/Dockerfile.in index 4f5cab9e..d9a8f692 100644 --- a/tcwg-base/tcwg-build/Dockerfile.in +++ b/tcwg-base/tcwg-build/Dockerfile.in @@ -4,7 +4,7 @@ RUN while read line; do \ if [ x"$(echo "$line" | cut -d: -f 4)" != x"9000" ]; then \ continue; \ fi; \ - new-user.sh --passwd "$line" --home-data /home-data; \ + new-user.sh --passwd "$line"; \ done Date: Thu, 7 Jun 2018 08:31:21 +0000 Subject: tcwg-dev: Rework startup to use new-user.sh Change-Id: Ib2cee67f3739dc70260224cbd8565a3cfc4c4154 --- tcwg-base/new-user.sh | 14 +++++++-- tcwg-base/tcwg-dev/Dockerfile.in | 9 ++---- tcwg-base/tcwg-dev/run.sh | 25 +-------------- tcwg-base/tcwg-dev/start.sh | 66 +++++++++++++++++----------------------- 4 files changed, 44 insertions(+), 70 deletions(-) diff --git a/tcwg-base/new-user.sh b/tcwg-base/new-user.sh index 727982a1..fb7debd7 100755 --- a/tcwg-base/new-user.sh +++ b/tcwg-base/new-user.sh @@ -10,6 +10,7 @@ usage () passwd_ent="" group="" home_data="default" +update=false user="" verbose=false @@ -18,6 +19,7 @@ while [ $# -gt 0 ]; do --passwd) passwd_ent="$2" ;; --group) group="$2" ;; --home-data) home_data="$2" ;; + --update) update="$2" ;; --user) user="$2" ;; --verbose) verbose="$2"; shift ;; *) echo "ERROR: Wrong option: $1"; usage ;; @@ -43,7 +45,11 @@ if [ x"$group" != x"" ]; then group=$(echo "$group" | cut -d: -f 1) if [ x"$gid" != x"" ]; then - groupadd -g $gid $group + action="add" + if $update && getent group $group; then + action="mod" + fi + group${action} -g $gid $group fi group_opt="-g $group" @@ -68,7 +74,11 @@ if [ x"$user" != x"" ]; then shell=$(echo $passwd_ent | cut -d: -f 7) fi - useradd -m $group_opt -G kvm \ + action="add" + if $update && getent passwd $user; then + action="mod" + fi + user${action} -m $group_opt -G kvm \ ${uid:+-u $uid} \ ${comment:+-c "$comment"} \ ${shell:+-s "$shell"} \ diff --git a/tcwg-base/tcwg-dev/Dockerfile.in b/tcwg-base/tcwg-dev/Dockerfile.in index ecc23f29..e0eda9e3 100644 --- a/tcwg-base/tcwg-dev/Dockerfile.in +++ b/tcwg-base/tcwg-dev/Dockerfile.in @@ -1,8 +1,5 @@ FROM linaro/ci-#{ARCH}-tcwg-base-ubuntu:#{DISTRO} -COPY run.sh . -COPY start.sh . - RUN apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y \ software-properties-common \ @@ -40,15 +37,15 @@ RUN apt-get update \ /tmp/* \ /var/tmp/* -RUN sed -i -e '/.*AuthorizedKeysFile/ d' /etc/ssh/sshd_config \ - && echo "AuthorizedKeysFile %h/.ssh/authorized_keys.docker" >> /etc/ssh/sshd_config \ - && locale-gen en_US.UTF-8 && update-locale LANG=en_US.UTF-8 \ +RUN locale-gen en_US.UTF-8 && update-locale LANG=en_US.UTF-8 \ && apt-file update # Create directories required for X11. RUN mkdir -p /tmp/.X11-unix /tmp/.ICE-unix \ && chmod 1777 /tmp/.X11-unix /tmp/.ICE-unix +COPY run.sh start.sh / + #if ARCH_amd64 || ARCH_arm64 ENTRYPOINT ["/run.sh"] #else diff --git a/tcwg-base/tcwg-dev/run.sh b/tcwg-base/tcwg-dev/run.sh index 8029a32f..a0c9ce6b 100755 --- a/tcwg-base/tcwg-dev/run.sh +++ b/tcwg-base/tcwg-dev/run.sh @@ -7,29 +7,6 @@ if [ x"$1" = x"start.sh" ]; then exit 0 fi -if ! [ -f /etc/sudoers.d/user ]; then - passwd_ent="$1" - groupname="$2" - pubkey="$3" - - username="$(echo $passwd_ent | cut -d: -f 1)" - uid="$(echo $passwd_ent | cut -d: -f 3)" - gid="$(echo $passwd_ent | cut -d: -f 4)" - comment="$(echo $passwd_ent | cut -d: -f 5)" - home="$(echo $passwd_ent | cut -d: -f 6)" - shell="$(echo $passwd_ent | cut -d: -f 7)" - - groupadd -g "$gid" "$groupname" - useradd -m -u "$uid" -g "$groupname" -G kvm -c "$comment" -s "$shell" "$username" - - if ! [ -f /home/$username/.ssh/authorized_keys.docker ] \ - && [ x"$pubkey" != x"" ]; then - sudo -u $username mkdir -p /home/$username/.ssh/ - echo "$pubkey" | sudo -u $username tee /home/$username/.ssh/authorized_keys.docker > /dev/null - fi - - echo "$username ALL = NOPASSWD: ALL" > /etc/sudoers.d/user - chmod 440 /etc/sudoers.d/user -fi +new-user.sh --update true "$@" exec /usr/sbin/sshd -D diff --git a/tcwg-base/tcwg-dev/start.sh b/tcwg-base/tcwg-dev/start.sh index b06c8bba..9117cc72 100755 --- a/tcwg-base/tcwg-dev/start.sh +++ b/tcwg-base/tcwg-dev/start.sh @@ -5,21 +5,15 @@ set -e usage () { cat </dev/null || sss_ssh_authorizedkeys $user 2>/dev/null) -fi - -$DOCKER run --name=$name -dt -p 22 $mounts --memory=$memlimit --pids-limit=5000 $caps $image "$getent" "$group" "$pubkey" +$DOCKER run --name=$name -dt -p 22 $mounts --memory=$memlimit --pids-limit=5000 $caps $image --user $user "$@" port=$($DOCKER port $name 22 | cut -d: -f 2) set +x cat < Date: Tue, 12 Jun 2018 12:31:49 +0000 Subject: tcwg-*: Re-generate dockerfiles. Change-Id: Ibb7e338bcd22ae736a22bda617f66f08fcdfd04b --- trusty-amd64-tcwg-base/Dockerfile | 7 ++++++- trusty-amd64-tcwg-base/trusty-amd64-tcwg-build/Dockerfile | 12 ++++-------- trusty-amd64-tcwg-base/trusty-amd64-tcwg-dev/Dockerfile | 11 ++++------- trusty-arm64-tcwg-base/Dockerfile | 7 ++++++- trusty-arm64-tcwg-base/trusty-arm64-tcwg-build/Dockerfile | 12 ++++-------- trusty-arm64-tcwg-base/trusty-arm64-tcwg-dev/Dockerfile | 11 ++++------- trusty-armhf-tcwg-base/Dockerfile | 7 ++++++- trusty-armhf-tcwg-base/trusty-armhf-tcwg-build/Dockerfile | 12 ++++-------- trusty-armhf-tcwg-base/trusty-armhf-tcwg-dev/Dockerfile | 11 ++++------- trusty-i386-tcwg-base/Dockerfile | 7 ++++++- trusty-i386-tcwg-base/trusty-i386-tcwg-build/Dockerfile | 12 ++++-------- xenial-amd64-tcwg-base/Dockerfile | 7 ++++++- xenial-amd64-tcwg-base/xenial-amd64-tcwg-build/Dockerfile | 12 ++++-------- xenial-amd64-tcwg-base/xenial-amd64-tcwg-dev/Dockerfile | 11 ++++------- xenial-amd64-tcwg-base/xenial-amd64-tcwg-host/Dockerfile | 10 +++------- xenial-arm64-tcwg-base/Dockerfile | 7 ++++++- xenial-arm64-tcwg-base/xenial-arm64-tcwg-build/Dockerfile | 12 ++++-------- xenial-arm64-tcwg-base/xenial-arm64-tcwg-dev/Dockerfile | 11 ++++------- xenial-arm64-tcwg-base/xenial-arm64-tcwg-host/Dockerfile | 10 +++------- xenial-armhf-tcwg-base/Dockerfile | 7 ++++++- xenial-armhf-tcwg-base/xenial-armhf-tcwg-build/Dockerfile | 12 ++++-------- xenial-armhf-tcwg-base/xenial-armhf-tcwg-dev/Dockerfile | 11 ++++------- xenial-i386-tcwg-base/Dockerfile | 7 ++++++- xenial-i386-tcwg-base/xenial-i386-tcwg-build/Dockerfile | 12 ++++-------- xenial-i386-tcwg-base/xenial-i386-tcwg-dev/Dockerfile | 11 ++++------- 25 files changed, 114 insertions(+), 135 deletions(-) diff --git a/trusty-amd64-tcwg-base/Dockerfile b/trusty-amd64-tcwg-base/Dockerfile index 98dea6b3..3c372f3a 100644 --- a/trusty-amd64-tcwg-base/Dockerfile +++ b/trusty-amd64-tcwg-base/Dockerfile @@ -117,6 +117,11 @@ RUN mkdir /tmp/docker-install-qemu.$$ \ && make all install -j $(nproc --all) \ && cd && rm -rf /tmp/docker-install-qemu.$$ +COPY home-data/ /home-data/ + +RUN new-user.sh --group tcwg-infra:9000 \ + && new-user.sh --group tcwg-users:10000 + # We use ssh multiplexing, which creates sockets in /tmp. Overlayfs, # which docker is using, can't host sockets, so we use a scratch mount # for /tmp. This requires that we add --rm option to "docker run" @@ -126,4 +131,4 @@ VOLUME /tmp EXPOSE 22 CMD ["/usr/sbin/sshd", "-D"] -# checksum: 663ce36ec5ad703d51a25889cf722a64 +# checksum: 1028517dc84401930713b47048f71585 diff --git a/trusty-amd64-tcwg-base/trusty-amd64-tcwg-build/Dockerfile b/trusty-amd64-tcwg-base/trusty-amd64-tcwg-build/Dockerfile index 8cf7cf37..f0d30e44 100644 --- a/trusty-amd64-tcwg-base/trusty-amd64-tcwg-build/Dockerfile +++ b/trusty-amd64-tcwg-base/trusty-amd64-tcwg-build/Dockerfile @@ -1,16 +1,12 @@ # Auto generated from tcwg-base/tcwg-build/Dockerfile.in. Do not edit. FROM linaro/ci-amd64-tcwg-base-ubuntu:trusty -COPY home-data/ /home-data/ - -RUN new-user.sh --group tcwg-infra:9000 \ - && while read line; do \ +RUN while read line; do \ if [ x"$(echo "$line" | cut -d: -f 4)" != x"9000" ]; then \ continue; \ fi; \ - new-user.sh --passwd "$line" --home-data /home-data; \ - done > /etc/ssh/sshd_config \ - && locale-gen en_US.UTF-8 && update-locale LANG=en_US.UTF-8 \ +RUN locale-gen en_US.UTF-8 && update-locale LANG=en_US.UTF-8 \ && apt-file update # Create directories required for X11. RUN mkdir -p /tmp/.X11-unix /tmp/.ICE-unix \ && chmod 1777 /tmp/.X11-unix /tmp/.ICE-unix +COPY run.sh start.sh / + ENTRYPOINT ["/run.sh"] CMD ["start.sh"] -# checksum: 6ebcfe89f577b9b89996da9aace4394f +# checksum: 672122d88b9e3cc028e8cd0df5834752 diff --git a/trusty-arm64-tcwg-base/Dockerfile b/trusty-arm64-tcwg-base/Dockerfile index a0c193cd..8e32b872 100644 --- a/trusty-arm64-tcwg-base/Dockerfile +++ b/trusty-arm64-tcwg-base/Dockerfile @@ -101,6 +101,11 @@ COPY postfix-sasl_password.in /etc/postfix/sasl_password RUN chown root:root /etc/postfix/sasl_password \ && chmod 600 /etc/postfix/sasl_password +COPY home-data/ /home-data/ + +RUN new-user.sh --group tcwg-infra:9000 \ + && new-user.sh --group tcwg-users:10000 + # We use ssh multiplexing, which creates sockets in /tmp. Overlayfs, # which docker is using, can't host sockets, so we use a scratch mount # for /tmp. This requires that we add --rm option to "docker run" @@ -110,4 +115,4 @@ VOLUME /tmp EXPOSE 22 CMD ["/usr/sbin/sshd", "-D"] -# checksum: 7ee3d28795dd0a90fb7bd9c9087e30bf +# checksum: 0de1a7d60f6baef0bddff3794fd783a8 diff --git a/trusty-arm64-tcwg-base/trusty-arm64-tcwg-build/Dockerfile b/trusty-arm64-tcwg-base/trusty-arm64-tcwg-build/Dockerfile index fe6ca55b..ec0ab025 100644 --- a/trusty-arm64-tcwg-base/trusty-arm64-tcwg-build/Dockerfile +++ b/trusty-arm64-tcwg-base/trusty-arm64-tcwg-build/Dockerfile @@ -1,15 +1,11 @@ # Auto generated from tcwg-base/tcwg-build/Dockerfile.in. Do not edit. FROM linaro/ci-arm64-tcwg-base-ubuntu:trusty -COPY home-data/ /home-data/ - -RUN new-user.sh --group tcwg-infra:9000 \ - && while read line; do \ +RUN while read line; do \ if [ x"$(echo "$line" | cut -d: -f 4)" != x"9000" ]; then \ continue; \ fi; \ - new-user.sh --passwd "$line" --home-data /home-data; \ - done > /etc/ssh/sshd_config \ - && locale-gen en_US.UTF-8 && update-locale LANG=en_US.UTF-8 \ +RUN locale-gen en_US.UTF-8 && update-locale LANG=en_US.UTF-8 \ && apt-file update # Create directories required for X11. RUN mkdir -p /tmp/.X11-unix /tmp/.ICE-unix \ && chmod 1777 /tmp/.X11-unix /tmp/.ICE-unix +COPY run.sh start.sh / + ENTRYPOINT ["/run.sh"] CMD ["start.sh"] -# checksum: df2f7edfa6eb02b085cac309faf50ad3 +# checksum: 136835f5e64afb27c28164ca451962f4 diff --git a/trusty-armhf-tcwg-base/Dockerfile b/trusty-armhf-tcwg-base/Dockerfile index 63d1e6e1..dee4e7d0 100644 --- a/trusty-armhf-tcwg-base/Dockerfile +++ b/trusty-armhf-tcwg-base/Dockerfile @@ -101,6 +101,11 @@ COPY postfix-sasl_password.in /etc/postfix/sasl_password RUN chown root:root /etc/postfix/sasl_password \ && chmod 600 /etc/postfix/sasl_password +COPY home-data/ /home-data/ + +RUN new-user.sh --group tcwg-infra:9000 \ + && new-user.sh --group tcwg-users:10000 + # We use ssh multiplexing, which creates sockets in /tmp. Overlayfs, # which docker is using, can't host sockets, so we use a scratch mount # for /tmp. This requires that we add --rm option to "docker run" @@ -110,4 +115,4 @@ VOLUME /tmp EXPOSE 22 CMD ["linux32", "/usr/sbin/sshd", "-D"] -# checksum: 47776efeb9b9a4f08e738296b8011574 +# checksum: 6f3dc95eb778bd3d8a8287f3a28601ba diff --git a/trusty-armhf-tcwg-base/trusty-armhf-tcwg-build/Dockerfile b/trusty-armhf-tcwg-base/trusty-armhf-tcwg-build/Dockerfile index 3ad09aca..13aa42a6 100644 --- a/trusty-armhf-tcwg-base/trusty-armhf-tcwg-build/Dockerfile +++ b/trusty-armhf-tcwg-base/trusty-armhf-tcwg-build/Dockerfile @@ -1,15 +1,11 @@ # Auto generated from tcwg-base/tcwg-build/Dockerfile.in. Do not edit. FROM linaro/ci-armhf-tcwg-base-ubuntu:trusty -COPY home-data/ /home-data/ - -RUN new-user.sh --group tcwg-infra:9000 \ - && while read line; do \ +RUN while read line; do \ if [ x"$(echo "$line" | cut -d: -f 4)" != x"9000" ]; then \ continue; \ fi; \ - new-user.sh --passwd "$line" --home-data /home-data; \ - done > /etc/ssh/sshd_config \ - && locale-gen en_US.UTF-8 && update-locale LANG=en_US.UTF-8 \ +RUN locale-gen en_US.UTF-8 && update-locale LANG=en_US.UTF-8 \ && apt-file update # Create directories required for X11. RUN mkdir -p /tmp/.X11-unix /tmp/.ICE-unix \ && chmod 1777 /tmp/.X11-unix /tmp/.ICE-unix +COPY run.sh start.sh / + ENTRYPOINT ["linux32", "/run.sh"] CMD ["start.sh"] -# checksum: 3ebcf08c631348a6ee99ee7b0a574c23 +# checksum: 13bbddb6be801c28b19e50633ed8f6c8 diff --git a/trusty-i386-tcwg-base/Dockerfile b/trusty-i386-tcwg-base/Dockerfile index c544aa31..13b00a3c 100644 --- a/trusty-i386-tcwg-base/Dockerfile +++ b/trusty-i386-tcwg-base/Dockerfile @@ -118,6 +118,11 @@ RUN mkdir /tmp/docker-install-qemu.$$ \ && make all install -j $(nproc --all) \ && cd && rm -rf /tmp/docker-install-qemu.$$ +COPY home-data/ /home-data/ + +RUN new-user.sh --group tcwg-infra:9000 \ + && new-user.sh --group tcwg-users:10000 + # We use ssh multiplexing, which creates sockets in /tmp. Overlayfs, # which docker is using, can't host sockets, so we use a scratch mount # for /tmp. This requires that we add --rm option to "docker run" @@ -127,4 +132,4 @@ VOLUME /tmp EXPOSE 22 CMD ["linux32", "/usr/sbin/sshd", "-D"] -# checksum: 85fc2b97a1844f16773e68faa51640f1 +# checksum: 6bbf6405eba4b5fb4f754465d9c1748f diff --git a/trusty-i386-tcwg-base/trusty-i386-tcwg-build/Dockerfile b/trusty-i386-tcwg-base/trusty-i386-tcwg-build/Dockerfile index 82a990af..c5a14d34 100644 --- a/trusty-i386-tcwg-base/trusty-i386-tcwg-build/Dockerfile +++ b/trusty-i386-tcwg-base/trusty-i386-tcwg-build/Dockerfile @@ -1,16 +1,12 @@ # Auto generated from tcwg-base/tcwg-build/Dockerfile.in. Do not edit. FROM linaro/ci-i386-tcwg-base-ubuntu:trusty -COPY home-data/ /home-data/ - -RUN new-user.sh --group tcwg-infra:9000 \ - && while read line; do \ +RUN while read line; do \ if [ x"$(echo "$line" | cut -d: -f 4)" != x"9000" ]; then \ continue; \ fi; \ - new-user.sh --passwd "$line" --home-data /home-data; \ - done > /etc/ssh/sshd_config \ - && locale-gen en_US.UTF-8 && update-locale LANG=en_US.UTF-8 \ +RUN locale-gen en_US.UTF-8 && update-locale LANG=en_US.UTF-8 \ && apt-file update # Create directories required for X11. RUN mkdir -p /tmp/.X11-unix /tmp/.ICE-unix \ && chmod 1777 /tmp/.X11-unix /tmp/.ICE-unix +COPY run.sh start.sh / + ENTRYPOINT ["/run.sh"] CMD ["start.sh"] -# checksum: dcc5804aedae03114b28d305dcbc2904 +# checksum: ce97ce5f929251c1dd59473d63aa00c0 diff --git a/xenial-amd64-tcwg-base/xenial-amd64-tcwg-host/Dockerfile b/xenial-amd64-tcwg-base/xenial-amd64-tcwg-host/Dockerfile index 262f9644..2e2eaf28 100644 --- a/xenial-amd64-tcwg-base/xenial-amd64-tcwg-host/Dockerfile +++ b/xenial-amd64-tcwg-base/xenial-amd64-tcwg-host/Dockerfile @@ -1,13 +1,9 @@ # Auto generated from tcwg-base/tcwg-host/Dockerfile.in. Do not edit. FROM linaro/ci-amd64-tcwg-base-ubuntu:xenial -COPY home-data/ /home-data/ - -RUN new-user.sh --group tcwg-infra:9000 \ - && new-user.sh --group tcwg-users:10000 \ - && while read line; do \ - new-user.sh --passwd "$line" --home-data /home-data; \ +RUN while read line; do \ + new-user.sh --passwd "$line"; \ done > /etc/ssh/sshd_config \ - && locale-gen en_US.UTF-8 && update-locale LANG=en_US.UTF-8 \ +RUN locale-gen en_US.UTF-8 && update-locale LANG=en_US.UTF-8 \ && apt-file update # Create directories required for X11. RUN mkdir -p /tmp/.X11-unix /tmp/.ICE-unix \ && chmod 1777 /tmp/.X11-unix /tmp/.ICE-unix +COPY run.sh start.sh / + ENTRYPOINT ["/run.sh"] CMD ["start.sh"] -# checksum: 0e9607cbb3dd157d553ffebd26d6a411 +# checksum: af20c5a49f8dfcab4991049770e8aeaf diff --git a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-host/Dockerfile b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-host/Dockerfile index 40f1ee3f..8ea1d00c 100644 --- a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-host/Dockerfile +++ b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-host/Dockerfile @@ -1,13 +1,9 @@ # Auto generated from tcwg-base/tcwg-host/Dockerfile.in. Do not edit. FROM linaro/ci-arm64-tcwg-base-ubuntu:xenial -COPY home-data/ /home-data/ - -RUN new-user.sh --group tcwg-infra:9000 \ - && new-user.sh --group tcwg-users:10000 \ - && while read line; do \ - new-user.sh --passwd "$line" --home-data /home-data; \ +RUN while read line; do \ + new-user.sh --passwd "$line"; \ done > /etc/ssh/sshd_config \ - && locale-gen en_US.UTF-8 && update-locale LANG=en_US.UTF-8 \ +RUN locale-gen en_US.UTF-8 && update-locale LANG=en_US.UTF-8 \ && apt-file update # Create directories required for X11. RUN mkdir -p /tmp/.X11-unix /tmp/.ICE-unix \ && chmod 1777 /tmp/.X11-unix /tmp/.ICE-unix +COPY run.sh start.sh / + ENTRYPOINT ["linux32", "/run.sh"] CMD ["start.sh"] -# checksum: ece1982cfb0a9675f6cb4af314a31779 +# checksum: 86ef26614d9556c57c42136f4cf5b87f diff --git a/xenial-i386-tcwg-base/Dockerfile b/xenial-i386-tcwg-base/Dockerfile index 6326e08d..5188aa3a 100644 --- a/xenial-i386-tcwg-base/Dockerfile +++ b/xenial-i386-tcwg-base/Dockerfile @@ -118,6 +118,11 @@ RUN mkdir /tmp/docker-install-qemu.$$ \ && make all install -j $(nproc --all) \ && cd && rm -rf /tmp/docker-install-qemu.$$ +COPY home-data/ /home-data/ + +RUN new-user.sh --group tcwg-infra:9000 \ + && new-user.sh --group tcwg-users:10000 + # We use ssh multiplexing, which creates sockets in /tmp. Overlayfs, # which docker is using, can't host sockets, so we use a scratch mount # for /tmp. This requires that we add --rm option to "docker run" @@ -127,4 +132,4 @@ VOLUME /tmp EXPOSE 22 CMD ["linux32", "/usr/sbin/sshd", "-D"] -# checksum: c5b2ed5703c19113f8da87c5912480f3 +# checksum: ba4a5e00f5a4698fad526fe3f538b798 diff --git a/xenial-i386-tcwg-base/xenial-i386-tcwg-build/Dockerfile b/xenial-i386-tcwg-base/xenial-i386-tcwg-build/Dockerfile index a7126f0e..101688c0 100644 --- a/xenial-i386-tcwg-base/xenial-i386-tcwg-build/Dockerfile +++ b/xenial-i386-tcwg-base/xenial-i386-tcwg-build/Dockerfile @@ -1,16 +1,12 @@ # Auto generated from tcwg-base/tcwg-build/Dockerfile.in. Do not edit. FROM linaro/ci-i386-tcwg-base-ubuntu:xenial -COPY home-data/ /home-data/ - -RUN new-user.sh --group tcwg-infra:9000 \ - && while read line; do \ +RUN while read line; do \ if [ x"$(echo "$line" | cut -d: -f 4)" != x"9000" ]; then \ continue; \ fi; \ - new-user.sh --passwd "$line" --home-data /home-data; \ - done > /etc/ssh/sshd_config \ - && locale-gen en_US.UTF-8 && update-locale LANG=en_US.UTF-8 \ +RUN locale-gen en_US.UTF-8 && update-locale LANG=en_US.UTF-8 \ && apt-file update # Create directories required for X11. RUN mkdir -p /tmp/.X11-unix /tmp/.ICE-unix \ && chmod 1777 /tmp/.X11-unix /tmp/.ICE-unix +COPY run.sh start.sh / + ENTRYPOINT ["linux32", "/run.sh"] CMD ["start.sh"] -# checksum: d4713d03be137a74e7d172adec5fd118 +# checksum: f4c0c13056527d2caf20e2e2682098c0 -- cgit v1.2.3 From d6226acc15d10d048341ee622eff309b76203f55 Mon Sep 17 00:00:00 2001 From: Maxim Kuvyrkov Date: Tue, 12 Jun 2018 12:55:27 +0000 Subject: tcwg-base: Fix typo in new-user.sh Change-Id: I058df6bac6324552d17f481ac8c761ad2115fc5b --- tcwg-base/new-user.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tcwg-base/new-user.sh b/tcwg-base/new-user.sh index fb7debd7..bcd205bc 100755 --- a/tcwg-base/new-user.sh +++ b/tcwg-base/new-user.sh @@ -29,7 +29,7 @@ done if $verbose; then set -x; fi -if [ x"$home_data" = "default" ]; then +if [ x"$home_data" = x"default" ]; then home_data="" if [ -d /home-data/ ]; then home_data="/home-data" -- cgit v1.2.3 From 82e56318b66c4e7b8e713b5f124d8edeab060df3 Mon Sep 17 00:00:00 2001 From: Christophe Lyon Date: Fri, 8 Jun 2018 14:16:48 +0000 Subject: README: Describe how to generate TCWG images. Change-Id: I5b67bfc315bea0e693308bcd9aa1f990b2cbd142 --- README | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/README b/README index e1e5a6b7..e43ded4f 100644 --- a/README +++ b/README @@ -9,6 +9,21 @@ Contributing If you want to contribute changes, you can send Gerrit merge requests at https://review.linaro.org/#/q/project:ci/dockerfiles +TCWG images +----------- + +Docker images used by the TCWG team are generated slightly differently +from the other ones. The source files describing the images contents +are stored under tcwg-base, in nested directories where nesting shows +images dependencies. For instance, tcwg-build type of images depend on +tcwg-base. + +If you want to (re)build locally a TCWG image after updating its +Dockerfile.in or its build.sh, go to the directory whose name fully +describes the image. For instance +xenial-arm64-tcwg-base/xenial-arm64-tcwg-build, and run ./build.sh +from there to rebuild the xenial-arm64-tcwg-build image. + Maintainer(s) ------------- -- cgit v1.2.3 From 4ba35a39be2502794ded7c8398c3c8412260df34 Mon Sep 17 00:00:00 2001 From: Maxim Kuvyrkov Date: Tue, 12 Jun 2018 14:57:05 +0000 Subject: tcwg-host: Move addition of users to container init ... to allow group-based host containers. E.g., allow only LLVM devs to LLVM buildbots. Change-Id: Ie929e50f919132bd27ca356ca6b8d86c8d0f6b95 --- tcwg-base/tcwg-host/Dockerfile.in | 11 +++++++---- tcwg-base/tcwg-host/build.sh | 4 ++-- tcwg-base/tcwg-host/run.sh | 22 ++++++++++++++++++++++ tcwg-base/tcwg-host/start.sh | 3 ++- .../xenial-amd64-tcwg-host/Dockerfile | 9 ++++----- .../xenial-arm64-tcwg-host/Dockerfile | 9 ++++----- 6 files changed, 41 insertions(+), 17 deletions(-) create mode 100755 tcwg-base/tcwg-host/run.sh diff --git a/tcwg-base/tcwg-host/Dockerfile.in b/tcwg-base/tcwg-host/Dockerfile.in index 4c001308..3c6de198 100644 --- a/tcwg-base/tcwg-host/Dockerfile.in +++ b/tcwg-base/tcwg-host/Dockerfile.in @@ -1,7 +1,10 @@ FROM linaro/ci-#{ARCH}-tcwg-base-ubuntu:#{DISTRO} -RUN while read line; do \ - new-user.sh --passwd "$line"; \ - done Date: Tue, 12 Jun 2018 14:57:41 +0000 Subject: tcwg-base: Minor fixes to new-user.sh Change-Id: I096a6c1e3b72aec72ee531da92b30d035df968ee --- tcwg-base/new-user.sh | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/tcwg-base/new-user.sh b/tcwg-base/new-user.sh index bcd205bc..30ff8ae3 100755 --- a/tcwg-base/new-user.sh +++ b/tcwg-base/new-user.sh @@ -21,7 +21,7 @@ while [ $# -gt 0 ]; do --home-data) home_data="$2" ;; --update) update="$2" ;; --user) user="$2" ;; - --verbose) verbose="$2"; shift ;; + --verbose) verbose="$2" ;; *) echo "ERROR: Wrong option: $1"; usage ;; esac shift 2 @@ -46,7 +46,7 @@ if [ x"$group" != x"" ]; then if [ x"$gid" != x"" ]; then action="add" - if $update && getent group $group; then + if $update && getent group $group >/dev/null; then action="mod" fi group${action} -g $gid $group @@ -54,7 +54,7 @@ if [ x"$group" != x"" ]; then group_opt="-g $group" elif [ x"$passwd_ent" != x"" ]; then - gid=$(echo $passwd_ent | cut -d: -f 4) + gid=$(echo "$passwd_ent" | cut -d: -f 4) group_opt="-g $gid" else group_opt="" @@ -68,17 +68,22 @@ fi uid=$(echo "$user" | cut -s -d: -f 2) user=$(echo "$user" | cut -d: -f 1) +if [ x"$uid" = x"" -a x"$passwd_ent" != x"" ]; then + uid=$(echo "$passwd_ent" | cut -d: -f 3) +fi + if [ x"$user" != x"" ]; then if [ x"$passwd_ent" != x"" ]; then - comment=$(echo $passwd_ent | cut -d: -f 5) - shell=$(echo $passwd_ent | cut -d: -f 7) + comment=$(echo "$passwd_ent" | cut -d: -f 5) + shell=$(echo "$passwd_ent" | cut -d: -f 7) fi action="add" - if $update && getent passwd $user; then + if $update && getent passwd $user >/dev/null; then action="mod" fi - user${action} -m $group_opt -G kvm \ + user${action} $group_opt -G kvm \ + -m -d /home/$user \ ${uid:+-u $uid} \ ${comment:+-c "$comment"} \ ${shell:+-s "$shell"} \ -- cgit v1.2.3 From 1b62e380998d6fedf758d1aa8fa14d8c99dc161b Mon Sep 17 00:00:00 2001 From: Maxim Kuvyrkov Date: Tue, 12 Jun 2018 15:31:40 +0000 Subject: tcwg-dev: Improve start-up script Change-Id: Ic0e371817af06d69190d41df7f2daae8496a8b94 --- tcwg-base/tcwg-dev/start.sh | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/tcwg-base/tcwg-dev/start.sh b/tcwg-base/tcwg-dev/start.sh index 9117cc72..86df7314 100755 --- a/tcwg-base/tcwg-dev/start.sh +++ b/tcwg-base/tcwg-dev/start.sh @@ -70,11 +70,22 @@ fi mounts="" -home_top="/home" +docker_host=false if [ -f "/.dockerenv" ] && mount | grep -q "/run/docker.sock "; then + docker_host=true +fi + +home_top="/home" +if $docker_host; then # If inside "host" container (with proxied docker and /home from host-home # volume), convert paths to refer to volume's path on bare-metal. - home_top=/var/lib/docker/volumes/host-home/_data/ + home_top=/var/lib/docker/volumes/host-home/_data +fi + +if $docker_host || [ -d "$home_top/tcwg-buildslave" ]; then + # Bind-mount /home/tcwg-buildslave read-only to get access to + # /home/tcwg-buildslave/snapshots-ref/ + mounts="$mounts -v $home_top/tcwg-buildslave:/home/tcwg-buildslave:ro" fi case "$home" in @@ -88,20 +99,13 @@ case "$home" in ;; esac - -if [ -d "$home_top/tcwg-buildslave" ]; then - # Bind-mount /home/tcwg-buildslave read-only to get access to - # /home/tcwg-buildslave/snapshots-ref/ - mounts="$mounts -v $home_top/tcwg-buildslave:/home/tcwg-buildslave:ro" -fi - # Use at most half of all available RAM. memlimit=$(($(free -g | awk '/^Mem/ { print $2 }') / 2))G # IPC_LOCK is required for some implementations of ssh-agent (e.g., MATE's). # SYS_PTRACE is required for debugger work. caps="--cap-add=IPC_LOCK --cap-add=SYS_PTRACE" -$DOCKER run --name=$name -dt -p 22 $mounts --memory=$memlimit --pids-limit=5000 $caps $image --user $user "$@" +$DOCKER run --name=$name --hostname=$(basename $(hostname) -dckr)-dev -dt -p 22 $mounts --memory=$memlimit --pids-limit=5000 $caps $image --user $user "$@" port=$($DOCKER port $name 22 | cut -d: -f 2) -- cgit v1.2.3 From 5eb3bdcc8c6c968ddefd71a82bded2166bb10e6a Mon Sep 17 00:00:00 2001 From: Benjamin Copeland Date: Tue, 12 Jun 2018 16:34:23 +0100 Subject: Jenkins: Update to latest LTS Change-Id: Id527d5f74477a8e2e6b4946b869b81d6633a4675 --- jessie-amd64-jenkins-master/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jessie-amd64-jenkins-master/Dockerfile b/jessie-amd64-jenkins-master/Dockerfile index dd51062e..90137480 100644 --- a/jessie-amd64-jenkins-master/Dockerfile +++ b/jessie-amd64-jenkins-master/Dockerfile @@ -1,4 +1,4 @@ -FROM jenkins/jenkins:2.107.3 +FROM jenkins/jenkins:2.121.1 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" -- cgit v1.2.3 From b0517a102acfc951f043b1261f3bcefc8feb22b1 Mon Sep 17 00:00:00 2001 From: Maxim Kuvyrkov Date: Tue, 12 Jun 2018 15:42:39 +0000 Subject: tcwg-dev: Restart container if crashed. Change-Id: I5fef837707b3fde1bf40eb277a75397b2dae4815 --- tcwg-base/tcwg-dev/start.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tcwg-base/tcwg-dev/start.sh b/tcwg-base/tcwg-dev/start.sh index 86df7314..ea527b95 100755 --- a/tcwg-base/tcwg-dev/start.sh +++ b/tcwg-base/tcwg-dev/start.sh @@ -105,7 +105,7 @@ memlimit=$(($(free -g | awk '/^Mem/ { print $2 }') / 2))G # SYS_PTRACE is required for debugger work. caps="--cap-add=IPC_LOCK --cap-add=SYS_PTRACE" -$DOCKER run --name=$name --hostname=$(basename $(hostname) -dckr)-dev -dt -p 22 $mounts --memory=$memlimit --pids-limit=5000 $caps $image --user $user "$@" +$DOCKER run --name=$name --hostname=$(basename $(hostname) -dckr)-dev --restart=unless-stopped -dt -p 22 $mounts --memory=$memlimit --pids-limit=5000 $caps $image --user $user "$@" port=$($DOCKER port $name 22 | cut -d: -f 2) -- cgit v1.2.3 From 6984268e7ddbe5a98c13e157d55a11f71b805425 Mon Sep 17 00:00:00 2001 From: Maxim Kuvyrkov Date: Wed, 13 Jun 2018 08:01:23 +0000 Subject: tcwg-base: Touch to re-trigger builds Change-Id: If963e30f7ef5b084f8ecd0da20fc0a00ff50c546 --- tcwg-base/gerrit-branches | 1 + 1 file changed, 1 insertion(+) diff --git a/tcwg-base/gerrit-branches b/tcwg-base/gerrit-branches index ad45dd4e..12600c6c 100644 --- a/tcwg-base/gerrit-branches +++ b/tcwg-base/gerrit-branches @@ -1,3 +1,4 @@ master tcwg-tested tcwg-staging + -- cgit v1.2.3 From 7fb18316fb949a3b6f6a36cd7b3fb84fe38c5724 Mon Sep 17 00:00:00 2001 From: Maxim Kuvyrkov Date: Wed, 13 Jun 2018 08:23:20 +0000 Subject: tcwg-base: Move COPY of new-user.sh after qemu build ... to save build time when changing new-user.sh script. Change-Id: I1ce110494227c217241857aa590784e4f58dc2d9 --- tcwg-base/Dockerfile.in | 2 +- trusty-amd64-tcwg-base/Dockerfile | 4 ++-- trusty-arm64-tcwg-base/Dockerfile | 4 ++-- trusty-armhf-tcwg-base/Dockerfile | 4 ++-- trusty-i386-tcwg-base/Dockerfile | 4 ++-- xenial-amd64-tcwg-base/Dockerfile | 4 ++-- xenial-arm64-tcwg-base/Dockerfile | 4 ++-- xenial-armhf-tcwg-base/Dockerfile | 4 ++-- xenial-i386-tcwg-base/Dockerfile | 4 ++-- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/tcwg-base/Dockerfile.in b/tcwg-base/Dockerfile.in index 53d9705e..e8f45b5e 100644 --- a/tcwg-base/Dockerfile.in +++ b/tcwg-base/Dockerfile.in @@ -135,7 +135,6 @@ RUN install -D -p -m0755 /usr/share/doc/git/contrib/workdir/git-new-workdir /usr && echo "MaxStartups 256" >> /etc/ssh/sshd_config \ && echo "MaxSessions 256" >> /etc/ssh/sshd_config -COPY new-user.sh /usr/local/bin/ COPY postfix-main.cf.in /etc/postfix/main.cf COPY postfix-sasl_password.in /etc/postfix/sasl_password @@ -154,6 +153,7 @@ RUN mkdir /tmp/docker-install-qemu.$$ \ #endif COPY home-data/ /home-data/ +COPY new-user.sh /usr/local/bin/ RUN new-user.sh --group tcwg-infra:9000 \ && new-user.sh --group tcwg-users:10000 diff --git a/trusty-amd64-tcwg-base/Dockerfile b/trusty-amd64-tcwg-base/Dockerfile index 3c372f3a..f3065559 100644 --- a/trusty-amd64-tcwg-base/Dockerfile +++ b/trusty-amd64-tcwg-base/Dockerfile @@ -101,7 +101,6 @@ RUN install -D -p -m0755 /usr/share/doc/git/contrib/workdir/git-new-workdir /usr && echo "MaxStartups 256" >> /etc/ssh/sshd_config \ && echo "MaxSessions 256" >> /etc/ssh/sshd_config -COPY new-user.sh /usr/local/bin/ COPY postfix-main.cf.in /etc/postfix/main.cf COPY postfix-sasl_password.in /etc/postfix/sasl_password @@ -118,6 +117,7 @@ RUN mkdir /tmp/docker-install-qemu.$$ \ && cd && rm -rf /tmp/docker-install-qemu.$$ COPY home-data/ /home-data/ +COPY new-user.sh /usr/local/bin/ RUN new-user.sh --group tcwg-infra:9000 \ && new-user.sh --group tcwg-users:10000 @@ -131,4 +131,4 @@ VOLUME /tmp EXPOSE 22 CMD ["/usr/sbin/sshd", "-D"] -# checksum: 1028517dc84401930713b47048f71585 +# checksum: 51b9b026132ce81af8734caef644e682 diff --git a/trusty-arm64-tcwg-base/Dockerfile b/trusty-arm64-tcwg-base/Dockerfile index 8e32b872..5ae7e267 100644 --- a/trusty-arm64-tcwg-base/Dockerfile +++ b/trusty-arm64-tcwg-base/Dockerfile @@ -94,7 +94,6 @@ RUN install -D -p -m0755 /usr/share/doc/git/contrib/workdir/git-new-workdir /usr && echo "MaxStartups 256" >> /etc/ssh/sshd_config \ && echo "MaxSessions 256" >> /etc/ssh/sshd_config -COPY new-user.sh /usr/local/bin/ COPY postfix-main.cf.in /etc/postfix/main.cf COPY postfix-sasl_password.in /etc/postfix/sasl_password @@ -102,6 +101,7 @@ RUN chown root:root /etc/postfix/sasl_password \ && chmod 600 /etc/postfix/sasl_password COPY home-data/ /home-data/ +COPY new-user.sh /usr/local/bin/ RUN new-user.sh --group tcwg-infra:9000 \ && new-user.sh --group tcwg-users:10000 @@ -115,4 +115,4 @@ VOLUME /tmp EXPOSE 22 CMD ["/usr/sbin/sshd", "-D"] -# checksum: 0de1a7d60f6baef0bddff3794fd783a8 +# checksum: 51f578cd749295240de5d7aaeecb86da diff --git a/trusty-armhf-tcwg-base/Dockerfile b/trusty-armhf-tcwg-base/Dockerfile index dee4e7d0..963a8761 100644 --- a/trusty-armhf-tcwg-base/Dockerfile +++ b/trusty-armhf-tcwg-base/Dockerfile @@ -94,7 +94,6 @@ RUN install -D -p -m0755 /usr/share/doc/git/contrib/workdir/git-new-workdir /usr && echo "MaxStartups 256" >> /etc/ssh/sshd_config \ && echo "MaxSessions 256" >> /etc/ssh/sshd_config -COPY new-user.sh /usr/local/bin/ COPY postfix-main.cf.in /etc/postfix/main.cf COPY postfix-sasl_password.in /etc/postfix/sasl_password @@ -102,6 +101,7 @@ RUN chown root:root /etc/postfix/sasl_password \ && chmod 600 /etc/postfix/sasl_password COPY home-data/ /home-data/ +COPY new-user.sh /usr/local/bin/ RUN new-user.sh --group tcwg-infra:9000 \ && new-user.sh --group tcwg-users:10000 @@ -115,4 +115,4 @@ VOLUME /tmp EXPOSE 22 CMD ["linux32", "/usr/sbin/sshd", "-D"] -# checksum: 6f3dc95eb778bd3d8a8287f3a28601ba +# checksum: bf86e87841037fc7383bd97d12a60bd2 diff --git a/trusty-i386-tcwg-base/Dockerfile b/trusty-i386-tcwg-base/Dockerfile index 13b00a3c..bbccbc03 100644 --- a/trusty-i386-tcwg-base/Dockerfile +++ b/trusty-i386-tcwg-base/Dockerfile @@ -102,7 +102,6 @@ RUN install -D -p -m0755 /usr/share/doc/git/contrib/workdir/git-new-workdir /usr && echo "MaxStartups 256" >> /etc/ssh/sshd_config \ && echo "MaxSessions 256" >> /etc/ssh/sshd_config -COPY new-user.sh /usr/local/bin/ COPY postfix-main.cf.in /etc/postfix/main.cf COPY postfix-sasl_password.in /etc/postfix/sasl_password @@ -119,6 +118,7 @@ RUN mkdir /tmp/docker-install-qemu.$$ \ && cd && rm -rf /tmp/docker-install-qemu.$$ COPY home-data/ /home-data/ +COPY new-user.sh /usr/local/bin/ RUN new-user.sh --group tcwg-infra:9000 \ && new-user.sh --group tcwg-users:10000 @@ -132,4 +132,4 @@ VOLUME /tmp EXPOSE 22 CMD ["linux32", "/usr/sbin/sshd", "-D"] -# checksum: 6bbf6405eba4b5fb4f754465d9c1748f +# checksum: ce92a6b3d31109f11241b252ed281330 diff --git a/xenial-amd64-tcwg-base/Dockerfile b/xenial-amd64-tcwg-base/Dockerfile index 060f0e58..6c2b5c93 100644 --- a/xenial-amd64-tcwg-base/Dockerfile +++ b/xenial-amd64-tcwg-base/Dockerfile @@ -100,7 +100,6 @@ RUN install -D -p -m0755 /usr/share/doc/git/contrib/workdir/git-new-workdir /usr && echo "MaxStartups 256" >> /etc/ssh/sshd_config \ && echo "MaxSessions 256" >> /etc/ssh/sshd_config -COPY new-user.sh /usr/local/bin/ COPY postfix-main.cf.in /etc/postfix/main.cf COPY postfix-sasl_password.in /etc/postfix/sasl_password @@ -117,6 +116,7 @@ RUN mkdir /tmp/docker-install-qemu.$$ \ && cd && rm -rf /tmp/docker-install-qemu.$$ COPY home-data/ /home-data/ +COPY new-user.sh /usr/local/bin/ RUN new-user.sh --group tcwg-infra:9000 \ && new-user.sh --group tcwg-users:10000 @@ -130,4 +130,4 @@ VOLUME /tmp EXPOSE 22 CMD ["/usr/sbin/sshd", "-D"] -# checksum: e837e40e5e63b791c76cf9d24d64ea9e +# checksum: f99f04628381e8bbb86632792280e0d6 diff --git a/xenial-arm64-tcwg-base/Dockerfile b/xenial-arm64-tcwg-base/Dockerfile index 48adc518..d7cf7438 100644 --- a/xenial-arm64-tcwg-base/Dockerfile +++ b/xenial-arm64-tcwg-base/Dockerfile @@ -95,7 +95,6 @@ RUN install -D -p -m0755 /usr/share/doc/git/contrib/workdir/git-new-workdir /usr && echo "MaxStartups 256" >> /etc/ssh/sshd_config \ && echo "MaxSessions 256" >> /etc/ssh/sshd_config -COPY new-user.sh /usr/local/bin/ COPY postfix-main.cf.in /etc/postfix/main.cf COPY postfix-sasl_password.in /etc/postfix/sasl_password @@ -103,6 +102,7 @@ RUN chown root:root /etc/postfix/sasl_password \ && chmod 600 /etc/postfix/sasl_password COPY home-data/ /home-data/ +COPY new-user.sh /usr/local/bin/ RUN new-user.sh --group tcwg-infra:9000 \ && new-user.sh --group tcwg-users:10000 @@ -116,4 +116,4 @@ VOLUME /tmp EXPOSE 22 CMD ["/usr/sbin/sshd", "-D"] -# checksum: 16b65bf051cd588d06ed7e83b16040c4 +# checksum: b109600fdea01f605fd1d5c816b3575f diff --git a/xenial-armhf-tcwg-base/Dockerfile b/xenial-armhf-tcwg-base/Dockerfile index 21856d38..1e3f3080 100644 --- a/xenial-armhf-tcwg-base/Dockerfile +++ b/xenial-armhf-tcwg-base/Dockerfile @@ -95,7 +95,6 @@ RUN install -D -p -m0755 /usr/share/doc/git/contrib/workdir/git-new-workdir /usr && echo "MaxStartups 256" >> /etc/ssh/sshd_config \ && echo "MaxSessions 256" >> /etc/ssh/sshd_config -COPY new-user.sh /usr/local/bin/ COPY postfix-main.cf.in /etc/postfix/main.cf COPY postfix-sasl_password.in /etc/postfix/sasl_password @@ -103,6 +102,7 @@ RUN chown root:root /etc/postfix/sasl_password \ && chmod 600 /etc/postfix/sasl_password COPY home-data/ /home-data/ +COPY new-user.sh /usr/local/bin/ RUN new-user.sh --group tcwg-infra:9000 \ && new-user.sh --group tcwg-users:10000 @@ -116,4 +116,4 @@ VOLUME /tmp EXPOSE 22 CMD ["linux32", "/usr/sbin/sshd", "-D"] -# checksum: 716d3271c635801055ab84e8eeed3770 +# checksum: b737d6090ade5f6755c2e24c19f78605 diff --git a/xenial-i386-tcwg-base/Dockerfile b/xenial-i386-tcwg-base/Dockerfile index 5188aa3a..ab8cb9a8 100644 --- a/xenial-i386-tcwg-base/Dockerfile +++ b/xenial-i386-tcwg-base/Dockerfile @@ -102,7 +102,6 @@ RUN install -D -p -m0755 /usr/share/doc/git/contrib/workdir/git-new-workdir /usr && echo "MaxStartups 256" >> /etc/ssh/sshd_config \ && echo "MaxSessions 256" >> /etc/ssh/sshd_config -COPY new-user.sh /usr/local/bin/ COPY postfix-main.cf.in /etc/postfix/main.cf COPY postfix-sasl_password.in /etc/postfix/sasl_password @@ -119,6 +118,7 @@ RUN mkdir /tmp/docker-install-qemu.$$ \ && cd && rm -rf /tmp/docker-install-qemu.$$ COPY home-data/ /home-data/ +COPY new-user.sh /usr/local/bin/ RUN new-user.sh --group tcwg-infra:9000 \ && new-user.sh --group tcwg-users:10000 @@ -132,4 +132,4 @@ VOLUME /tmp EXPOSE 22 CMD ["linux32", "/usr/sbin/sshd", "-D"] -# checksum: ba4a5e00f5a4698fad526fe3f538b798 +# checksum: 6dc46e7f9236a3ad8075f90890522fe9 -- cgit v1.2.3 From 57ef6c6252d4f0703d71d7fb3b2af7edcf3fd621 Mon Sep 17 00:00:00 2001 From: Maxim Kuvyrkov Date: Wed, 13 Jun 2018 08:34:10 +0000 Subject: tcwg-base: Support auxiliary groups in new-user.sh. Change-Id: I8c994d79fac6df3f7930cc2404465ea9342859f6 --- tcwg-base/Dockerfile.in | 6 ++++-- tcwg-base/home-data/group | 3 +++ tcwg-base/new-user.sh | 12 +++++++++++- trusty-amd64-tcwg-base/Dockerfile | 8 +++++--- trusty-arm64-tcwg-base/Dockerfile | 8 +++++--- trusty-armhf-tcwg-base/Dockerfile | 8 +++++--- trusty-i386-tcwg-base/Dockerfile | 8 +++++--- xenial-amd64-tcwg-base/Dockerfile | 8 +++++--- xenial-arm64-tcwg-base/Dockerfile | 8 +++++--- xenial-armhf-tcwg-base/Dockerfile | 8 +++++--- xenial-i386-tcwg-base/Dockerfile | 8 +++++--- 11 files changed, 58 insertions(+), 27 deletions(-) create mode 100644 tcwg-base/home-data/group diff --git a/tcwg-base/Dockerfile.in b/tcwg-base/Dockerfile.in index e8f45b5e..01e0a0b1 100644 --- a/tcwg-base/Dockerfile.in +++ b/tcwg-base/Dockerfile.in @@ -155,8 +155,10 @@ RUN mkdir /tmp/docker-install-qemu.$$ \ COPY home-data/ /home-data/ COPY new-user.sh /usr/local/bin/ -RUN new-user.sh --group tcwg-infra:9000 \ - && new-user.sh --group tcwg-users:10000 +RUN \ + while read line; do \ + new-user.sh --group $(echo "$line" | cut -d: -f 1,3); \ + done /dev/null; then action="mod" fi - user${action} $group_opt -G kvm \ + user${action} $group_opt -G $aux_groups \ -m -d /home/$user \ ${uid:+-u $uid} \ ${comment:+-c "$comment"} \ diff --git a/trusty-amd64-tcwg-base/Dockerfile b/trusty-amd64-tcwg-base/Dockerfile index f3065559..b9ca4bc8 100644 --- a/trusty-amd64-tcwg-base/Dockerfile +++ b/trusty-amd64-tcwg-base/Dockerfile @@ -119,8 +119,10 @@ RUN mkdir /tmp/docker-install-qemu.$$ \ COPY home-data/ /home-data/ COPY new-user.sh /usr/local/bin/ -RUN new-user.sh --group tcwg-infra:9000 \ - && new-user.sh --group tcwg-users:10000 +RUN \ + while read line; do \ + new-user.sh --group $(echo "$line" | cut -d: -f 1,3); \ + done Date: Wed, 13 Jun 2018 08:48:01 +0000 Subject: tcwg-host: Support per-group access. Change-Id: I6336c3a733c8f5347d3c9e09e5439f8f0d6f81d2 --- tcwg-base/tcwg-host/run.sh | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/tcwg-base/tcwg-host/run.sh b/tcwg-base/tcwg-host/run.sh index 7149a3b9..ccafd4e0 100755 --- a/tcwg-base/tcwg-host/run.sh +++ b/tcwg-base/tcwg-host/run.sh @@ -7,16 +7,16 @@ if [ x"$1" = x"start.sh" ]; then exit 0 fi -case "$1" in - "all") - while read line; do - new-user.sh --update true --passwd "$line" - done Date: Wed, 13 Jun 2018 12:07:18 +0000 Subject: tcwg-base: Add .ssh/config entries for tcwg-d05-01 and tcwg-thx1-01. Change-Id: I9c0a8b1765dfd78297cb7e33c628e7ec7809fb3a --- tcwg-base/home-data/tcwg-buildslave/.ssh/config | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/tcwg-base/home-data/tcwg-buildslave/.ssh/config b/tcwg-base/home-data/tcwg-buildslave/.ssh/config index 47e5dbf0..62aed114 100644 --- a/tcwg-base/home-data/tcwg-buildslave/.ssh/config +++ b/tcwg-base/home-data/tcwg-buildslave/.ssh/config @@ -24,7 +24,7 @@ Host *.aus-colo Host *.lab ProxyCommand ssh lab.validation.linaro.org nc -q0 $(basename %h .lab) %p -Host *.tcwglab *.aus-colo *.lab +Host *.tcwglab *.aus-colo *.lab localhost tcwg-d05-01 tcwg-thx1-01 # Enable automatic multiplexing. ControlMaster auto # Soften up potential problems with killing master connection by using @@ -57,4 +57,13 @@ Host localhost.tcwglab Host git.linaro.org dev-private-git.linaro.org User git + +Host tcwg-d05-01 tcwg-thx1-01 + Port 2222 + +Host tcwg-d05-01 + Hostname 147.75.106.138 + +Host tcwg-thx1-01 + Hostname 147.75.77.198 # === END: TCWG SSH configuration === -- cgit v1.2.3 From e5f16695fad0f519938cd421f844b2f40f40ff4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20Benn=C3=A9e?= Date: Wed, 13 Jun 2018 15:25:38 +0100 Subject: tcgw-base: add credentials and bootstrap script MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I362e7c25e51ac93eb886cbb8774075420cccb35e Signed-off-by: Alex Bennée --- .../home-data/alex.bennee/.ssh/authorized_keys | 3 + tcwg-base/home-data/alex.bennee/bootstrap.sh | 78 ++++++++++++++++++++++ 2 files changed, 81 insertions(+) create mode 100644 tcwg-base/home-data/alex.bennee/.ssh/authorized_keys create mode 100644 tcwg-base/home-data/alex.bennee/bootstrap.sh diff --git a/tcwg-base/home-data/alex.bennee/.ssh/authorized_keys b/tcwg-base/home-data/alex.bennee/.ssh/authorized_keys new file mode 100644 index 00000000..f51ceb2e --- /dev/null +++ b/tcwg-base/home-data/alex.bennee/.ssh/authorized_keys @@ -0,0 +1,3 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCyVywkk+VvhgT/FIeeW0RMv2L+VjklgDZawWqwnRKibbgXO7cNx9gAM+vLZd1lwUsAs6b3pecyJKuPGPLTQwQ/8RcWE0/rIqLyaqRYJGjlPYLtPgRm12d4eEvXDK7hQs/KGmc+rVQCk4cu9SBvdqJtvPuE68o2xV5SEKv0JUwSnXxQhScqa3/Zf+bKiVxWxBfaOfsZtdb6qECG4hhL5w9Z9Skviz5Hw7RWDqnXrKeCAiCCpZRhE10++6NhHpdLQtFWbGhyJ9Xmuq6OaDWofHkC2YfUSQ/VL8dKQoo1oltnH4FHlDmtvfqHzslJMpwXu0iHREu4T93tnZcpi89xcw6P alex@zen +ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEArnlSBm0os7ulw7YhTU84c+wMCoNmxaoabxUFx6vDq4VXNla6ZPGsKQmSOAUAmAeYenQnAk5eWlgxOt6QSUVCZcKXct+TLjWojKwXZ75jlCjFsIkv4f1ff9bEjvoqhvVLlKXteM2l4KVAB1/xjWrrl95WUpMzkrVrLR7y+HMImxRz+q6upAy9PUVfjdKoGI/xUPQ+8ob1aNY1OuxVraaZt1nbYb2CbHGuPfuq41EKHBDUhEfb1z2qaRfq4lqa3CQTtAUr7PGmMbGDRPvejhIQw3VTn28zRoGaDPH1TYw0cVF2BHjHtnwaorAemxRxo2X619qxcMd1Dx3U+KM0AQH2iw== alex@danny +ssh-dss AAAAB3NzaC1kc3MAAACBAPR7IFQ+tr0WmHSoZf4hhBcBsUPr5X/oRP7/AtNEOhzzMGDpZjv43FNom98KnEwo/CFOpIb4AOZmaWJfxvtIHuq2501riATSWPTDAiPJVuWfCwasxrWuTYd74Ft14q2WrNWOQRfq8QVzX/DmKZFjlBTQ5pnczESK51H89vLQDCtNAAAAFQDNfFYgHqtSwp3kF6sRDsLKSxM15QAAAIEAkV716nHegoRqYlPemvIIUfcyuoAL2zkQaq4NMd481owzNLVmxXQloDT1x49bR43jd8V10DYLZPaU8p50M2FdI/SzAha7JoRmHTeiATeWoB9M6PkeNllTAP3qtKq5w5Tdl6HGVuRScXNzMEC/SIKFaj7bZD6WqZxraYpsfHtD68QAAACBANDzYWx7U489zikATO7gpyKnOP1Gxuuc3cBKJx0sMGIg0kiipf5G6azsptRPSyu4e/iST4JtaH2tnPx50zsPm0XGpAjHw4cUgYtUnruSTP/G7Di2dig2MOelxX/SKprdblZob573eMd64OMmeaJfMM0OAHVvzBqCXs16qKdBZCUZ alex@danny diff --git a/tcwg-base/home-data/alex.bennee/bootstrap.sh b/tcwg-base/home-data/alex.bennee/bootstrap.sh new file mode 100644 index 00000000..e5de885a --- /dev/null +++ b/tcwg-base/home-data/alex.bennee/bootstrap.sh @@ -0,0 +1,78 @@ +#!/bin/bash +# +# Bootstrap a new system +# wget -O - https://raw.githubusercontent.com/stsquad/dotfiles/master/bootstrap.sh | bash +# curl -s https://raw.githubusercontent.com/stsquad/dotfiles/master/bootstrap.sh | bash +# +set -e + +if [ -n "$SSH_AUTH_SOCK" ] && [ -S "$SSH_AUTH_SOCK" ] && [ "ssh-add -l > /dev/null" ]; then + SSH_CONFIG=${HOME}/.ssh + mkdir -p ${SSH_CONFIG} + # You kinda have to take it on trust that these are the github finger-prints + cat > ${SSH_CONFIG}/known_hosts < Date: Wed, 13 Jun 2018 15:31:48 +0100 Subject: tcgw-base: add passwd/group entries MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I6954c04ab9132643567ae11106c0fb0f8113bcce Signed-off-by: Alex Bennée --- tcwg-base/home-data/group | 2 +- tcwg-base/home-data/passwd | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tcwg-base/home-data/group b/tcwg-base/home-data/group index 2037661f..3eff82b0 100644 --- a/tcwg-base/home-data/group +++ b/tcwg-base/home-data/group @@ -1,3 +1,3 @@ tcwg-infra:x:9000:tcwg-buildslave,tcwg-benchmark -tcwg-users:x:10000:maxim.kuvyrkov +tcwg-users:x:10000:maxim.kuvyrkov,alex.bennee tcwg-llvm:x:9001:maxim.kuvyrkov diff --git a/tcwg-base/home-data/passwd b/tcwg-base/home-data/passwd index c63d1163..894e5c55 100644 --- a/tcwg-base/home-data/passwd +++ b/tcwg-base/home-data/passwd @@ -1,3 +1,4 @@ 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 +alex.bennee:x:10968:10000:Alex Bennée::/bin/bash -- cgit v1.2.3 From 18ba4aab3f77e7b0b5acf2d69ab4f33d9eb5e2c7 Mon Sep 17 00:00:00 2001 From: Peter Smith Date: Wed, 13 Jun 2018 16:20:04 +0100 Subject: tcwg-base: Add passwd/group entries and .ssh/authorized_keys Change-Id: Ie2b82edc18b57513a7f6ef1ff250a737fcc2fd81 --- tcwg-base/home-data/group | 2 +- tcwg-base/home-data/passwd | 1 + tcwg-base/home-data/peter.smith/.ssh/authorized_keys | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 tcwg-base/home-data/peter.smith/.ssh/authorized_keys diff --git a/tcwg-base/home-data/group b/tcwg-base/home-data/group index 3eff82b0..bcc16a8d 100644 --- a/tcwg-base/home-data/group +++ b/tcwg-base/home-data/group @@ -1,3 +1,3 @@ tcwg-infra:x:9000:tcwg-buildslave,tcwg-benchmark -tcwg-users:x:10000:maxim.kuvyrkov,alex.bennee +tcwg-users:x:10000:maxim.kuvyrkov,alex.bennee,peter.smith tcwg-llvm:x:9001:maxim.kuvyrkov diff --git a/tcwg-base/home-data/passwd b/tcwg-base/home-data/passwd index 894e5c55..fe8db6ca 100644 --- a/tcwg-base/home-data/passwd +++ b/tcwg-base/home-data/passwd @@ -2,3 +2,4 @@ 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 alex.bennee:x:10968:10000:Alex Bennée::/bin/bash +peter.smith:x:10969:10000:Peter Smith::/bin/bash diff --git a/tcwg-base/home-data/peter.smith/.ssh/authorized_keys b/tcwg-base/home-data/peter.smith/.ssh/authorized_keys new file mode 100644 index 00000000..3e5efed6 --- /dev/null +++ b/tcwg-base/home-data/peter.smith/.ssh/authorized_keys @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDk77ZpUDiOq71/kkCS0oPkXILsKBBzxUxrDWydwgn2uicozIQbamisJ5EwogSpaDnmacxuRHg81yRKifBt21cgUHcUBJC4lsr0IXnuqAREUunT8QB6wWCjzUd/AMl9tuu+sPus3wAXQE4ek0yl7jZTBXifqJsUTUomp/+wbcVzLeO5NcK/VymCYSPOCu6opRCXLnzld+wBpHSo4c76QLNmd7t3yzWEwBWcwDgAILSBKFc1Eq6Jlz1/ocazUUU2VDa2zMCVL+3oKWxv1OJhOcPBa0wS8eTkjcuwNLG1eOGwQcwCE2EarlE/DIXR7yMSeJQCERWFb1erscb+H/jE6/Rz psmith@E104452-LINA -- cgit v1.2.3 From 5c8ee2dba4cce8de27451bc8d7ba5c7b213ad12f Mon Sep 17 00:00:00 2001 From: Maxim Kuvyrkov Date: Thu, 14 Jun 2018 07:13:20 +0000 Subject: tcwg-base/home-data: Use UIDs as in Linaro's LDAP ... and sort users in alphabetical order in passwd. Add Peter to tcwg-llvm to access LLVM bots. Change-Id: If7da46304bbf7736958612df997bcbce03b49624 --- tcwg-base/home-data/group | 2 +- tcwg-base/home-data/passwd | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tcwg-base/home-data/group b/tcwg-base/home-data/group index bcc16a8d..d977915a 100644 --- a/tcwg-base/home-data/group +++ b/tcwg-base/home-data/group @@ -1,3 +1,3 @@ tcwg-infra:x:9000:tcwg-buildslave,tcwg-benchmark tcwg-users:x:10000:maxim.kuvyrkov,alex.bennee,peter.smith -tcwg-llvm:x:9001:maxim.kuvyrkov +tcwg-llvm:x:9001:maxim.kuvyrkov,peter.smith diff --git a/tcwg-base/home-data/passwd b/tcwg-base/home-data/passwd index fe8db6ca..b818feaf 100644 --- a/tcwg-base/home-data/passwd +++ b/tcwg-base/home-data/passwd @@ -1,5 +1,5 @@ tcwg-buildslave:x:11827:9000:TCWG Buildslave::/bin/bash tcwg-benchmark:x:12326:9000:TCWG Benchmark::/bin/bash +alex.bennee:x:10583:10000:Alex Bennée::/bin/bash maxim.kuvyrkov:x:10967:10000:Maxim Kuvyrkov::/bin/bash -alex.bennee:x:10968:10000:Alex Bennée::/bin/bash -peter.smith:x:10969:10000:Peter Smith::/bin/bash +peter.smith:x:12314:10000:Peter Smith::/bin/bash -- cgit v1.2.3 From 2ba0f9efa6956416abb9fe09481bcd937e14c8dc Mon Sep 17 00:00:00 2001 From: Maxim Kuvyrkov Date: Thu, 14 Jun 2018 07:22:22 +0000 Subject: tcwg-host: Rely on external script to restart (and update) container. Change-Id: I284dd1a3af6cb7d2d1c9ca769ab4ec18025e738b --- tcwg-base/tcwg-host/start.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tcwg-base/tcwg-host/start.sh b/tcwg-base/tcwg-host/start.sh index e4c739c9..5cb3a305 100755 --- a/tcwg-base/tcwg-host/start.sh +++ b/tcwg-base/tcwg-host/start.sh @@ -57,4 +57,4 @@ mounts="$mounts -v $(which docker):$(which docker)" # Use at most half of all available RAM. memlimit=$(($(free -g | awk '/^Mem/ { print $2 }') / 2))G -$DOCKER run -dt -p 2222:22 --name=host --hostname=$(hostname)-dckr $mounts --memory=$memlimit --pids-limit=5000 --restart=unless-stopped $image "$@" +$DOCKER run -dt -p 2222:22 --name=host --hostname=$(hostname)-dckr $mounts --memory=$memlimit --pids-limit=5000 $image "$@" -- cgit v1.2.3 From 866af50ff2c360b06a3652a30bede35e31ac738a Mon Sep 17 00:00:00 2001 From: Maxim Kuvyrkov Date: Thu, 14 Jun 2018 08:23:04 +0000 Subject: tcwg-host: Add support to run host container just for jenkins builds Change-Id: I9e7063b849df9feece534618c9cec82b39e06420 --- tcwg-base/home-data/tcwg-buildslave/.ssh/config | 2 +- tcwg-base/tcwg-dev/start.sh | 2 +- tcwg-base/tcwg-host/start.sh | 27 +++++++++++++++++++++++-- 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/tcwg-base/home-data/tcwg-buildslave/.ssh/config b/tcwg-base/home-data/tcwg-buildslave/.ssh/config index 62aed114..bfdb8094 100644 --- a/tcwg-base/home-data/tcwg-buildslave/.ssh/config +++ b/tcwg-base/home-data/tcwg-buildslave/.ssh/config @@ -59,7 +59,7 @@ Host git.linaro.org dev-private-git.linaro.org User git Host tcwg-d05-01 tcwg-thx1-01 - Port 2222 + Port 2022 Host tcwg-d05-01 Hostname 147.75.106.138 diff --git a/tcwg-base/tcwg-dev/start.sh b/tcwg-base/tcwg-dev/start.sh index ea527b95..91a4e855 100755 --- a/tcwg-base/tcwg-dev/start.sh +++ b/tcwg-base/tcwg-dev/start.sh @@ -105,7 +105,7 @@ memlimit=$(($(free -g | awk '/^Mem/ { print $2 }') / 2))G # SYS_PTRACE is required for debugger work. caps="--cap-add=IPC_LOCK --cap-add=SYS_PTRACE" -$DOCKER run --name=$name --hostname=$(basename $(hostname) -dckr)-dev --restart=unless-stopped -dt -p 22 $mounts --memory=$memlimit --pids-limit=5000 $caps $image --user $user "$@" +$DOCKER run --name=$name --hostname=$(basename $(hostname) -host)-dev --restart=unless-stopped -dt -p 22 $mounts --memory=$memlimit --pids-limit=5000 $caps $image --user $user "$@" port=$($DOCKER port $name 22 | cut -d: -f 2) diff --git a/tcwg-base/tcwg-host/start.sh b/tcwg-base/tcwg-host/start.sh index 5cb3a305..768081e3 100755 --- a/tcwg-base/tcwg-host/start.sh +++ b/tcwg-base/tcwg-host/start.sh @@ -5,19 +5,24 @@ set -e usage () { cat < Date: Thu, 14 Jun 2018 09:59:11 +0000 Subject: tcwg-host: Restore --restart=unless-stopped. Change-Id: I0d46ab7a449b368c1025d216a573d8b5a1d622d8 --- tcwg-base/tcwg-host/start.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tcwg-base/tcwg-host/start.sh b/tcwg-base/tcwg-host/start.sh index 768081e3..455e2a27 100755 --- a/tcwg-base/tcwg-host/start.sh +++ b/tcwg-base/tcwg-host/start.sh @@ -80,4 +80,4 @@ mounts="$mounts -v $(which docker):$(which docker)" # Use at most half of all available RAM. memlimit=$(($(free -g | awk '/^Mem/ { print $2 }') / 2))G -$DOCKER run -dt -p 2222:22 --name=$task --hostname=$(hostname)-$task $mounts --memory=$memlimit --pids-limit=5000 $image "$group" +$DOCKER run -dt -p 2222:22 --name=$task --hostname=$(hostname)-$task --restart=unless-stopped $mounts --memory=$memlimit --pids-limit=5000 $image "$group" -- cgit v1.2.3 From 6e0fbb4323fba2061e5135fcca2566bedf43de93 Mon Sep 17 00:00:00 2001 From: Maxim Kuvyrkov Date: Thu, 14 Jun 2018 11:06:51 +0000 Subject: tcwg-base: Fix typo in new-user.sh Change-Id: Iab791317605679ae928ca0816ef711d50b085793 --- tcwg-base/new-user.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tcwg-base/new-user.sh b/tcwg-base/new-user.sh index 0e472dab..10463880 100755 --- a/tcwg-base/new-user.sh +++ b/tcwg-base/new-user.sh @@ -108,9 +108,5 @@ if [ x"$user" != x"" ]; then chmod -R go-w $home_data/$user/ chmod -R go-rwx $home_data/$user/.ssh/ rsync -a $home_data/$user/ /home/$user/ - # Make /home-data/$user a prestine copy of $user's /home to have - # access to files even when /home volume is reused from previous - # container instance. - rsync -a /home/$user/ $home_data/$user/ fi fi -- cgit v1.2.3 From 57dbaa81c34af4532676fde4bdffb2443501e4bb Mon Sep 17 00:00:00 2001 From: Maxim Kuvyrkov Date: Thu, 14 Jun 2018 11:26:31 +0000 Subject: tcwg-host: Fix typo in start.sh Change-Id: I8bfd4216c09e9a71a20d0b58e952d1d0724eecab --- tcwg-base/tcwg-host/start.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tcwg-base/tcwg-host/start.sh b/tcwg-base/tcwg-host/start.sh index 455e2a27..32b164d6 100755 --- a/tcwg-base/tcwg-host/start.sh +++ b/tcwg-base/tcwg-host/start.sh @@ -80,4 +80,4 @@ mounts="$mounts -v $(which docker):$(which docker)" # Use at most half of all available RAM. memlimit=$(($(free -g | awk '/^Mem/ { print $2 }') / 2))G -$DOCKER run -dt -p 2222:22 --name=$task --hostname=$(hostname)-$task --restart=unless-stopped $mounts --memory=$memlimit --pids-limit=5000 $image "$group" +$DOCKER run -dt -p $port:22 --name=$task --hostname=$(hostname)-$task --restart=unless-stopped $mounts --memory=$memlimit --pids-limit=5000 $image "$group" -- cgit v1.2.3 From 39160237fc75d1146ec718feacb174a7f0a629aa Mon Sep 17 00:00:00 2001 From: Maxim Kuvyrkov Date: Sat, 16 Jun 2018 13:27:41 +0000 Subject: tcwg-base: Add bionic support to tcwg-base, tcwg-dev and tcwg-x2go images. Bionic image directories will be added in the next commit. Change-Id: I4bdad2fa620e7003ced5c27f9d05d139e0ac6bdd --- tcwg-base/Dockerfile.in | 16 +++++++++++++++- tcwg-base/tcwg-dev/tcwg-x2go/Dockerfile.in | 6 ++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/tcwg-base/Dockerfile.in b/tcwg-base/Dockerfile.in index 01e0a0b1..e80c9370 100644 --- a/tcwg-base/Dockerfile.in +++ b/tcwg-base/Dockerfile.in @@ -1,4 +1,4 @@ -#if ARCH_amd64 +#if ARCH_amd64 || DISTRO_bionic FROM ubuntu:#{DISTRO} #elif DISTRO_zesty FROM snapcraft/zesty-#{ARCH}:latest @@ -6,6 +6,7 @@ FROM snapcraft/zesty-#{ARCH}:latest FROM linaro/base-#{ARCH}-ubuntu:#{DISTRO} #endif +#if !DISTRO_bionic #if ARCH_amd64 || ARCH_i386 RUN (url="http://archive.ubuntu.com/ubuntu/"; \ #else @@ -18,6 +19,9 @@ RUN (url="http://ports.ubuntu.com/ubuntu-ports/"; \ done; \ echo; \ done) > /etc/apt/sources.list \ +#else +RUN true \ +#endif && apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get dist-upgrade -y \ #if ARCH_i386 @@ -126,7 +130,12 @@ RUN (url="http://ports.ubuntu.com/ubuntu-ports/"; \ /tmp/* \ /var/tmp/* +#if !DISTRO_bionic RUN install -D -p -m0755 /usr/share/doc/git/contrib/workdir/git-new-workdir /usr/local/bin/git-new-workdir \ +#else +# Ubuntu Bionic has a quirk in installing contrib files of git; skip for now. +RUN true \ +#endif && sed -i -e 's:^session *required *pam_loginuid.so:# session required pam_loginuid.so:' /etc/pam.d/sshd \ && mkdir -p /var/run/sshd \ && sed -i \ @@ -141,6 +150,7 @@ COPY postfix-sasl_password.in /etc/postfix/sasl_password RUN chown root:root /etc/postfix/sasl_password \ && chmod 600 /etc/postfix/sasl_password +#if !DISTRO_bionic #if ARCH_amd64 || ARCH_i386 RUN mkdir /tmp/docker-install-qemu.$$ \ && cd /tmp/docker-install-qemu.$$ \ @@ -151,6 +161,10 @@ RUN mkdir /tmp/docker-install-qemu.$$ \ && make all install -j $(nproc --all) \ && cd && rm -rf /tmp/docker-install-qemu.$$ +#endif +#else +# QEMU 2.8 doesn't build cleanly with Ubuntu Bionic's gcc. + #endif COPY home-data/ /home-data/ COPY new-user.sh /usr/local/bin/ diff --git a/tcwg-base/tcwg-dev/tcwg-x2go/Dockerfile.in b/tcwg-base/tcwg-dev/tcwg-x2go/Dockerfile.in index 888e48b8..5191918a 100644 --- a/tcwg-base/tcwg-dev/tcwg-x2go/Dockerfile.in +++ b/tcwg-base/tcwg-dev/tcwg-x2go/Dockerfile.in @@ -11,13 +11,19 @@ RUN apt-get update \ /tmp/* \ /var/tmp/* +#if DISTRO_xenial RUN add-apt-repository ppa:x2go/stable \ +#else +RUN true \ +#endif && apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y \ duplicity \ mate-desktop-environment \ +#if DISTRO_xenial x2godesktopsharing \ x2gomatebindings \ +#endif x2goserver \ x2goserver-xsession \ && apt-get clean \ -- cgit v1.2.3 From 626affa4e49022b2733d5ce5d5483d0e6510ef53 Mon Sep 17 00:00:00 2001 From: Maxim Kuvyrkov Date: Sat, 16 Jun 2018 15:30:43 +0000 Subject: tcwg-base: Add Bionic images for amd64 and arm64. Add tcwg-base, tcwg-dev and tcwg-x2go images. The x2go image is added to amd64 only to avoid costly rebuilds; it is confirmed to work just fine on arm64, though. Change-Id: I044e7b9ab5484ca4905f826243246bfd48d2ded4 --- bionic-amd64-tcwg-base/Dockerfile | 122 +++++++++++++++++++++ .../bionic-amd64-tcwg-dev/Dockerfile | 46 ++++++++ .../bionic-amd64-tcwg-x2go/Dockerfile | 36 ++++++ .../bionic-amd64-tcwg-x2go/build.sh | 1 + .../bionic-amd64-tcwg-x2go/gerrit-branches | 1 + .../bionic-amd64-tcwg-dev/build.sh | 1 + .../bionic-amd64-tcwg-dev/gerrit-branches | 1 + bionic-amd64-tcwg-base/build.sh | 1 + bionic-amd64-tcwg-base/gerrit-branches | 1 + bionic-arm64-tcwg-base/Dockerfile | 117 ++++++++++++++++++++ .../bionic-arm64-tcwg-dev/Dockerfile | 46 ++++++++ .../bionic-arm64-tcwg-dev/build.sh | 1 + .../bionic-arm64-tcwg-dev/gerrit-branches | 1 + bionic-arm64-tcwg-base/build.sh | 1 + bionic-arm64-tcwg-base/gerrit-branches | 1 + 15 files changed, 377 insertions(+) create mode 100644 bionic-amd64-tcwg-base/Dockerfile create mode 100644 bionic-amd64-tcwg-base/bionic-amd64-tcwg-dev/Dockerfile create mode 100644 bionic-amd64-tcwg-base/bionic-amd64-tcwg-dev/bionic-amd64-tcwg-x2go/Dockerfile create mode 120000 bionic-amd64-tcwg-base/bionic-amd64-tcwg-dev/bionic-amd64-tcwg-x2go/build.sh create mode 120000 bionic-amd64-tcwg-base/bionic-amd64-tcwg-dev/bionic-amd64-tcwg-x2go/gerrit-branches create mode 120000 bionic-amd64-tcwg-base/bionic-amd64-tcwg-dev/build.sh create mode 120000 bionic-amd64-tcwg-base/bionic-amd64-tcwg-dev/gerrit-branches create mode 120000 bionic-amd64-tcwg-base/build.sh create mode 120000 bionic-amd64-tcwg-base/gerrit-branches create mode 100644 bionic-arm64-tcwg-base/Dockerfile create mode 100644 bionic-arm64-tcwg-base/bionic-arm64-tcwg-dev/Dockerfile create mode 120000 bionic-arm64-tcwg-base/bionic-arm64-tcwg-dev/build.sh create mode 120000 bionic-arm64-tcwg-base/bionic-arm64-tcwg-dev/gerrit-branches create mode 120000 bionic-arm64-tcwg-base/build.sh create mode 120000 bionic-arm64-tcwg-base/gerrit-branches diff --git a/bionic-amd64-tcwg-base/Dockerfile b/bionic-amd64-tcwg-base/Dockerfile new file mode 100644 index 00000000..b43d9843 --- /dev/null +++ b/bionic-amd64-tcwg-base/Dockerfile @@ -0,0 +1,122 @@ +# Auto generated from tcwg-base/Dockerfile.in. Do not edit. +FROM ubuntu:bionic + +RUN true \ + && apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get dist-upgrade -y \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y devscripts \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + alien \ + autoconf \ + autogen \ + automake \ + bc \ + bind9-host \ + bison \ + binutils-aarch64-linux-gnu \ + binutils-arm-linux-gnueabihf \ + bsd-mailx \ + build-essential \ + byacc \ + ccache \ + ccrypt \ + chrpath \ + clang \ + cmake \ + debhelper \ + dejagnu \ + dh-autoreconf \ + dh-translations \ + distro-info-data \ + emacs \ + fakeroot \ + flex \ + gawk \ + gdb \ + gdbserver \ + git \ + git-review \ + groff \ + less \ + libexpat1-dev \ + libglib2.0-dev \ + liblzma-dev \ + libncurses5-dev \ + libpython2.7-dev \ + libreadline-dev \ + libssl-dev \ + libtcnative-1 \ + libtool \ + linux-tools-generic \ + lzop \ + make \ + mingw-w64 \ + net-tools \ + netcat \ + nfs-kernel-server \ + ninja-build \ + openjdk-8-jdk \ + openssh-server \ + pkg-config \ + python-dev \ + postfix \ + pxz \ + qemu-system-arm \ + qemu-user \ + rsync \ + subversion \ + sudo \ + tclsh \ + texinfo \ + texlive-fonts-recommended \ + texlive-latex-recommended \ + time \ + valgrind \ + vim \ + virtualenv \ + wget \ + xz-utils \ + zip \ + zlib1g-dev \ + && apt-get clean \ + && rm -rf \ + /var/lib/apt/lists/* \ + /tmp/* \ + /var/tmp/* + +# Ubuntu Bionic has a quirk in installing contrib files of git; skip for now. +RUN true \ + && sed -i -e 's:^session *required *pam_loginuid.so:# session required pam_loginuid.so:' /etc/pam.d/sshd \ + && mkdir -p /var/run/sshd \ + && sed -i \ + -e "/.*MaxStartups.*/d" \ + -e "/.*MaxSessions.*/d" /etc/ssh/sshd_config \ + && echo "MaxStartups 256" >> /etc/ssh/sshd_config \ + && echo "MaxSessions 256" >> /etc/ssh/sshd_config + +COPY postfix-main.cf.in /etc/postfix/main.cf +COPY postfix-sasl_password.in /etc/postfix/sasl_password + +RUN chown root:root /etc/postfix/sasl_password \ + && chmod 600 /etc/postfix/sasl_password + +# QEMU 2.8 doesn't build cleanly with Ubuntu Bionic's gcc. + +COPY home-data/ /home-data/ +COPY new-user.sh /usr/local/bin/ + +RUN \ + while read line; do \ + new-user.sh --group $(echo "$line" | cut -d: -f 1,3); \ + done > /etc/ssh/sshd_config \ + && echo "MaxSessions 256" >> /etc/ssh/sshd_config + +COPY postfix-main.cf.in /etc/postfix/main.cf +COPY postfix-sasl_password.in /etc/postfix/sasl_password + +RUN chown root:root /etc/postfix/sasl_password \ + && chmod 600 /etc/postfix/sasl_password + +# QEMU 2.8 doesn't build cleanly with Ubuntu Bionic's gcc. + +COPY home-data/ /home-data/ +COPY new-user.sh /usr/local/bin/ + +RUN \ + while read line; do \ + new-user.sh --group $(echo "$line" | cut -d: -f 1,3); \ + done Date: Thu, 21 Jun 2018 16:36:57 +0100 Subject: tcwg-dev: Correct the connect to container message. To connect to the container we should ssh from our local machine to the port on the host which will then forward to the dev container. Change-Id: Ie36329c4c1741edaedc55e8bba9f363968981a8a --- tcwg-base/tcwg-dev/start.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tcwg-base/tcwg-dev/start.sh b/tcwg-base/tcwg-dev/start.sh index ea527b95..62fc13f2 100755 --- a/tcwg-base/tcwg-dev/start.sh +++ b/tcwg-base/tcwg-dev/start.sh @@ -112,7 +112,8 @@ port=$($DOCKER port $name 22 | cut -d: -f 2) set +x cat < Date: Sat, 23 Jun 2018 18:42:54 +0000 Subject: tcwg-host: Add wrapper to call "docker" without typing "sudo". We need this for uniformity with *.tcwglab hosts, where users are in "docker" group, and can access docker without sudo. Change-Id: Ieb5cd5a11e74b43c13ae8954fd263443e0cf3b7d --- tcwg-base/tcwg-host/Dockerfile.in | 2 ++ tcwg-base/tcwg-host/build.sh | 6 ++++-- tcwg-base/tcwg-host/docker-wrapper | 2 ++ xenial-amd64-tcwg-base/xenial-amd64-tcwg-host/Dockerfile | 4 +++- xenial-arm64-tcwg-base/xenial-arm64-tcwg-host/Dockerfile | 4 +++- 5 files changed, 14 insertions(+), 4 deletions(-) create mode 100755 tcwg-base/tcwg-host/docker-wrapper diff --git a/tcwg-base/tcwg-host/Dockerfile.in b/tcwg-base/tcwg-host/Dockerfile.in index 3c6de198..8d219ba1 100644 --- a/tcwg-base/tcwg-host/Dockerfile.in +++ b/tcwg-base/tcwg-host/Dockerfile.in @@ -1,5 +1,7 @@ FROM linaro/ci-#{ARCH}-tcwg-base-ubuntu:#{DISTRO} +COPY docker-wrapper /usr/local/bin/docker + COPY run.sh start.sh / #if ARCH_amd64 || ARCH_arm64 diff --git a/tcwg-base/tcwg-host/build.sh b/tcwg-base/tcwg-host/build.sh index 60674195..f18f3752 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 run.sh start.sh + rm -rf docker-wrapper run.sh start.sh } export LANG=C @@ -16,7 +16,9 @@ name=$(basename ${PWD} | cut -f3- -d '-') image=linaro/ci-${arch}-${name}-ubuntu:${distro} top=$(git rev-parse --show-toplevel) -cp $top/tcwg-base/tcwg-host/run.sh $top/tcwg-base/tcwg-host/start.sh ./ +cp $top/tcwg-base/tcwg-host/docker-wrapper \ + $top/tcwg-base/tcwg-host/run.sh \ + $top/tcwg-base/tcwg-host/start.sh ./ (cd ..; ./build.sh) "$top"/tcwg-base/validate-dockerfile.sh Dockerfile diff --git a/tcwg-base/tcwg-host/docker-wrapper b/tcwg-base/tcwg-host/docker-wrapper new file mode 100755 index 00000000..883a8038 --- /dev/null +++ b/tcwg-base/tcwg-host/docker-wrapper @@ -0,0 +1,2 @@ +#!/bin/sh +sudo /usr/bin/docker "$@" diff --git a/xenial-amd64-tcwg-base/xenial-amd64-tcwg-host/Dockerfile b/xenial-amd64-tcwg-base/xenial-amd64-tcwg-host/Dockerfile index 0a6217c6..ba5cd020 100644 --- a/xenial-amd64-tcwg-base/xenial-amd64-tcwg-host/Dockerfile +++ b/xenial-amd64-tcwg-base/xenial-amd64-tcwg-host/Dockerfile @@ -1,8 +1,10 @@ # Auto generated from tcwg-base/tcwg-host/Dockerfile.in. Do not edit. FROM linaro/ci-amd64-tcwg-base-ubuntu:xenial +COPY docker-wrapper /usr/local/bin/docker + COPY run.sh start.sh / ENTRYPOINT ["/run.sh"] CMD ["start.sh"] -# checksum: fa8082d167df199794dbee3499433894 +# checksum: 476d3063728acd718302d2d7bad5e711 diff --git a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-host/Dockerfile b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-host/Dockerfile index 63eafaed..22a4ea80 100644 --- a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-host/Dockerfile +++ b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-host/Dockerfile @@ -1,8 +1,10 @@ # Auto generated from tcwg-base/tcwg-host/Dockerfile.in. Do not edit. FROM linaro/ci-arm64-tcwg-base-ubuntu:xenial +COPY docker-wrapper /usr/local/bin/docker + COPY run.sh start.sh / ENTRYPOINT ["/run.sh"] CMD ["start.sh"] -# checksum: ff321464abca9d797c2b4b4afe913658 +# checksum: 16cc73e3d44c8ab0cae45ab9cf83ab32 -- cgit v1.2.3 From d44d3c178eec0b58e8fefdf1983750535eb32bdf Mon Sep 17 00:00:00 2001 From: Thomas Preud'homme Date: Fri, 22 Jun 2018 10:10:31 +0100 Subject: tcwg-base: Add entries for thomas.preudhomme Change-Id: I86dd7f3b0aaec10755b18df2442dcb8ec346ce39 --- tcwg-base/home-data/group | 4 ++-- tcwg-base/home-data/passwd | 1 + tcwg-base/home-data/thomas.preudhomme/.ssh/authorized_keys | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 tcwg-base/home-data/thomas.preudhomme/.ssh/authorized_keys diff --git a/tcwg-base/home-data/group b/tcwg-base/home-data/group index d977915a..55b3d771 100644 --- a/tcwg-base/home-data/group +++ b/tcwg-base/home-data/group @@ -1,3 +1,3 @@ tcwg-infra:x:9000:tcwg-buildslave,tcwg-benchmark -tcwg-users:x:10000:maxim.kuvyrkov,alex.bennee,peter.smith -tcwg-llvm:x:9001:maxim.kuvyrkov,peter.smith +tcwg-users:x:10000:maxim.kuvyrkov,alex.bennee,peter.smith,thomas.preudhomme +tcwg-llvm:x:9001:maxim.kuvyrkov,peter.smith,thomas.preudhomme diff --git a/tcwg-base/home-data/passwd b/tcwg-base/home-data/passwd index b818feaf..f6f2dcc7 100644 --- a/tcwg-base/home-data/passwd +++ b/tcwg-base/home-data/passwd @@ -3,3 +3,4 @@ tcwg-benchmark:x:12326:9000:TCWG Benchmark::/bin/bash alex.bennee:x:10583:10000:Alex Bennée::/bin/bash maxim.kuvyrkov:x:10967:10000:Maxim Kuvyrkov::/bin/bash peter.smith:x:12314:10000:Peter Smith::/bin/bash +thomas.preudhomme:x:13851:10000:Thomas Preud'homme::/bin/bash diff --git a/tcwg-base/home-data/thomas.preudhomme/.ssh/authorized_keys b/tcwg-base/home-data/thomas.preudhomme/.ssh/authorized_keys new file mode 100644 index 00000000..68d7168d --- /dev/null +++ b/tcwg-base/home-data/thomas.preudhomme/.ssh/authorized_keys @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDFtoCUhkeZ3yC2s7oUfSrM33SVgBKLGJ/4FiEGnQRmU1g8rxuOyDOscGz6AIHDNfYcBZGgwHVu5rBd+w+GKZf89kzc6apqBCNmPXUX9vJleb8otqgDL9msifgGOjhDyWVd5pdW6MFzmWMIJyBbY+D3JguUgAMSHMiGh5Sf4+pskn6XOCqnKGbLYRMwpAD1u7ket/liAZnagFP1CuTCgNkmvnFzEw5a4bOdVYtp9x20LYq0L0OMSNhT4KajxUmxgEteLuKCXaafgPgIWq6B8skqkZzyVSU2+RR2Yd6wGQgP6fRFCh84lo59otU5C7VacYqryzCyfdiiE5FXzh94ypu0uKtnq4nSz9DUeL/TAcjr+Y+jAfgwCm087SK/WIPhF37yd6/b/AEeF/4mT8jAR+h74u8ULR9mRkWirBEldG2I80C9p916h73lrc9Vta7CA7XzseIHSKv1S1OQlkCMF8Jj4AwMTF5DOXLju9WNF17OAP44IMEJvpG2HcxTPLbrHd9GX2G4PDzJBaIuaFybJIQH28ZpbIVKpx6iVtPFQ2ehRh+STi7rApgLGPiKjwKYskLnpLcoCyhhyw8BpW7SQ4U690ZcPEboYDF5sqPwEP3EKmrXBG3siUNmlnrLY0E/INON/SKEHAgAAxKm2s4UhtnrfN3y1Wh1ILPRnJq6Fk3K3w== thopre01@e108577-lin -- cgit v1.2.3 From fd90717eeebe94bcb6a9cbff5657cca69c10a208 Mon Sep 17 00:00:00 2001 From: Maxim Kuvyrkov Date: Sat, 23 Jun 2018 19:05:46 +0000 Subject: tcwg-host: Bind-mount docker binary ... not a wrapper that might exist in PATH. Change-Id: If617934ac77052f45df1829ca5cc5c8ebc2c3e98 --- tcwg-base/tcwg-host/start.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tcwg-base/tcwg-host/start.sh b/tcwg-base/tcwg-host/start.sh index 32b164d6..6d396a43 100755 --- a/tcwg-base/tcwg-host/start.sh +++ b/tcwg-base/tcwg-host/start.sh @@ -75,7 +75,7 @@ esac mounts="" mounts="$mounts -v host-home:/home" mounts="$mounts -v /var/run/docker.sock:/var/run/docker.sock" -mounts="$mounts -v $(which docker):$(which docker)" +mounts="$mounts -v /usr/bin/docker:/usr/bin/docker" # Use at most half of all available RAM. memlimit=$(($(free -g | awk '/^Mem/ { print $2 }') / 2))G -- cgit v1.2.3 From 2f44c8eff0578339ebd7c614fc4a65146110de7e Mon Sep 17 00:00:00 2001 From: Maxim Kuvyrkov Date: Sun, 24 Jun 2018 14:00:34 +0000 Subject: tcwg-host: Move host container to host network. In order to access bare-metal host's network from host container (e.g., to connect to ssh server of newly created build container) we need to start host containers on the same [host] network. Change-Id: I2142e2e4494d2d0f9e4764db9548bbcd66ba8dac --- tcwg-base/tcwg-dev/start.sh | 2 +- tcwg-base/tcwg-host/run.sh | 10 ++++++++++ tcwg-base/tcwg-host/start.sh | 4 +--- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/tcwg-base/tcwg-dev/start.sh b/tcwg-base/tcwg-dev/start.sh index 5b64c0ac..463df8bf 100755 --- a/tcwg-base/tcwg-dev/start.sh +++ b/tcwg-base/tcwg-dev/start.sh @@ -105,7 +105,7 @@ memlimit=$(($(free -g | awk '/^Mem/ { print $2 }') / 2))G # SYS_PTRACE is required for debugger work. caps="--cap-add=IPC_LOCK --cap-add=SYS_PTRACE" -$DOCKER run --name=$name --hostname=$(basename $(hostname) -host)-dev --restart=unless-stopped -dt -p 22 $mounts --memory=$memlimit --pids-limit=5000 $caps $image --user $user "$@" +$DOCKER run --name=$name --hostname=$(hostname)-dev --restart=unless-stopped -dt -p 22 $mounts --memory=$memlimit --pids-limit=5000 $caps $image --user $user "$@" port=$($DOCKER port $name 22 | cut -d: -f 2) diff --git a/tcwg-base/tcwg-host/run.sh b/tcwg-base/tcwg-host/run.sh index ccafd4e0..e2ca6b25 100755 --- a/tcwg-base/tcwg-host/run.sh +++ b/tcwg-base/tcwg-host/run.sh @@ -8,6 +8,8 @@ if [ x"$1" = x"start.sh" ]; then fi group="$1" +task="$2" + if [ x"$group" = x"all" ]; then group=".*" fi @@ -19,4 +21,12 @@ while read line; do fi done > /etc/ssh/sshd_config + exec /usr/sbin/sshd -D diff --git a/tcwg-base/tcwg-host/start.sh b/tcwg-base/tcwg-host/start.sh index 6d396a43..a9a5519c 100755 --- a/tcwg-base/tcwg-host/start.sh +++ b/tcwg-base/tcwg-host/start.sh @@ -57,10 +57,8 @@ fi group="$1" case "$task" in host) - port=2222 ;; jenkins) - port=2022 if [ x"$group" != x"tcwg-infra" ]; then echo "ERROR: group for task $task should be tcwg-infra" exit 1 @@ -80,4 +78,4 @@ mounts="$mounts -v /usr/bin/docker:/usr/bin/docker" # Use at most half of all available RAM. memlimit=$(($(free -g | awk '/^Mem/ { print $2 }') / 2))G -$DOCKER run -dt -p $port:22 --name=$task --hostname=$(hostname)-$task --restart=unless-stopped $mounts --memory=$memlimit --pids-limit=5000 $image "$group" +$DOCKER run -dt --name=$task --network host --restart=unless-stopped $mounts --memory=$memlimit --pids-limit=5000 $image "$group" "$task" -- cgit v1.2.3 From f1b899e227d583a0f62ee7cbb979c3ebd9efda92 Mon Sep 17 00:00:00 2001 From: Christophe Lyon Date: Mon, 25 Jun 2018 15:45:50 +0000 Subject: tcwg-base: Add entries for christophe.lyon Change-Id: Icb131e82da5e458c07b2614a19564d4cdf1ba13c --- tcwg-base/home-data/christophe.lyon/.ssh/authorized_keys | 1 + tcwg-base/home-data/group | 2 +- tcwg-base/home-data/passwd | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 tcwg-base/home-data/christophe.lyon/.ssh/authorized_keys diff --git a/tcwg-base/home-data/christophe.lyon/.ssh/authorized_keys b/tcwg-base/home-data/christophe.lyon/.ssh/authorized_keys new file mode 100644 index 00000000..2784fa89 --- /dev/null +++ b/tcwg-base/home-data/christophe.lyon/.ssh/authorized_keys @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDH+cTuP929qfreLhscv8F2Ot3NjaT1YVtyq6/gOqpCNIXPvPUIa/H9vacBHL7XxbtZoZhI6Ma/rlokjfriupldtzh9UQ4asEVRIpFTw6g8gGJx1RE00PUp2uCT1FZpMNFkuJQ1teI3o+ttMMLTKLdMbqzrzijH2Ev+RRGxveE91G/giRyGuyPdPO07XjNqfKXM8yWFUQg/P+rmSbNlomJ8JKxrg9xifnXBYXLKIiM3EfXwbOiqAxQvFp7KAMka2RrHb1RuZ3D94T8tqVNWPkSc09MX0BB6IAUxGdUYYQ5UTGukGL9OqsaOYlrJusrWW2eZ3lamUZfhGB1VFGPaXv+z lyon@gnx2504 diff --git a/tcwg-base/home-data/group b/tcwg-base/home-data/group index 55b3d771..80e47bd8 100644 --- a/tcwg-base/home-data/group +++ b/tcwg-base/home-data/group @@ -1,3 +1,3 @@ tcwg-infra:x:9000:tcwg-buildslave,tcwg-benchmark -tcwg-users:x:10000:maxim.kuvyrkov,alex.bennee,peter.smith,thomas.preudhomme +tcwg-users:x:10000:maxim.kuvyrkov,alex.bennee,christophe.lyon,peter.smith,thomas.preudhomme tcwg-llvm:x:9001:maxim.kuvyrkov,peter.smith,thomas.preudhomme diff --git a/tcwg-base/home-data/passwd b/tcwg-base/home-data/passwd index f6f2dcc7..c6e4c0d7 100644 --- a/tcwg-base/home-data/passwd +++ b/tcwg-base/home-data/passwd @@ -1,6 +1,7 @@ tcwg-buildslave:x:11827:9000:TCWG Buildslave::/bin/bash tcwg-benchmark:x:12326:9000:TCWG Benchmark::/bin/bash alex.bennee:x:10583:10000:Alex Bennée::/bin/bash +christophe.lyon:x:10033:10000:Christophe Lyon::/bin/bash maxim.kuvyrkov:x:10967:10000:Maxim Kuvyrkov::/bin/bash peter.smith:x:12314:10000:Peter Smith::/bin/bash thomas.preudhomme:x:13851:10000:Thomas Preud'homme::/bin/bash -- cgit v1.2.3 From caea28b35ef3f401ea6071f7a4e4a875acfa177e Mon Sep 17 00:00:00 2001 From: Maxim Kuvyrkov Date: Tue, 26 Jun 2018 06:56:54 +0000 Subject: tcwg-base: Update tcwg-buildslave's .ssh/config Remove no-longer-necessary workaround, add FQDN for tcwg-d05-01, and add an entry for tcwg-ex40-01. Change-Id: I48d9a99750d56dd1ccb77cebdd32dac5d16bfea1 --- tcwg-base/home-data/tcwg-buildslave/.ssh/config | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/tcwg-base/home-data/tcwg-buildslave/.ssh/config b/tcwg-base/home-data/tcwg-buildslave/.ssh/config index bfdb8094..1b8fb405 100644 --- a/tcwg-base/home-data/tcwg-buildslave/.ssh/config +++ b/tcwg-base/home-data/tcwg-buildslave/.ssh/config @@ -24,7 +24,7 @@ Host *.aus-colo Host *.lab ProxyCommand ssh lab.validation.linaro.org nc -q0 $(basename %h .lab) %p -Host *.tcwglab *.aus-colo *.lab localhost tcwg-d05-01 tcwg-thx1-01 +Host *.tcwglab *.aus-colo *.lab tcwg-d05-01 libgomp-d05 tcwg-thx1-01 # Enable automatic multiplexing. ControlMaster auto # Soften up potential problems with killing master connection by using @@ -50,20 +50,18 @@ Host *.tcwglab *.aus-colo *.lab localhost tcwg-d05-01 tcwg-thx1-01 # Don't warn about "adding" host keys to /dev/null LogLevel FATAL -# Make sure we can connect to localhost (e.g., to a container running -# on localhost) with the settings for *.tcwglab -Host localhost.tcwglab - Hostname localhost - Host git.linaro.org dev-private-git.linaro.org User git -Host tcwg-d05-01 tcwg-thx1-01 +Host tcwg-d05-01 libgomp-d05 tcwg-thx1-01 Port 2022 -Host tcwg-d05-01 +Host tcwg-d05-01 libgomp-d05 Hostname 147.75.106.138 Host tcwg-thx1-01 Hostname 147.75.77.198 + +Host tcwg-ex40-01 ex40-01 + Hostname ex40-01.tcwglab.linaro.org # === END: TCWG SSH configuration === -- cgit v1.2.3 From acb17e8fc0736ce452d62abf73314a6621ad468c Mon Sep 17 00:00:00 2001 From: Thomas Preud'homme Date: Tue, 26 Jun 2018 11:50:03 +0100 Subject: tcwg-dev: Fix hostname of dev container in message The note at the end of the start.sh script prints the value of the hostname variable which is never set in the script. Calling the hostname command is not an option because it prints the info for localhost. The approach chosen assumes the machine is always reached via ssh when running this script, in which case it can rely on SSH_CONNECTION to be set with the server IP. The format of this environment variable is documented in ssh (1) manual. Change-Id: I0cd6291792d528584280008dfcd3c6cad23ea619 --- tcwg-base/tcwg-dev/start.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tcwg-base/tcwg-dev/start.sh b/tcwg-base/tcwg-dev/start.sh index 463df8bf..edcd8aca 100755 --- a/tcwg-base/tcwg-dev/start.sh +++ b/tcwg-base/tcwg-dev/start.sh @@ -108,6 +108,7 @@ caps="--cap-add=IPC_LOCK --cap-add=SYS_PTRACE" $DOCKER run --name=$name --hostname=$(hostname)-dev --restart=unless-stopped -dt -p 22 $mounts --memory=$memlimit --pids-limit=5000 $caps $image --user $user "$@" port=$($DOCKER port $name 22 | cut -d: -f 2) +hostname=$(echo ${SSH_CONNECTION} | { read client_ip client_port server_ip server_port; echo $server_ip; }) set +x cat < Date: Thu, 28 Jun 2018 06:04:12 +0000 Subject: 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 --- bionic-amd64-tcwg-base/Dockerfile | 3 ++- bionic-arm64-tcwg-base/Dockerfile | 3 ++- tcwg-base/Dockerfile.in | 6 +++--- trusty-amd64-tcwg-base/Dockerfile | 5 +++-- trusty-arm64-tcwg-base/Dockerfile | 5 +++-- trusty-armhf-tcwg-base/Dockerfile | 5 +++-- trusty-i386-tcwg-base/Dockerfile | 5 +++-- xenial-amd64-tcwg-base/Dockerfile | 3 ++- xenial-arm64-tcwg-base/Dockerfile | 3 ++- xenial-armhf-tcwg-base/Dockerfile | 3 ++- xenial-i386-tcwg-base/Dockerfile | 3 ++- 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 -- cgit v1.2.3 From 36a15f5e462f206844291e9161071b050de5760d Mon Sep 17 00:00:00 2001 From: Benjamin Copeland Date: Wed, 4 Jul 2018 08:01:48 +0100 Subject: Jenkins: Update plugins Change-Id: I08fa76736b5996a1241056ce34a4ea9bc15f0e56 --- jessie-amd64-jenkins-master/plugins.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/jessie-amd64-jenkins-master/plugins.txt b/jessie-amd64-jenkins-master/plugins.txt index 97b7c570..5539ded1 100644 --- a/jessie-amd64-jenkins-master/plugins.txt +++ b/jessie-amd64-jenkins-master/plugins.txt @@ -1,15 +1,15 @@ ansicolor:0.5.2 ant:1.8 antisamy-markup-formatter:1.5 -apache-httpcomponents-client-4-api:4.5.5-2.1 -bouncycastle-api:2.16.2 +apache-httpcomponents-client-4-api:4.5.5-3.0 +bouncycastle-api:2.16.3 build-blocker:1.7.3 build-monitor-plugin:1.12+build.201805070054 build-name-setter:1.6.9 build-timeout:1.19 command-launcher:1.2 copy-to-slave:1.4.4 -copyartifact:1.39.1 +copyartifact:1.41 coverity:1.11.1 crowd2:1.8 cvs:2.14 @@ -42,7 +42,7 @@ matrix-combinations-parameter:1.3.0 matrixtieparent:1.2 mercurial:1.61 metrics:3.1.2.12 -monitoring:1.72.0 +monitoring:1.73.1 multiple-scms:0.6 naginator:1.17.2 nodelabelparameter:1.7.2 @@ -55,15 +55,15 @@ rebuild:1.28 repo:1.10.7 simple-theme-plugin:0.4 ssh-agent:1.15 -subversion:2.10.6 +subversion:2.11.0 tap:2.2.1 throttle-concurrents:2.0.1 timestamper:1.8.10 translation:1.16 urltrigger:0.43 -warnings:4.67 +warnings:4.68 windows-slaves:1.3.1 workflow-aggregator:2.5 ws-cleanup:0.34 xvfb:1.1.3 -yet-another-docker-plugin:0.1.0-rc47 +yet-another-docker-plugin:0.1.0-rc48 -- cgit v1.2.3 From 728c813f593759911c314f22539a492f92107726 Mon Sep 17 00:00:00 2001 From: Benjamin Copeland Date: Fri, 6 Jul 2018 12:16:57 +0100 Subject: Jenkins: Add jdk-tool plugin Due to https://issues.jenkins-ci.org/browse/JENKINS-22367 jdk-tool is now a plugin. Plugins need this otherwise we will get errors. Change-Id: I6c54be2f8d48fc6ed8cf8f0c69061c2a1b0dec67 --- jessie-amd64-jenkins-master/plugins.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/jessie-amd64-jenkins-master/plugins.txt b/jessie-amd64-jenkins-master/plugins.txt index 5539ded1..63429e2e 100644 --- a/jessie-amd64-jenkins-master/plugins.txt +++ b/jessie-amd64-jenkins-master/plugins.txt @@ -31,6 +31,7 @@ groovy-postbuild:2.4.1 heavy-job:1.1 htmlpublisher:1.16 ircbot:2.30 +jdk-tool:1.1 jira:3.0.0 jenkins-multijob-plugin:1.30 jobConfigHistory:2.18 -- cgit v1.2.3 From fec13bc5f1421a6374737912ce62584426bd1e09 Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Tue, 10 Jul 2018 07:31:05 -0700 Subject: tcwg-base: Add entries for richard.henderson Change-Id: I26f33385dd06afbfbf5810e5a24cddf003946df6 --- tcwg-base/home-data/group | 2 +- tcwg-base/home-data/passwd | 1 + tcwg-base/home-data/richard.henderson/.gitconfig | 7 +++++++ tcwg-base/home-data/richard.henderson/.ssh/authorized_keys | 1 + 4 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 tcwg-base/home-data/richard.henderson/.gitconfig create mode 100644 tcwg-base/home-data/richard.henderson/.ssh/authorized_keys diff --git a/tcwg-base/home-data/group b/tcwg-base/home-data/group index 80e47bd8..03c63ad6 100644 --- a/tcwg-base/home-data/group +++ b/tcwg-base/home-data/group @@ -1,3 +1,3 @@ tcwg-infra:x:9000:tcwg-buildslave,tcwg-benchmark -tcwg-users:x:10000:maxim.kuvyrkov,alex.bennee,christophe.lyon,peter.smith,thomas.preudhomme +tcwg-users:x:10000:maxim.kuvyrkov,alex.bennee,christophe.lyon,peter.smith,thomas.preudhomme,richard.henderson tcwg-llvm:x:9001:maxim.kuvyrkov,peter.smith,thomas.preudhomme diff --git a/tcwg-base/home-data/passwd b/tcwg-base/home-data/passwd index c6e4c0d7..76de6bed 100644 --- a/tcwg-base/home-data/passwd +++ b/tcwg-base/home-data/passwd @@ -5,3 +5,4 @@ christophe.lyon:x:10033:10000:Christophe Lyon::/bin/bash maxim.kuvyrkov:x:10967:10000:Maxim Kuvyrkov::/bin/bash peter.smith:x:12314:10000:Peter Smith::/bin/bash thomas.preudhomme:x:13851:10000:Thomas Preud'homme::/bin/bash +richard.henderson:x:13410:10000:Richard Henderson::/bin/bash diff --git a/tcwg-base/home-data/richard.henderson/.gitconfig b/tcwg-base/home-data/richard.henderson/.gitconfig new file mode 100644 index 00000000..71aec4f6 --- /dev/null +++ b/tcwg-base/home-data/richard.henderson/.gitconfig @@ -0,0 +1,7 @@ +[user] + email = richard.henderson@linaro.org +[push] + default = simple +[diff] + renames = true + algorithm = histogram diff --git a/tcwg-base/home-data/richard.henderson/.ssh/authorized_keys b/tcwg-base/home-data/richard.henderson/.ssh/authorized_keys new file mode 100644 index 00000000..fa804c95 --- /dev/null +++ b/tcwg-base/home-data/richard.henderson/.ssh/authorized_keys @@ -0,0 +1 @@ +ssh-dss AAAAB3NzaC1kc3MAAACBAJEOzwysCMZtF04TdGQ54HrGqtahlznDG8oiBlX9GpISY0mRSUB1i6B2KXF3pfCvtr3VWdEO7YO6hQ7Rg+wxXns0qB7lVOoMbGvnFB7ygR439NILPuNntDfzBqAxxMP2JQusZeIPHTYDrJqRo9YxFe+Uk+PjTUVm9AvfbFMAcMz3AAAAFQCq5wr83MxfnZ+DeU9YvPyilFcpIQAAAIAFEnXMZyq4cqgO7/zXosZonRu8eGgzECQcXUVn4aBWxEolhQxtHmJWe8c0kTbY1Neo6VZ7CD5oSlFQ/d0O78oY+625f1VVGwtebSq4fThZJEm0XMuxj5V/0jhyP5TcTE1AvSHfV03ZpGDP7IbNMuVYp42lxJMs+MTjp82AUDMxGwAAAIA6pWdbmPjFwkWWtsY3VDVpZTPkD5Q3qpGMWCcpUsBT9eQh/CjmqU7ei3GaiDogwxy/Q41orfTmlZfjaSyDDyWgXCSdMF3WoekFAcsIRRRRJ5Nnek+Lhd60EueitdSQKgtbSwCXd9sXDE1eYiTozLfXIeFIZ0hhrQEW2I5NuaNX5A== rth@are.twiddle.net -- cgit v1.2.3 From 132e39d513f38b1a5d68e157b1de5eff9e6012b5 Mon Sep 17 00:00:00 2001 From: Benjamin Copeland Date: Tue, 10 Jul 2018 19:56:21 +0100 Subject: linaro/jessie-amd64: Trigger rebuild Change-Id: I3c535064ba907ab79c17bd0a13259921e47f98d1 --- jessie-amd64/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/jessie-amd64/Dockerfile b/jessie-amd64/Dockerfile index 76e5d106..22ee77fc 100644 --- a/jessie-amd64/Dockerfile +++ b/jessie-amd64/Dockerfile @@ -70,3 +70,4 @@ VOLUME ["/var/lib/libvirt"] EXPOSE 22 CMD ["/usr/sbin/sshd", "-D"] + -- cgit v1.2.3 From 22face7d18b4b200f13fda732de78d95a0345d24 Mon Sep 17 00:00:00 2001 From: Peter Smith Date: Tue, 3 Jul 2018 10:13:26 +0100 Subject: tcwg-dev run dev container with unconfined security policy The sanitizer tests on AArch64 disable address space randomisation. This results on an assertion failure as this is disabled on the container. By using --security-opt seccomp=unconfined the sanitizer tests pass on AArch64. This configuration option is already used for the buildbot container. Change-Id: I64c1659ed834a9a5cdc436a2c3077f6fb4b38d4a --- tcwg-base/tcwg-dev/start.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tcwg-base/tcwg-dev/start.sh b/tcwg-base/tcwg-dev/start.sh index edcd8aca..b281d34b 100755 --- a/tcwg-base/tcwg-dev/start.sh +++ b/tcwg-base/tcwg-dev/start.sh @@ -103,7 +103,8 @@ esac memlimit=$(($(free -g | awk '/^Mem/ { print $2 }') / 2))G # IPC_LOCK is required for some implementations of ssh-agent (e.g., MATE's). # SYS_PTRACE is required for debugger work. -caps="--cap-add=IPC_LOCK --cap-add=SYS_PTRACE" +# seccomp=unconfined to allow disabling of ASLR for sanitizer regression tests. +caps="--cap-add=IPC_LOCK --cap-add=SYS_PTRACE --security-opt seccomp:unconfined" $DOCKER run --name=$name --hostname=$(hostname)-dev --restart=unless-stopped -dt -p 22 $mounts --memory=$memlimit --pids-limit=5000 $caps $image --user $user "$@" -- cgit v1.2.3 From 587ad1b69a980a1a26b7c3f6822c157b3ba73d2a Mon Sep 17 00:00:00 2001 From: Prathamesh Kulkarni Date: Fri, 20 Jul 2018 17:23:16 +0530 Subject: tcwg-base: Add entries for prathamesh.kulkarni Change-Id: Ibdb7b550d0b16416b00749638e5dc1cc37b4fd9f --- tcwg-base/home-data/group | 2 +- tcwg-base/home-data/passwd | 1 + tcwg-base/home-data/prathamesh.kulkarni/.ssh/authorized_keys | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 tcwg-base/home-data/prathamesh.kulkarni/.ssh/authorized_keys diff --git a/tcwg-base/home-data/group b/tcwg-base/home-data/group index 03c63ad6..26e4dcb7 100644 --- a/tcwg-base/home-data/group +++ b/tcwg-base/home-data/group @@ -1,3 +1,3 @@ tcwg-infra:x:9000:tcwg-buildslave,tcwg-benchmark -tcwg-users:x:10000:maxim.kuvyrkov,alex.bennee,christophe.lyon,peter.smith,thomas.preudhomme,richard.henderson +tcwg-users:x:10000:maxim.kuvyrkov,alex.bennee,christophe.lyon,peter.smith,thomas.preudhomme,richard.henderson,prathamesh.kulkarni tcwg-llvm:x:9001:maxim.kuvyrkov,peter.smith,thomas.preudhomme diff --git a/tcwg-base/home-data/passwd b/tcwg-base/home-data/passwd index 76de6bed..7cf3e8de 100644 --- a/tcwg-base/home-data/passwd +++ b/tcwg-base/home-data/passwd @@ -6,3 +6,4 @@ maxim.kuvyrkov:x:10967:10000:Maxim Kuvyrkov::/bin/bash peter.smith:x:12314:10000:Peter Smith::/bin/bash thomas.preudhomme:x:13851:10000:Thomas Preud'homme::/bin/bash richard.henderson:x:13410:10000:Richard Henderson::/bin/bash +prathamesh.kulkarni:x:11537:10000:Prathamesh Kulkarni::/bin/bash diff --git a/tcwg-base/home-data/prathamesh.kulkarni/.ssh/authorized_keys b/tcwg-base/home-data/prathamesh.kulkarni/.ssh/authorized_keys new file mode 100644 index 00000000..54c313c4 --- /dev/null +++ b/tcwg-base/home-data/prathamesh.kulkarni/.ssh/authorized_keys @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC/wwXYCngpNiJRzeyaiiHdX8p5n3jB5ZbW3IghR/LVH+sSUSjFeUQfwqNNvL363iAcEKNnr67CBTda2no1/wAKNHaFsEzPpcDRNtAwmOWcvoiq475ntLTw53ysqJEYy3MoO0H4fF5lOYmHfbbccjGyPs5SEUFe3+bJKZCOEu1jHXcOPhDcYWD0AiT0kQVleaiieXdS8lNQNTXiNHrQ7+ZFcRj0McreeKEx5jeF7Ck5eObgIffNXsMXXtGj6TC4F5Bg4QX/gtUmv4K/w+KWXJ25zwkit4toTm8q6BDv3XOuIiaguWln5b8erqNLZbGJbp9pYqiA7FKNBbnhUr4ZR0sj bilbo@bilbo-Ideapad-Z560 -- cgit v1.2.3 From 80e09c699461c9257d8f4eeab5573d46dce54d4d Mon Sep 17 00:00:00 2001 From: Benjamin Copeland Date: Mon, 23 Jul 2018 12:30:38 +0100 Subject: Jenkins: Update to latest LTS Change-Id: I09303712d9763474d81daf40304d331738e697c7 --- jessie-amd64-jenkins-master/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jessie-amd64-jenkins-master/Dockerfile b/jessie-amd64-jenkins-master/Dockerfile index 90137480..16578c31 100644 --- a/jessie-amd64-jenkins-master/Dockerfile +++ b/jessie-amd64-jenkins-master/Dockerfile @@ -1,4 +1,4 @@ -FROM jenkins/jenkins:2.121.1 +FROM jenkins/jenkins:2.121.2 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" -- cgit v1.2.3 From 7b51b99a69b07dcb43333e2eff9aecfa1fe54d1a Mon Sep 17 00:00:00 2001 From: Benjamin Copeland Date: Mon, 23 Jul 2018 12:17:48 +0100 Subject: OTA: Add OTA image Add OTA image ( https://github.com/OpenSourceFoundries/extra-containers/tree/master/aktualizr ) Change-Id: I92a7b1e4ced16820f107470fac244052c12b12a8 --- stretch-amd64-ota/Dockerfile | 19 +++++++++++++++++++ stretch-amd64-ota/build.sh | 21 +++++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 stretch-amd64-ota/Dockerfile create mode 100755 stretch-amd64-ota/build.sh diff --git a/stretch-amd64-ota/Dockerfile b/stretch-amd64-ota/Dockerfile new file mode 100644 index 00000000..ea095a76 --- /dev/null +++ b/stretch-amd64-ota/Dockerfile @@ -0,0 +1,19 @@ +FROM opensourcefoundries/aktualizr-build:0.23 + +RUN apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + sudo \ + openssh-server \ + && apt-get clean \ + && rm -rf \ + /var/lib/apt/lists/* \ + /tmp/* \ + /var/tmp/* + +RUN useradd -m buildslave \ + && echo 'buildslave ALL = NOPASSWD: ALL' > /etc/sudoers.d/jenkins \ + && chmod 440 /etc/sudoers.d/jenkins \ + && mkdir -p /var/run/sshd + +EXPOSE 22 +CMD ["/usr/sbin/sshd", "-D"] diff --git a/stretch-amd64-ota/build.sh b/stretch-amd64-ota/build.sh new file mode 100755 index 00000000..a03d97ac --- /dev/null +++ b/stretch-amd64-ota/build.sh @@ -0,0 +1,21 @@ +#!/bin/sh + +set -e + +trap cleanup_exit INT TERM EXIT + +cleanup_exit() +{ + rm -f *.list *.key +} + +export LANG=C + +DISTRIBUTION=$(basename ${PWD} | cut -f1 -d '-') +ARCHITECTURE=$(basename ${PWD} | cut -f2 -d '-') + +cp -a ../linaro-overlay-obs.list ../linaro-overlay-obs.key . + +image=linaro/ci-${ARCHITECTURE}-debian-ota:${DISTRIBUTION} +docker build --pull --tag=$image . +echo $image > .docker-tag -- cgit v1.2.3 From 2347dc47edce5041ce500e110d229e4a244feb92 Mon Sep 17 00:00:00 2001 From: Benjamin Copeland Date: Tue, 24 Jul 2018 14:23:22 +0100 Subject: ota: Update image to use correct image Change-Id: Ieb1adc0caf9070d91b567c6981c1048a02fd4d42 --- stretch-amd64-ota/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stretch-amd64-ota/Dockerfile b/stretch-amd64-ota/Dockerfile index ea095a76..0fe58092 100644 --- a/stretch-amd64-ota/Dockerfile +++ b/stretch-amd64-ota/Dockerfile @@ -1,4 +1,4 @@ -FROM opensourcefoundries/aktualizr-build:0.23 +FROM opensourcefoundries/aktualizr:0.23 RUN apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ -- cgit v1.2.3 From df5d4f3c515df119168278d553ec6c5075d9ca52 Mon Sep 17 00:00:00 2001 From: Peter Smith Date: Wed, 25 Jul 2018 13:19:53 +0100 Subject: Use recent clang release for buildbots using clang. Use a recent clang release rather than the distribution default for clang buildbots. The libcxx and libcxxabi bot requires a recent release and we have seen a miscompile with clang 3.8 that is the default on Ubuntu 16.04 that causes the check-clang tests to fail. For the clang release we've chosen the current release - 1 which is currently 6.0.0. As we are only selecting one version for all bots the logic for selecting clang can be simplified a bit. Change-Id: Ica7e670468dac1586f453475422866c09bfa478b --- tcwg-base/tcwg-llvmbot/run.sh | 105 ++++++++++++++++++++---------------------- 1 file changed, 50 insertions(+), 55 deletions(-) diff --git a/tcwg-base/tcwg-llvmbot/run.sh b/tcwg-base/tcwg-llvmbot/run.sh index 3aa5cb2a..272df643 100755 --- a/tcwg-base/tcwg-llvmbot/run.sh +++ b/tcwg-base/tcwg-llvmbot/run.sh @@ -12,72 +12,66 @@ bare_metal_bot_p () esac } -if [ x"$1" = x"start.sh" ]; then - cat /start.sh - exit 0 -fi - -if ! [ -f ~buildslave/buildslave/buildbot.tac ]; then - # Connect to silent master. - # Reconnecting to main master should be done by hand. - sudo -i -u buildslave buildslave create-slave --umask=022 ~buildslave/buildslave "$@" -fi +use_clang_p () +{ + # The LLD buildbot needs clang for -fuse-ld=lld in stage 2 + # The libcxx bot needs a recent clang to compile tests that + # require new C++ standard support. + # Typically we've used clang when the default gcc has problems + # otherwise gcc is used. + case "$1" in + *-libcxx*|linaro-tk1-01|linaro-apm-03) return 0 ;; + *-lld|linaro-apm-04) return 0 ;; + *-arm-quick|linaro-tk1-06) return 0 ;; + *-arm-full-selfhost|linaro-tk1-05) return 0 ;; + *-arm-full|linaro-tk1-08) return 0 ;; + *-arm-global-isel|linaro-tk1-09) return 0 ;; + *) return 1 ;; + esac +} -case "$(uname -m)" in +# Use the oldest maintained clang release (latest - 1). +setup_clang_release() +{ + # There is a 6.0.1 release but there aren't any AArch64 binaries available + # so we use 6.0.0 for now. + local release_num=6.0.0 + case "$(uname -m)" in aarch64) - clang_ver=clang+llvm-6.0.0-aarch64-linux-gnu + local clang_ver=clang+llvm-${release_num}-aarch64-linux-gnu ;; *) - clang_ver=clang+llvm-6.0.0-armv7a-linux-gnueabihf + local clang_ver=clang+llvm-${release_num}-armv7a-linux-gnueabihf ;; -esac + esac -if bare_metal_bot_p "$2"; then - # Download and install clang+llvm into /usr/local for bare-metal - # bots. + # Download and install clang+llvm into /usr/local ( cd /usr/local - wget -c --progress=dot:giga http://releases.llvm.org/6.0.0/$clang_ver.tar.xz + wget -c --progress=dot:giga http://releases.llvm.org/${release_num}/$clang_ver.tar.xz tar xf $clang_ver.tar.xz ) + cc=/usr/local/$clang_ver/bin/clang + cxx=/usr/local/$clang_ver/bin/clang++ +} + +if [ x"$1" = x"start.sh" ]; then + cat /start.sh + exit 0 fi -case "$2" in - *-libcxx*|linaro-tk1-01|linaro-apm-03) - # Libcxx bots need to be compiled with *recent* clang. - cc=/usr/local/$clang_ver/bin/clang - cxx=/usr/local/$clang_ver/bin/clang++ - ;; - *-lld|linaro-apm-04) - # LLD bots need to be compiled with clang. - # ??? Adding testStage1=False to LLD bot might enable it to not depend on clang. - cc=/usr/bin/clang - cxx=/usr/bin/clang++ - ;; - *-arm-quick|linaro-tk1-06) - cc=/usr/bin/clang - cxx=/usr/bin/clang++ - ;; - *-arm-full-selfhost|linaro-tk1-05) - # ??? *-arm-full-selfhost bot doesn't look like it depends on clang. - cc=/usr/bin/clang - cxx=/usr/bin/clang++ - ;; - *-arm-full|linaro-tk1-08) - # ??? For now we preserve host compiler configuration from non-docker bots. - cc=/usr/bin/clang - cxx=/usr/bin/clang++ - ;; - *-arm-global-isel|linaro-tk1-09) - # ??? For now we preserve host compiler configuration from non-docker bots. - cc=/usr/bin/clang - cxx=/usr/bin/clang++ - ;; - *) - cc=gcc - cxx=g++ - ;; -esac +if ! [ -f ~buildslave/buildslave/buildbot.tac ]; then + # Connect to silent master. + # Reconnecting to main master should be done by hand. + sudo -i -u buildslave buildslave create-slave --umask=022 ~buildslave/buildslave "$@" +fi + +if use_clang_p $2 ; then + setup_clang_release +else + cc=gcc + cxx=g++ +fi # With default PATH /usr/local/bin/cc and /usr/local/bin/c++ are detected as # system compilers. No danger in ccaching results of system compiler since @@ -95,7 +89,8 @@ chmod +x /usr/local/bin/c++ case "$2" in *-lld|linaro-apm-04) - # LLD buildbot needs to find ld.lld for stage1 build. + # LLD buildbot needs to find ld.lld for stage1 build. GCC does not + # support -fuse-ld=lld. ln -f -s /usr/bin/ld.bfd /usr/local/bin/ld.lld ;; *) -- cgit v1.2.3 From 1d852188678401b35e1dc57092bde5a3057a631f Mon Sep 17 00:00:00 2001 From: Benjamin Copeland Date: Tue, 31 Jul 2018 09:14:22 +0100 Subject: Jenkins: fix users getting logged out too early This issue was present on Crowd, even know we have moved to LDAP we should still support this. From 4.2 in https://github.com/jenkinsci/winstone/blob/winstone-4.2/src/main/java/winstone/HostConfiguration.java they use sessionTimeout and sessionEviction. According to https://github.com/jenkinsci/winstone, the session will be evicted after 30 minutes if we don't set sessionEviction. Change-Id: I3ba783b5fa69a1b53a81745a9822071afc7e3a85 --- jessie-amd64-jenkins-master/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jessie-amd64-jenkins-master/Dockerfile b/jessie-amd64-jenkins-master/Dockerfile index 16578c31..e4459ba0 100644 --- a/jessie-amd64-jenkins-master/Dockerfile +++ b/jessie-amd64-jenkins-master/Dockerfile @@ -2,7 +2,7 @@ FROM jenkins/jenkins:2.121.2 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" -ENV JENKINS_OPTS="--sessionTimeout=1440" +ENV JENKINS_OPTS="--sessionTimeout=1440 --sessionEviction=1440" # Install jenkins job builder # Create plugins directory, symlinked on host machine -- cgit v1.2.3 From e9cde61ec85f311c40d8d3c0b032a3dbe325fad6 Mon Sep 17 00:00:00 2001 From: Benjamin Copeland Date: Tue, 31 Jul 2018 09:36:06 +0100 Subject: Jenkins: Update plugins This update is mainly to push URLTrigger as its currently broken for a couple of builds. 0.44 fixes the issue. Change-Id: I02956fa93b48f737613cae6181f181349e4571f6 --- jessie-amd64-jenkins-master/plugins.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/jessie-amd64-jenkins-master/plugins.txt b/jessie-amd64-jenkins-master/plugins.txt index 63429e2e..506d3757 100644 --- a/jessie-amd64-jenkins-master/plugins.txt +++ b/jessie-amd64-jenkins-master/plugins.txt @@ -11,7 +11,7 @@ command-launcher:1.2 copy-to-slave:1.4.4 copyartifact:1.41 coverity:1.11.1 -crowd2:1.8 +crowd2:2.0.0 cvs:2.14 docker-build-publish:1.3.2 docker-plugin:1.0.0 @@ -38,7 +38,7 @@ jobConfigHistory:2.18 ldap:1.20 leastload:2.0.1 log-parser:2.0 -matrix-auth:2.2 +matrix-auth:2.3 matrix-combinations-parameter:1.3.0 matrixtieparent:1.2 mercurial:1.61 @@ -55,13 +55,13 @@ publish-over-ssh:1.19.1 rebuild:1.28 repo:1.10.7 simple-theme-plugin:0.4 -ssh-agent:1.15 -subversion:2.11.0 +ssh-agent:1.16 +subversion:2.11.1 tap:2.2.1 throttle-concurrents:2.0.1 timestamper:1.8.10 translation:1.16 -urltrigger:0.43 +urltrigger:0.44 warnings:4.68 windows-slaves:1.3.1 workflow-aggregator:2.5 -- cgit v1.2.3 From e049ac1dd8e32fc636912bdac3fa991dc8ba7a2b Mon Sep 17 00:00:00 2001 From: Omair Javaid Date: Mon, 23 Jul 2018 03:39:15 +0500 Subject: tcwg-base: Add entries for omair.javaid Change-Id: I1b4bddb9c61f123384188af2995897e74302f141 Signed-off-by: Omair Javaid --- tcwg-base/home-data/group | 4 ++-- tcwg-base/home-data/omair.javaid/authorized_keys | 1 + tcwg-base/home-data/passwd | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 tcwg-base/home-data/omair.javaid/authorized_keys diff --git a/tcwg-base/home-data/group b/tcwg-base/home-data/group index 26e4dcb7..a0dbbf79 100644 --- a/tcwg-base/home-data/group +++ b/tcwg-base/home-data/group @@ -1,3 +1,3 @@ tcwg-infra:x:9000:tcwg-buildslave,tcwg-benchmark -tcwg-users:x:10000:maxim.kuvyrkov,alex.bennee,christophe.lyon,peter.smith,thomas.preudhomme,richard.henderson,prathamesh.kulkarni -tcwg-llvm:x:9001:maxim.kuvyrkov,peter.smith,thomas.preudhomme +tcwg-users:x:10000:maxim.kuvyrkov,alex.bennee,christophe.lyon,peter.smith,thomas.preudhomme,richard.henderson,prathamesh.kulkarni,omair.javaid +tcwg-llvm:x:9001:maxim.kuvyrkov,peter.smith,thomas.preudhomme,omair.javaid diff --git a/tcwg-base/home-data/omair.javaid/authorized_keys b/tcwg-base/home-data/omair.javaid/authorized_keys new file mode 100644 index 00000000..4f91f11f --- /dev/null +++ b/tcwg-base/home-data/omair.javaid/authorized_keys @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCoBhUsmuHUwZtRdaZ2Fm8IOTlrCKdz/wxoczhhWufb3Oy9/pNftVcWlrvn3glg+PfCpVFeXvp/7jbFyeJTbrxdli+N0NyZCH5CXHiYTsIHnJngveoxvHe9kGCbqEDtGk+xXsCglyNhGz255sO99e+z0yBGRpZDC1nk4fileaAqm1SoaUbd64swijGFLOyd6KmQnNH4AmQRSBzZJe4vJl2P3kLJ/I5aSZZWWqoeX5bY3LaeNoTGBIfCLwIT4whzkV/V46SpIu0UyS4NSRxXX4cmh3J4cPnPD0zbbWKPCrz3PCBkoo0tnip1Ytw3S7UDCglnCBY+cLKu2AFORTiEzflp9oe3Q/UQQBcxLGibhH+06yw3EZgxejamG4wQ363xiFrRbJDqzdZJAW+WlmCkl+uLD6DaU9gR4iA+OIl5EBlKucnnzPEIybMPVQJ3YTbL+YCisxJ3Qmr8UdIrbtwGsYNMVC1OuM0dP3VznDJ9JzD94/7H3uLI61zSqJdk/B6S0NnsGjtJ++aMyVLjb9swWWBeK7pWZSGmVE+sQYLkf9aitzjJaDaakWoj1pRKSEHSzgJHPq7Hibh/1rxiWxftwP6fE5wy/kfSxfV0Z54PbtrnD6SK92Rtkbfjq2J0klsyo4sWGI5ta9VvqF19PiFfClKgbmef6VucLkvxhQD885qcsw== omair.javaid@linaro.org diff --git a/tcwg-base/home-data/passwd b/tcwg-base/home-data/passwd index 7cf3e8de..f9a98f65 100644 --- a/tcwg-base/home-data/passwd +++ b/tcwg-base/home-data/passwd @@ -7,3 +7,4 @@ peter.smith:x:12314:10000:Peter Smith::/bin/bash thomas.preudhomme:x:13851:10000:Thomas Preud'homme::/bin/bash richard.henderson:x:13410:10000:Richard Henderson::/bin/bash prathamesh.kulkarni:x:11537:10000:Prathamesh Kulkarni::/bin/bash +omair.javaid:x:10174:10000:Omair Javaid::/bin/bash -- cgit v1.2.3 From b61bbe1ec8bd0a3611b208dbefdae60a60cff266 Mon Sep 17 00:00:00 2001 From: Maxim Kuvyrkov Date: Thu, 2 Aug 2018 08:28:04 +0000 Subject: tcwg-host: Fix Omair's authorized_keys and make tcwg-host/run.sh more robust Change-Id: Iae4aa25a2d3503c0e3441ec88b8452f8bc2df4cc --- tcwg-base/home-data/omair.javaid/.ssh/authorized_keys | 1 + tcwg-base/home-data/omair.javaid/authorized_keys | 1 - tcwg-base/tcwg-host/run.sh | 6 +++++- 3 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 tcwg-base/home-data/omair.javaid/.ssh/authorized_keys delete mode 100644 tcwg-base/home-data/omair.javaid/authorized_keys diff --git a/tcwg-base/home-data/omair.javaid/.ssh/authorized_keys b/tcwg-base/home-data/omair.javaid/.ssh/authorized_keys new file mode 100644 index 00000000..4f91f11f --- /dev/null +++ b/tcwg-base/home-data/omair.javaid/.ssh/authorized_keys @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCoBhUsmuHUwZtRdaZ2Fm8IOTlrCKdz/wxoczhhWufb3Oy9/pNftVcWlrvn3glg+PfCpVFeXvp/7jbFyeJTbrxdli+N0NyZCH5CXHiYTsIHnJngveoxvHe9kGCbqEDtGk+xXsCglyNhGz255sO99e+z0yBGRpZDC1nk4fileaAqm1SoaUbd64swijGFLOyd6KmQnNH4AmQRSBzZJe4vJl2P3kLJ/I5aSZZWWqoeX5bY3LaeNoTGBIfCLwIT4whzkV/V46SpIu0UyS4NSRxXX4cmh3J4cPnPD0zbbWKPCrz3PCBkoo0tnip1Ytw3S7UDCglnCBY+cLKu2AFORTiEzflp9oe3Q/UQQBcxLGibhH+06yw3EZgxejamG4wQ363xiFrRbJDqzdZJAW+WlmCkl+uLD6DaU9gR4iA+OIl5EBlKucnnzPEIybMPVQJ3YTbL+YCisxJ3Qmr8UdIrbtwGsYNMVC1OuM0dP3VznDJ9JzD94/7H3uLI61zSqJdk/B6S0NnsGjtJ++aMyVLjb9swWWBeK7pWZSGmVE+sQYLkf9aitzjJaDaakWoj1pRKSEHSzgJHPq7Hibh/1rxiWxftwP6fE5wy/kfSxfV0Z54PbtrnD6SK92Rtkbfjq2J0klsyo4sWGI5ta9VvqF19PiFfClKgbmef6VucLkvxhQD885qcsw== omair.javaid@linaro.org diff --git a/tcwg-base/home-data/omair.javaid/authorized_keys b/tcwg-base/home-data/omair.javaid/authorized_keys deleted file mode 100644 index 4f91f11f..00000000 --- a/tcwg-base/home-data/omair.javaid/authorized_keys +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCoBhUsmuHUwZtRdaZ2Fm8IOTlrCKdz/wxoczhhWufb3Oy9/pNftVcWlrvn3glg+PfCpVFeXvp/7jbFyeJTbrxdli+N0NyZCH5CXHiYTsIHnJngveoxvHe9kGCbqEDtGk+xXsCglyNhGz255sO99e+z0yBGRpZDC1nk4fileaAqm1SoaUbd64swijGFLOyd6KmQnNH4AmQRSBzZJe4vJl2P3kLJ/I5aSZZWWqoeX5bY3LaeNoTGBIfCLwIT4whzkV/V46SpIu0UyS4NSRxXX4cmh3J4cPnPD0zbbWKPCrz3PCBkoo0tnip1Ytw3S7UDCglnCBY+cLKu2AFORTiEzflp9oe3Q/UQQBcxLGibhH+06yw3EZgxejamG4wQ363xiFrRbJDqzdZJAW+WlmCkl+uLD6DaU9gR4iA+OIl5EBlKucnnzPEIybMPVQJ3YTbL+YCisxJ3Qmr8UdIrbtwGsYNMVC1OuM0dP3VznDJ9JzD94/7H3uLI61zSqJdk/B6S0NnsGjtJ++aMyVLjb9swWWBeK7pWZSGmVE+sQYLkf9aitzjJaDaakWoj1pRKSEHSzgJHPq7Hibh/1rxiWxftwP6fE5wy/kfSxfV0Z54PbtrnD6SK92Rtkbfjq2J0klsyo4sWGI5ta9VvqF19PiFfClKgbmef6VucLkvxhQD885qcsw== omair.javaid@linaro.org diff --git a/tcwg-base/tcwg-host/run.sh b/tcwg-base/tcwg-host/run.sh index e2ca6b25..55a0b1b0 100755 --- a/tcwg-base/tcwg-host/run.sh +++ b/tcwg-base/tcwg-host/run.sh @@ -17,7 +17,11 @@ fi while read line; do user=$(echo "$line" | cut -d: -f 1) if grep "^$group:x:" /home-data/group | cut -d: -f 4 | grep -q "$user,\?"; then - new-user.sh --update true --passwd "$line" + new-user.sh --update true --passwd "$line" & + res=0; wait $! || res=$? + if [ x"$res" = x"0" ]; then + echo "WARNING: User configuration failed: $line" + fi fi done Date: Thu, 2 Aug 2018 16:59:42 +0800 Subject: Add arm64 and armhf images for qa/test-definitions Short version git commit hash will be used for image tag so that we know test version included. Image name example: linaro/testdef-arm64-debian-stretch:b6e5458 Change-Id: I7448f315680ad4d8f16bf2ef6d7e8c4106142de0 Signed-off-by: Chase Qi --- stretch-arm64-testdef/Dockerfile | 17 +++++++++++++++++ stretch-arm64-testdef/build.sh | 13 +++++++++++++ stretch-armhf-testdef/Dockerfile | 17 +++++++++++++++++ stretch-armhf-testdef/build.sh | 13 +++++++++++++ 4 files changed, 60 insertions(+) create mode 100644 stretch-arm64-testdef/Dockerfile create mode 100755 stretch-arm64-testdef/build.sh create mode 100644 stretch-armhf-testdef/Dockerfile create mode 100755 stretch-armhf-testdef/build.sh diff --git a/stretch-arm64-testdef/Dockerfile b/stretch-arm64-testdef/Dockerfile new file mode 100644 index 00000000..8a7aaa99 --- /dev/null +++ b/stretch-arm64-testdef/Dockerfile @@ -0,0 +1,17 @@ +FROM linaro/ci-arm64-debian:stretch + +RUN apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y \ + python-pip \ + && git clone -b master http://git.linaro.org/qa/test-definitions.git \ + && cd test-definitions \ + && pip install -r automated/utils/requirements.txt \ + && apt-get clean \ + && rm -rf \ + /tmp/* \ + /var/tmp/* + +ENV REPO_PATH=/test-definitions \ + PATH="/test-definitions/automated/bin:${PATH}" + +WORKDIR /test-definitions diff --git a/stretch-arm64-testdef/build.sh b/stretch-arm64-testdef/build.sh new file mode 100755 index 00000000..ac64154b --- /dev/null +++ b/stretch-arm64-testdef/build.sh @@ -0,0 +1,13 @@ +#!/bin/sh + +set -e + +export LANG=C + +DISTRIBUTION=$(basename ${PWD} | cut -f1 -d '-') +ARCHITECTURE=$(basename ${PWD} | cut -f2 -d '-') +COMMIT_HASH=$(git ls-remote --heads https://git.linaro.org/qa/test-definitions.git | grep master | cut -c1-7) + +image=linaro/testdef-${ARCHITECTURE}-debian-${DISTRIBUTION}:${COMMIT_HASH} +docker build --pull --tag=$image . +echo $image > .docker-tag diff --git a/stretch-armhf-testdef/Dockerfile b/stretch-armhf-testdef/Dockerfile new file mode 100644 index 00000000..ecfab1dc --- /dev/null +++ b/stretch-armhf-testdef/Dockerfile @@ -0,0 +1,17 @@ +FROM linaro/ci-armhf-debian:stretch + +RUN apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y \ + python-pip \ + && git clone -b master http://git.linaro.org/qa/test-definitions.git \ + && cd test-definitions \ + && pip install -r automated/utils/requirements.txt \ + && apt-get clean \ + && rm -rf \ + /tmp/* \ + /var/tmp/* + +ENV REPO_PATH=/test-definitions \ + PATH="/test-definitions/automated/bin:${PATH}" + +WORKDIR /test-definitions diff --git a/stretch-armhf-testdef/build.sh b/stretch-armhf-testdef/build.sh new file mode 100755 index 00000000..ac64154b --- /dev/null +++ b/stretch-armhf-testdef/build.sh @@ -0,0 +1,13 @@ +#!/bin/sh + +set -e + +export LANG=C + +DISTRIBUTION=$(basename ${PWD} | cut -f1 -d '-') +ARCHITECTURE=$(basename ${PWD} | cut -f2 -d '-') +COMMIT_HASH=$(git ls-remote --heads https://git.linaro.org/qa/test-definitions.git | grep master | cut -c1-7) + +image=linaro/testdef-${ARCHITECTURE}-debian-${DISTRIBUTION}:${COMMIT_HASH} +docker build --pull --tag=$image . +echo $image > .docker-tag -- cgit v1.2.3 From 7d3a92308f0d99e1356bc97a1d1c5e546b069b99 Mon Sep 17 00:00:00 2001 From: Benjamin Copeland Date: Mon, 6 Aug 2018 17:54:04 +0100 Subject: Jenkins: Add plugin Add plugin to Jenkins as per #CTT-1438 Change-Id: Ibf2b0c7571b6e9e19cb69bd19d8c529c8cb35805 --- jessie-amd64-jenkins-master/plugins.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/jessie-amd64-jenkins-master/plugins.txt b/jessie-amd64-jenkins-master/plugins.txt index 506d3757..3f0e3bff 100644 --- a/jessie-amd64-jenkins-master/plugins.txt +++ b/jessie-amd64-jenkins-master/plugins.txt @@ -21,6 +21,7 @@ dynamic-axis:1.0.3 ec2:1.39 email-ext:2.62 embeddable-build-status:1.9 +extended-choice-parameter:0.76 extended-read-permission:2.0 external-monitor-job:1.7 ghprb:1.42.0 -- cgit v1.2.3 From 70943e01d971fd86c1daceb3787bfa9c13a65975 Mon Sep 17 00:00:00 2001 From: Maxim Kuvyrkov Date: Tue, 7 Aug 2018 11:10:05 +0000 Subject: tcwg-base: Add ability to ssh to *.tcwglab machines via ci.linaro.org Add ssh-tcwglab-nc.sh script to avoid the overhead of ssh'ing through Germany-based ci.linaro.org when both machines are inside Cambridge Lab. Change-Id: I1434f3215344e7aa2adbc99eb14a6592009ce8fa --- tcwg-base/home-data/maxim.kuvyrkov/.ssh/ssh-tcwglab-nc.sh | 1 + tcwg-base/home-data/tcwg-benchmark/.ssh/ssh-tcwglab-nc.sh | 1 + tcwg-base/home-data/tcwg-buildslave/.ssh/config | 7 +++++++ tcwg-base/home-data/tcwg-buildslave/.ssh/ssh-tcwglab-nc.sh | 9 +++++++++ 4 files changed, 18 insertions(+) create mode 120000 tcwg-base/home-data/maxim.kuvyrkov/.ssh/ssh-tcwglab-nc.sh create mode 120000 tcwg-base/home-data/tcwg-benchmark/.ssh/ssh-tcwglab-nc.sh create mode 100755 tcwg-base/home-data/tcwg-buildslave/.ssh/ssh-tcwglab-nc.sh diff --git a/tcwg-base/home-data/maxim.kuvyrkov/.ssh/ssh-tcwglab-nc.sh b/tcwg-base/home-data/maxim.kuvyrkov/.ssh/ssh-tcwglab-nc.sh new file mode 120000 index 00000000..6eddeb50 --- /dev/null +++ b/tcwg-base/home-data/maxim.kuvyrkov/.ssh/ssh-tcwglab-nc.sh @@ -0,0 +1 @@ +../../tcwg-buildslave/.ssh/ssh-tcwglab-nc.sh \ No newline at end of file diff --git a/tcwg-base/home-data/tcwg-benchmark/.ssh/ssh-tcwglab-nc.sh b/tcwg-base/home-data/tcwg-benchmark/.ssh/ssh-tcwglab-nc.sh new file mode 120000 index 00000000..6eddeb50 --- /dev/null +++ b/tcwg-base/home-data/tcwg-benchmark/.ssh/ssh-tcwglab-nc.sh @@ -0,0 +1 @@ +../../tcwg-buildslave/.ssh/ssh-tcwglab-nc.sh \ No newline at end of file diff --git a/tcwg-base/home-data/tcwg-buildslave/.ssh/config b/tcwg-base/home-data/tcwg-buildslave/.ssh/config index 1b8fb405..140ad7e0 100644 --- a/tcwg-base/home-data/tcwg-buildslave/.ssh/config +++ b/tcwg-base/home-data/tcwg-buildslave/.ssh/config @@ -16,6 +16,10 @@ Host *.tcwglab *.aus-colo people.linaro.org aus-colo.linaro.org lab.validation.l Host *proxy.* ProxyCommand ssh $(echo %h | sed -e "s/proxy\.//") nc -q0 localhost %p +# Access to Cambridge Lab. E.g., ssh dev-01.tcwglab +Host *.tcwglab + ProxyCommand ssh-tcwglab-nc.sh -q0 %h %p + # Access to Austin Colo. E.g., "ssh r1-a7.aus-colo" Host *.aus-colo ProxyCommand ssh aus-colo.linaro.org nc -q0 %h %p @@ -50,6 +54,9 @@ Host *.tcwglab *.aus-colo *.lab tcwg-d05-01 libgomp-d05 tcwg-thx1-01 # Don't warn about "adding" host keys to /dev/null LogLevel FATAL +Host ci.linaro.org + Port 2020 + Host git.linaro.org dev-private-git.linaro.org User git diff --git a/tcwg-base/home-data/tcwg-buildslave/.ssh/ssh-tcwglab-nc.sh b/tcwg-base/home-data/tcwg-buildslave/.ssh/ssh-tcwglab-nc.sh new file mode 100755 index 00000000..24038b50 --- /dev/null +++ b/tcwg-base/home-data/tcwg-buildslave/.ssh/ssh-tcwglab-nc.sh @@ -0,0 +1,9 @@ +#!/bin/sh + +if ip addr show 2>&1 | grep -q "inet 192\.168\.1[678]\."; then + # If we are in one of TCWG Cambridge subnetworks, then use straight nc. + exec nc "$@" +else + # Otherwise jump from ci.linaro.org + exec ssh -Snone ci.linaro.org nc "$@" +fi -- cgit v1.2.3 From af962689afb3904feda0c8da2c482d0c8220f363 Mon Sep 17 00:00:00 2001 From: Fathi Boudra Date: Tue, 7 Aug 2018 14:39:53 +0300 Subject: jenkins: update plugins Change-Id: I07b91eaaf9a2d06648c805258614d9aaf8055ef3 Signed-off-by: Fathi Boudra --- jessie-amd64-jenkins-master/plugins.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jessie-amd64-jenkins-master/plugins.txt b/jessie-amd64-jenkins-master/plugins.txt index 3f0e3bff..d5ea0090 100644 --- a/jessie-amd64-jenkins-master/plugins.txt +++ b/jessie-amd64-jenkins-master/plugins.txt @@ -19,7 +19,7 @@ docker-slaves:1.0.7 dropdown-viewstabbar-plugin:1.7 dynamic-axis:1.0.3 ec2:1.39 -email-ext:2.62 +email-ext:2.63 embeddable-build-status:1.9 extended-choice-parameter:0.76 extended-read-permission:2.0 @@ -34,7 +34,7 @@ htmlpublisher:1.16 ircbot:2.30 jdk-tool:1.1 jira:3.0.0 -jenkins-multijob-plugin:1.30 +jenkins-multijob-plugin:1.31 jobConfigHistory:2.18 ldap:1.20 leastload:2.0.1 @@ -43,7 +43,7 @@ matrix-auth:2.3 matrix-combinations-parameter:1.3.0 matrixtieparent:1.2 mercurial:1.61 -metrics:3.1.2.12 +metrics:4.0.2.2 monitoring:1.73.1 multiple-scms:0.6 naginator:1.17.2 -- cgit v1.2.3 From e83a713d1d50325abd5aecfb44f95a94a4fa04ee Mon Sep 17 00:00:00 2001 From: Maxim Kuvyrkov Date: Wed, 8 Aug 2018 16:20:30 +0000 Subject: tcwg-host: Add docker-stats helper to pretty-print containers. Change-Id: I070bf9df40c0c341e44b359bb2e722f60fa051ee --- tcwg-base/tcwg-host/Dockerfile.in | 1 + tcwg-base/tcwg-host/build.sh | 5 +++-- tcwg-base/tcwg-host/docker-wrapper | 2 +- xenial-amd64-tcwg-base/xenial-amd64-tcwg-host/Dockerfile | 3 ++- xenial-arm64-tcwg-base/xenial-arm64-tcwg-host/Dockerfile | 3 ++- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/tcwg-base/tcwg-host/Dockerfile.in b/tcwg-base/tcwg-host/Dockerfile.in index 8d219ba1..cb6e235e 100644 --- a/tcwg-base/tcwg-host/Dockerfile.in +++ b/tcwg-base/tcwg-host/Dockerfile.in @@ -1,6 +1,7 @@ FROM linaro/ci-#{ARCH}-tcwg-base-ubuntu:#{DISTRO} COPY docker-wrapper /usr/local/bin/docker +COPY docker-stats /usr/local/bin/ COPY run.sh start.sh / diff --git a/tcwg-base/tcwg-host/build.sh b/tcwg-base/tcwg-host/build.sh index f18f3752..6205035d 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 docker-wrapper run.sh start.sh + rm -rf docker-stats docker-wrapper run.sh start.sh } export LANG=C @@ -16,7 +16,8 @@ name=$(basename ${PWD} | cut -f3- -d '-') image=linaro/ci-${arch}-${name}-ubuntu:${distro} top=$(git rev-parse --show-toplevel) -cp $top/tcwg-base/tcwg-host/docker-wrapper \ +cp $top/tcwg-base/tcwg-host/docker-stats \ + $top/tcwg-base/tcwg-host/docker-wrapper \ $top/tcwg-base/tcwg-host/run.sh \ $top/tcwg-base/tcwg-host/start.sh ./ diff --git a/tcwg-base/tcwg-host/docker-wrapper b/tcwg-base/tcwg-host/docker-wrapper index 883a8038..2cfea5c9 100755 --- a/tcwg-base/tcwg-host/docker-wrapper +++ b/tcwg-base/tcwg-host/docker-wrapper @@ -1,2 +1,2 @@ #!/bin/sh -sudo /usr/bin/docker "$@" +exec sudo /usr/bin/docker "$@" diff --git a/xenial-amd64-tcwg-base/xenial-amd64-tcwg-host/Dockerfile b/xenial-amd64-tcwg-base/xenial-amd64-tcwg-host/Dockerfile index ba5cd020..48b28d26 100644 --- a/xenial-amd64-tcwg-base/xenial-amd64-tcwg-host/Dockerfile +++ b/xenial-amd64-tcwg-base/xenial-amd64-tcwg-host/Dockerfile @@ -2,9 +2,10 @@ FROM linaro/ci-amd64-tcwg-base-ubuntu:xenial COPY docker-wrapper /usr/local/bin/docker +COPY docker-stats /usr/local/bin/ COPY run.sh start.sh / ENTRYPOINT ["/run.sh"] CMD ["start.sh"] -# checksum: 476d3063728acd718302d2d7bad5e711 +# checksum: 9f94a8be2756ffabb6ebafa75127f228 diff --git a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-host/Dockerfile b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-host/Dockerfile index 22a4ea80..34f161bd 100644 --- a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-host/Dockerfile +++ b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-host/Dockerfile @@ -2,9 +2,10 @@ FROM linaro/ci-arm64-tcwg-base-ubuntu:xenial COPY docker-wrapper /usr/local/bin/docker +COPY docker-stats /usr/local/bin/ COPY run.sh start.sh / ENTRYPOINT ["/run.sh"] CMD ["start.sh"] -# checksum: 16cc73e3d44c8ab0cae45ab9cf83ab32 +# checksum: 8498aac781566adf4cb5a246369137bd -- cgit v1.2.3 From 3935d77fd7693cf57d726ae6229c0387377e0f35 Mon Sep 17 00:00:00 2001 From: Maxim Kuvyrkov Date: Wed, 8 Aug 2018 16:26:51 +0000 Subject: tcwg-llvmbot: Remove handling of APMs and add handling of linaro-thx1-01 Change-Id: Ibd256fe442bef9790b7302a446fd6ec56846ac02 --- tcwg-base/tcwg-llvmbot/start.sh | 30 ++---------------------------- 1 file changed, 2 insertions(+), 28 deletions(-) diff --git a/tcwg-base/tcwg-llvmbot/start.sh b/tcwg-base/tcwg-llvmbot/start.sh index 18e5fa50..38ee277b 100755 --- a/tcwg-base/tcwg-llvmbot/start.sh +++ b/tcwg-base/tcwg-llvmbot/start.sh @@ -39,21 +39,6 @@ case "$buildmaster" in masterurl="$buildmaster" esac -case "$mastername:$slavename:$(hostname):$image" in - # No restrictions for custom masters: - custom:*:*:*) ;; - # Almost no restrictions for the silent master: - silent:*:linaro-armv8-*:*) ;; - silent:*:r*-a*:*) ;; - # Restrictions for the normal master: - 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. @@ -62,19 +47,8 @@ case "$mastername" in *) cpu_shares=1000 ;; esac -case "$slavename" in - linaro-armv8-*) - # Use 64G out of 128G. - memlimit="64" - ;; - *) - # Use at most 30G or 90% of all RAM. - memlimit=$(($(free -g | awk '/^Mem/ { print $2 }') * 9 / 10)) - if [ "$memlimit" -gt "30" ]; then - memlimit="30" - fi - ;; -esac +# Use 64G out of 128G. +memlimit="64" case "$slavename" in *-lld) pids_limit="15000" ;; -- cgit v1.2.3 From 83411f402c519b8d090b5aace4948f4d2689fd8c Mon Sep 17 00:00:00 2001 From: Maxim Kuvyrkov Date: Wed, 8 Aug 2018 16:52:35 +0000 Subject: tcwg-llvmbot: Remove mentions of APMs. Change-Id: I443dd52239f5f2cbbdea33fbeb79b5b681d8fa4b --- tcwg-base/tcwg-llvmbot/run.sh | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/tcwg-base/tcwg-llvmbot/run.sh b/tcwg-base/tcwg-llvmbot/run.sh index 272df643..aec8e31b 100755 --- a/tcwg-base/tcwg-llvmbot/run.sh +++ b/tcwg-base/tcwg-llvmbot/run.sh @@ -6,8 +6,6 @@ bare_metal_bot_p () { case "$1" in "linaro-tk1-"*) return 0 ;; - "linaro-apm-02"|"linaro-apm-05") return 1 ;; - "linaro-apm-"*) return 0 ;; *) return 1 ;; esac } @@ -20,8 +18,8 @@ use_clang_p () # Typically we've used clang when the default gcc has problems # otherwise gcc is used. case "$1" in - *-libcxx*|linaro-tk1-01|linaro-apm-03) return 0 ;; - *-lld|linaro-apm-04) return 0 ;; + *-libcxx*|linaro-tk1-01) return 0 ;; + *-lld) return 0 ;; *-arm-quick|linaro-tk1-06) return 0 ;; *-arm-full-selfhost|linaro-tk1-05) return 0 ;; *-arm-full|linaro-tk1-08) return 0 ;; @@ -88,7 +86,7 @@ EOF chmod +x /usr/local/bin/c++ case "$2" in - *-lld|linaro-apm-04) + *-lld) # LLD buildbot needs to find ld.lld for stage1 build. GCC does not # support -fuse-ld=lld. ln -f -s /usr/bin/ld.bfd /usr/local/bin/ld.lld @@ -104,8 +102,8 @@ EOF n_cores=$(nproc --all) case "$2" in - linaro-apm-*) hw="APM Mustang ${n_cores}-core X-Gene" ;; linaro-armv8-*) hw="${n_cores}-core ARMv8 provided by Packet.net (Type 2A2)" ;; + linaro-thx1-*) hw="${n_cores}-core ThunderX1 provided by Packet.net (Type 2A)" ;; linaro-tk1-*) hw="NVIDIA TK1 ${n_cores}-core Cortex-A15" ;; esac -- cgit v1.2.3 From ac215e412e180d38081b02d78713ebf2b44ffb9a Mon Sep 17 00:00:00 2001 From: Maxim Kuvyrkov Date: Wed, 8 Aug 2018 17:37:28 +0000 Subject: tcwg-host: Add missing file Change-Id: I94007dbcfc385248c59bc6eb3dca593b69980a66 --- tcwg-base/tcwg-host/docker-stats | 3 +++ 1 file changed, 3 insertions(+) create mode 100755 tcwg-base/tcwg-host/docker-stats diff --git a/tcwg-base/tcwg-host/docker-stats b/tcwg-base/tcwg-host/docker-stats new file mode 100755 index 00000000..e981aa5a --- /dev/null +++ b/tcwg-base/tcwg-host/docker-stats @@ -0,0 +1,3 @@ +#!/bin/sh + +exec watch docker stats --no-stream --format "\"table {{.Name}}\\t{{.CPUPerc}}\\t{{.PIDs}}\\t{{.MemPerc}}\\t{{.MemUsage}}\"" -- cgit v1.2.3 From e9632d71f3c164ce8d7d468d441eb09fbb1fc60a Mon Sep 17 00:00:00 2001 From: Maxim Kuvyrkov Date: Thu, 9 Aug 2018 06:57:59 +0000 Subject: tcwg-base: Fix typo in tcwg-buildslave's .ssh/config Change-Id: Ie3ad8ea9768d987c92eccefbd981c22b9074d565 --- tcwg-base/home-data/tcwg-buildslave/.ssh/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tcwg-base/home-data/tcwg-buildslave/.ssh/config b/tcwg-base/home-data/tcwg-buildslave/.ssh/config index 140ad7e0..ba32e1ef 100644 --- a/tcwg-base/home-data/tcwg-buildslave/.ssh/config +++ b/tcwg-base/home-data/tcwg-buildslave/.ssh/config @@ -18,7 +18,7 @@ Host *proxy.* # Access to Cambridge Lab. E.g., ssh dev-01.tcwglab Host *.tcwglab - ProxyCommand ssh-tcwglab-nc.sh -q0 %h %p + ProxyCommand ~/.ssh/ssh-tcwglab-nc.sh -q0 %h %p # Access to Austin Colo. E.g., "ssh r1-a7.aus-colo" Host *.aus-colo -- cgit v1.2.3 From 9a15d8b58e07a4f7f85968c9ec895cb4fbc9164c Mon Sep 17 00:00:00 2001 From: Maxim Kuvyrkov Date: Thu, 9 Aug 2018 13:39:36 +0000 Subject: tcwg-base: Update known_hosts to include ci.linaro.org:2020 ( hosts=" ex40-01.tcwglab.linaro.org aus-colo.linaro.org lab.validation.linaro.org people.linaro.org git.linaro.org git-us.linaro.org dev-private-git.linaro.org review.linaro.org dev-private-review.linaro.org " ssh-keyscan -t rsa,dsa,ecdsa $hosts hosts=" review.linaro.org dev-private-review.linaro.org " ssh-keyscan -p29418 -t rsa,dsa,ecdsa $hosts hosts=" ci.linaro.org " ssh-keyscan -p2020 -t rsa,dsa,ecdsa $hosts ) | sort -u > tcwg-buildslave/.ssh/known_hosts Change-Id: Id185530e1a7968f0707b516a78d8b6569e1fd7cd --- tcwg-base/home-data/tcwg-buildslave/.ssh/known_hosts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tcwg-base/home-data/tcwg-buildslave/.ssh/known_hosts b/tcwg-base/home-data/tcwg-buildslave/.ssh/known_hosts index b649d65f..a1a108b4 100644 --- a/tcwg-base/home-data/tcwg-buildslave/.ssh/known_hosts +++ b/tcwg-base/home-data/tcwg-buildslave/.ssh/known_hosts @@ -1,9 +1,12 @@ aus-colo.linaro.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBP8apVdw/JC+4rOiq/eG2LgjwJPCqKIlG/RwPVDe1VNOdtrmR6VnTQ5oQYkwt00h2rdI6dVzdW8Q9za7PGW6Sls= aus-colo.linaro.org ssh-dss AAAAB3NzaC1kc3MAAACBALdjDe/FnDjKDz+QzKWD/J1jIVVjied+1EFcxZ/uyGw9uZwVjReHP6ehGQCtQEM+SDklOXc6bz9UeBjG6+gDGXWBmldbS2yXvvxFmmbOf40h/rVFKq0CW/tJxyONoaf75Qj+aOyo3iUXMl+jJowb+LR5j0zbdTrSkM2qEsP8o0b3AAAAFQDfNOi88rFXdks5xpzmiKs0fzyYGQAAAIEAnzYTZ0dDAua6FHgqfoNVZHS4CV/le6G5FFCc4Kp4lB9ijRMjrDZNey5BkCooetqOBuPF8mYYAgZ28NemIUvvTenddfHFzWQTPl0meAdUhBW4EJMq0HWEV+kUKANUah2QlXWx8/g1x3cOhBzABTMOEBUFnlMx9d5A71JZypEN5UQAAACACiH996M1x/DjYmMp6BLwglYMDjQPrfI7QhNwa/8/wukDHlB6puB/HdPyxYZp/IVShHze6C3YpmV+dXxc85/vMNoVRx02ICC2gTkm2MoSFgaW1nO95tRPtyJ4AXa4ev4D22hNPF5SxgXfn2lT4uH8bWxvTrzgHs7JhAzD0oRbOh4= aus-colo.linaro.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCg5vMfuBLRroqEb6+CFLQikh1Wq6UD++SODY7bSdPDfN1wmurdp60AdVU+22nOXgK78mwYPJ0PEcTBMSE+OmryfZFDZm/+aPbALid/vFs8NuvFmEQ8vecEBPDGxJ3RpVxkNG5BrWMTJjWMJTCFdIh9my5vhBPEloAuDRthRNaRwvgqRw3GJAbSG2Cg4ZgOQi7Lv3ogQ/M3nXzy8KMp4KD7AtncylguPoVwDxNwjl+YoEujZDvpM4UiZDnh+Gxeru3EnEIgDvwbMizlrKL8Tm+2gA+j3cWkgIjCVJM+PW8V0aobp681ChqlbDlzK0oVmwUafdVv3dxzOSrjQH2rkaOn +[ci.linaro.org]:2020 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBJW1L7ZeT7dC/otESvOQl8KZ/VlV08z0rmUPwwVJvDbuAlh6Qpn5LVPRe7IFEU/qePQQEKzn1Kw7x6Ces3e5mck= +[ci.linaro.org]:2020 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCzIJCEw5MSW713q3I95jORM6fkdx22Z+eeanVvAy8fGssvh0QHZtG8kpesQLWmtaOxkkRwURK+ui4OnoO/FCaRGWX0SUpnHxPF23OcwejLGXX9uAhtFY8s2hyvdrWDyB4vGjNjqT8NhnciETy3WNV0D0tKCfwEy6WkjIM0B9acrDxhYYDLqSXWUBAdJ7J8Mgg/L1nAPWM8DC0H+5SmzYvfxxnzprq/EvLDL950262WN10nzx2KsFD0zCW4eggp2Qcqa5XX6Ou/gHfIW8J8gncOjfpR4c6DN9NS7rX71F7BsLhkMwu1GwKhf09qvtGT3LdR2ilNOG36Uvq7WksiBofr dev-private-git.linaro.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBOvq8E5HPzrBlxmckzsE3rz9LAx9c0faEfofALaO+UGC4HAst9fMaZcHaCqu+b8SVY/2VcBvMYMwO1ZPgOn0rXs= dev-private-git.linaro.org ssh-dss AAAAB3NzaC1kc3MAAACBAK10xjDXtqiW6S02TFvIQUmjTyu+tpiT0IVTp5dlZX5rT1EDi4DtRgtoO/R4WncAs0GE8FqaI/IqljuYlJbHOrFCxU3OWKB+z2Ue3oXs3kouoFP3coF4exBZLEBX4JQ/HI5Ii88fnE/U70/+wN/mMAtcOrsgGWGXOv8yFZEQaKJJAAAAFQCfVbaD5KdaABTLwQ8CXRuZ+PAeHwAAAIBmppcf9sx9M4KAgiOQRGW+7/eImJHFRazQSe8Qbiqo0H7OQhIRcLIm6+PAtKgxxSaQErAo4z/xM7d2lhqOyydK5GDpILgV3qHUFAgQ9vajL+ga5/VeRTqg6R91kYgIKnEl3y8/iW6eRcJF/jzYfDcaFG0Z3gsOtHzjTsCuV8KMLwAAAIBupI2LDTsUYa64hSKvGhEVPMj8VKx5RX4NWQU/dlNNhlFRTzV42giujZ146vH5SGqagR3daX+o6Xm++GDJ+AedzJ8zBc9dAwU7ao4fd23bsyURvNxC7K5DKJnlCDS6xk+6wv6Hz9VdbaIEE5TPxSGqZEOK1V+pbgv+cMUGACy43Q== dev-private-git.linaro.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC34bjTOKJIq8MVSeC5gddQlbR0hyvvTZbrpW7KXgCzkLTFZxa05wbz8VC1l7ruPotQBgrICgLYmrbjrASqcY//9OPLDa1Pf/MUIu2F2lA1W/5E3psGYmyC9GTvmjKgu39Rad5ujXMeMLjuzVPCmo+WhewgugDSV4Fcggd6B6YXHGtoE15ctSw4moerUq1+2BXVgFxUyMoGcpSCeLnbvWpmi6xWoGQOSnrQ4Z/VmZ5WZ87vQsiiWEAsqmMOHHacunnSph7uzQXJlHNajdeGnr2NF+EgcmQ0N6vivZDRLmRYuSmizjCOHSRZxSm/0UJC/ewVzp9BwRepiNKWsjb4gTMb +[dev-private-review.linaro.org]:29418 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBDZ6AQ2WyZSO43657/fFpxGgVY73kUwh1R1eXpZp27T6lAI5XFQ7YS8HjQ2O7e4edGSpJHHrqVuZphKpqu11Lz8= [dev-private-review.linaro.org]:29418 ssh-dss AAAAB3NzaC1kc3MAAACBAM596jW8Kbsh/ApdoP3r7UvrSOzhnoG1ZHYngER+Dd9e0iGJY1Wbpth7ngngpALl3PQQ99R5xUt8wvcOcICq+vF34FR/Gym+7VjaMLI7DxF48OrUAJnx6zINNlpXbMAI0nptWcKoL/xdmC7AoBOjH1Q+jGTiKISmXTE1w5iK8qp3AAAAFQDwzizM3qhYdknasNV/vp84o19FWQAAAIEAqLjr9vNsgr1snOdyKOhRuyidqf/zThaxuJaUktxLDKU0DDip+FGqLYiS2VzNuSWMaKjkBjITBi0sXktmUhhbPvBHhyzLy3Hz6BOdXpUAoq70QMOcocE9IsEfmqtkOsx/BZ1uCV6W051Gsci4PxK16q9zolpAEp4/3wEWGH+ueJIAAACAERdZ+vCZl6iDzq6XpYFKZ1r6i/CjX5KIBWKCzoN/Z8fo96rZqFA23G5tXM8+YMYnLdwb/qvNSCz6dWpH2FMS4yj7zo2l3GjguC8JOfar0Rt8fihJyaynX+rD/aP3b+h5ot1b/645qrfvpfmeh3gZt3c1kjy5fyopujyGNTUtq6c= [dev-private-review.linaro.org]:29418 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCofUDWYYwzE4YWotCffwCxLoRuVCMb6DP+eObwbTPHMe5asK94Y1jPNeK1yUVJIuIAUO8aA6pIq3uLKlusyGLZe1YBpM+7YX3HMOBfCOeOemHFxETlj/HC7islYLYT7Sm/DweiN1kxgP8Q/PhPIA5czCZGHS/+T/VLbMApyyzdTmswaqfgJejyK9juHAcmxT3Tupj2SGOuOamyKfhfsPxGwIchivy/mt7xBTk5cNiSDeLAfMn2rHsilfLjb+IoeE6EvtqG3+rTh+ttulHp2vSeZkK79tuyVWt+XOZjD4RDfk1taW9JjaafkyOW0VCF4gqOMfJU24u88xTCgqkgT1bN dev-private-review.linaro.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBOvq8E5HPzrBlxmckzsE3rz9LAx9c0faEfofALaO+UGC4HAst9fMaZcHaCqu+b8SVY/2VcBvMYMwO1ZPgOn0rXs= @@ -18,11 +21,11 @@ git-us.linaro.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdH git-us.linaro.org ssh-dss AAAAB3NzaC1kc3MAAACBAJbwbYgvbS+8vnlhJLe1AwgvbBqu0kBw7pBjQgF47lXRKqZbzwQc+hHmMbczJOfIoo1PX39Ifhz142u+yN7PQgUlU+jzI2Q9cjSqfrS02rV0cU2TQRKvgTQH89qMk2M0jOimcz1UCZkCgS2wj6hb1HU9pkhzpH7d+1/M/31Xc5uPAAAAFQC82/+3qHmNd8G8mrPJz9LfdUpsmwAAAIASypGV3LlIOE3bDlZwgr3rZ+44MPq7c16SbpjnjqbsOzPAyllD8MeY0eynuDqtGtT4RtC8uRgmgw7MW1HtYnTSlYt0up66LT19LCRKme8CVtggqjwLTUEKWmrdbe+PSvczKjeszOD0R5qGasSvOOKMJ5jLMnJ9jMhHhItc53eM5AAAAIBXWdudBBziVVk9VE+z1kvOYsCGYosLglqzJMsFfVQh948Ci9PowKx8xognWEtdaZW7+2oEIwL8QR+zPtzNY447i6iRuJy1TaDZfJU8nTfr07KoXB4B7rhADByXl4x9Uk25m9n9XjF/ctjIzyspvcRpqZXMHBUuZalID6E39YJqnA== git-us.linaro.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8Q8j887I9mBD2va9C7gWl4Cr8agHWxuFHfDUWaqiygI9jA4w2YC7mo5oJMqwUk2DsvPDLuU5Z6yyKSA7Cko+L0MnKfNMzQ8e00ZXGDBq8bh1tRKstFselAFmmg+5DhM9q9HPjpKYzbAxU6rxmdFbSc+ktE0rhtmciThVT3YW3bMs3g+D+6sf6ER9UkSpbdZ7skKFXBHw2t1BWaPrvW4L8GMFAokgXUKOE8e1WZkQuCcseIz8J9Hz1p/liyiiTPVQnjGyleUnUY0pZA3ViB6pS317BH5Kvd8aX8x0vSwCIs30rpkmBam9C0b2uj2jWk3GrmHYjVHebMAW376VSLTZV lab.validation.linaro.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBFZDLd4f9cph9A64+kXUpGvuRmInB3HAtHU9T6wVIsp4HkYLLZD59I4lF/u2VLfM7j10XMNPO7ybOJMM+1zIZlM= -lab.validation.linaro.org ssh-dss AAAAB3NzaC1kc3MAAACBAK75t/OG68cN0mtVNrliCi8/7tajozJQDGvxgnpben1F84IzWNJpBdtEgaXeo3zD0cQl1nM5IftBjSKMkomdsaDh7u6A57juaANU9NKIXW2BGmaICZxllFAb/Cmnq4mDnZJ33G5UyGPVA49bUEKw8DLe8FLVlO/wcghJhjoy7prZAAAAFQD8zrwLDwd4M4vKKWu9nju7fI3oywAAAIBVE6ykor/q56qYTYqaAvcRkq7331jdYHTqiAVcO9KyrdOS7yCgtb2Dw+O0rq5ftLSF73ad5ACbw+XbzQVJAeKDaDs5mLf3eYF0+3YODFRHYDsbbihO0uZcGHFPvGDD9odBZhWFIZaFSdboodSuyzxIgLu0EZAsHoSP2wjTGdiXFwAAAIAkPcANYxo0jm8BuCEYR+SXXS4aj83dUGbPP54UU7M+jrrfG1M+JVFh3kEsXr9zptZajY+NrqlnXqPp4HZyORUUEN+Szkjbd2p8CCCQvv1PODGJtXFzwpatUP27I2ik/lZG9OXxBQkO+QxjuJ+pcjXPdBRz6DwWoUM63+QFXBLpsw== lab.validation.linaro.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDtto5bsPJ3NuXsWtwMR8bsAzLvkBstmF1QP+eC6jUBsCDHMtBW/zAWJYNPDr30vRkV7J8D64Pd91rgjbqF8mOPDlyVlln03dYtOV3hzVuXLZfxodslJsw4lB+ZhxLfcZAKqqFURJEhrJNJmtFBprxFRbdS1iQHJHJohg3zS9zlLFvUpZGWooLFEM2z2NdUfSiR12ePvdW1YsEimJR/b3h1it/Wot0uEB6VONZGyMrrWvsntJV1NdQFxJR8waTz1sBvQQBJGX+SgEXY1CB3AUiF4yIy5WZ/4YCOk0kO9qABvV0Ks357OU5uY5GMgalAy2RJyvceNf6erlR4vwmpdnDH people.linaro.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKKtlH9IGVw1wE3daicRzyOdIM9MzWfUH1tUB8R/md36RDTSqG8VGYrn1E5pJcs7rsk05ZCUQIaglefMytoOvQ8= people.linaro.org ssh-dss AAAAB3NzaC1kc3MAAACBAOnQwFbvISNteLPMb/Srm2xwFDrxDql+kxtlZyohrSZ72K9GDg+dqb4W7/QiVrOMhfRzaL93Hj/FLCxKqUXdnTQqekqGosRQK7fLNJvh6DNizoJ+aWzKp1EL3kF2GgKP33ZPtRJYrBdxnc+DDc0yP/He3cyrzbg1nsWSedc1MMVpAAAAFQCm3xIrM1iR9ozuyjKRGwhnrKo9GQAAAIBkdN4dNB298m+2aXqMmLOj1Ry9/S6CTiMn5c9T/luYpWFRnsyuHlBIcZFjyOMtU3bc8b7KwqP8t3XTQbolbqtYOWqPeiaIH/VAk7w9o1tePRwtbTadksYw+UJGtn9c+52uQfGZdjfyjsKs7hEWgE72gTeIb9g1QZ+WCoVfSzNacgAAAIA9T2ONJcRFX3heeDcl6gho8Wj264GDhS5/iqdMCClO3wKUY04hPSpXKRhRm/zzFGb9537Qj6LluDAcg+m/D0FnoQkILLXnfiMnrlyoCCA/jZWrVZw8aQdDHM5LlDdDZKZV7djkbjF0nVvWRTrvc20yQeDLLImaTDOfYjmJ75L1vQ== people.linaro.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8OveP3mffvlzMEGuZQzol8zoDwCdAzrNiBfX9rv6lDGr86Sl4MVKs/6cYdjbtrUJD7ls5gc8cfjH5EXPh/HuoBj7Bi+UNfyyGSqrZgTFPpyLx50QJDeogcUN54NL+N/X6HtQtyvGwEXgb26S9ec7LFfyxqT8Yy370XH/y7qAtJgS3UTkf8kzIWgZQvU5MU3FqhOn9mzI+KqsBMRKt0JpW7H2VRYiaHqpshwpuNHRDEQBMnRVHDpo8SZRq21pwRjdTzuzGJv2enCW018jWC/HMmTaaDWzX6SO+JQs9NFVUpM6hg+ysa5piDXnCNQ8Ry6l0nlAjgUt92NEe4OeANrt9 +[review.linaro.org]:29418 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPzkmW4axU/BXRtRkR42I8FVvWjGhB4CUtTC3cSkhu6L0Oo9i+ija/hahkPT0DC+S0k/vEL7s4mC5SrdNCeJO/0= [review.linaro.org]:29418 ssh-dss AAAAB3NzaC1kc3MAAACBAPB0SE19HQ0dEtm3Unp7+JiNeHlIWNs4j9yN+2Q/fxmBT2ZZ0a5I4gg63b5rM/1Li/6k0f/CtSYBH/mhmjKaEKIQV/c/lmuZivUAfTPT0ld3voXHwRhgpWI/WOiRdsTRZZW2yUHx/troO53mx4eIISKfab+t+vCU5Af+sgTBF6InAAAAFQDGR2ccfQSWVuSyzgvK8f7FT8olTQAAAIBHZqySRfjEnnx9h0aS6i2H21dmZxUllwIJpdpS6XWzvMzVwBb1DKx8bO0WwZeTnxxs1BKVAjmSDkDGYJWHxyU8kQ8aFsBo0KwbNEKXozaK3Gf2YF289xQsigbtPUWYXDz1PNEXtIS9AXdCRq4i09ujO3ayxq4lX2n0LIQ4IhM+RgAAAIB2SvnzVadjW14AN9F9ZEfnK0JRpBTKjz+kQSS1TJiRI/dSHG6CwwXjD1G9YW8mfGhPOPYHIE2MF2n7d7DfqBdeeee0PnwBQ0YBc5qfhQ9Gpi+hqXSem1YaD2YRG40que5bu/Rd6NksnSLg/93Z3L3fN+qTeApRqHQWRrfswGgi+A== [review.linaro.org]:29418 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDMfTLkTmsbtahAiVJTKXRFbR9MQ/vDH/JPj4QN3XPHJuubxLhUf8WObEBtML7J11uvVM1oDTwM5YG5yjyBnc+85OaQaB9tMPDheGhfMG40F4vxdSnQL29ihyrls0hrFTY9UZ4Y2FmJwYL0rOnGU7iPyNuExQwfg2bkdw67aH9nEGjSd2eXYl2bI4DHujy5GJiV3dR9TlUF0iaSeHVSIX5t9I/BXK+AiSqHTrvwdGGi9XvL6xEWYMOZOpJnCH8Q4OSibsFfQXnCMgIFeO7J/ZMGXqltXOtztgQMr8VvRRD3S+Lcp8yKb5aUjWwoCxb4YzEUbQE04SRVeAGjsfNJcXgT review.linaro.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBONeIVl09BaG0iDOqF/qZjDun8fktYdD0Zl2fRAkSGT6Q7ULAXWJZA7IwstvcSs5w9SRV6x/lNc3CqlHwMFaABc= -- cgit v1.2.3 From aec55bc67373704e3da23d4d28bb6f6faeadd516 Mon Sep 17 00:00:00 2001 From: Maxim Kuvyrkov Date: Thu, 9 Aug 2018 15:54:40 +0000 Subject: tcwg-base: Use a better heuristic for detecting Cambridge network ... which works inside docker containers with their own sub-networks. Change-Id: I538d08d4f5ddd5a0714c076269319c7844416d8b --- tcwg-base/home-data/tcwg-buildslave/.ssh/ssh-tcwglab-nc.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tcwg-base/home-data/tcwg-buildslave/.ssh/ssh-tcwglab-nc.sh b/tcwg-base/home-data/tcwg-buildslave/.ssh/ssh-tcwglab-nc.sh index 24038b50..d088179f 100755 --- a/tcwg-base/home-data/tcwg-buildslave/.ssh/ssh-tcwglab-nc.sh +++ b/tcwg-base/home-data/tcwg-buildslave/.ssh/ssh-tcwglab-nc.sh @@ -1,6 +1,6 @@ #!/bin/sh -if ip addr show 2>&1 | grep -q "inet 192\.168\.1[678]\."; then +if grep -q "nameserver 192.168.16.3" /etc/resolv.conf; then # If we are in one of TCWG Cambridge subnetworks, then use straight nc. exec nc "$@" else -- cgit v1.2.3