diff options
74 files changed, 594 insertions, 425 deletions
@@ -24,6 +24,23 @@ 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. +TCWG's Dockerfiles in DISTRO-ARCH-tcwg-base/* directories are generated +from Dockerfile.in templates in respective tcwg-base/* directories. Run +tcwg-base/generate-dockerfiles.sh (without parameters) whenever you +change any of Dockerfile.in templates -- this will update all affected +Dockerfiles. + +Once Dockerfiles are regenerated, you should test your change locally +by building the image. For this go to image's directory and run +"./build.sh". "./build.sh" script uses name of current directory to +determine distro version and other parameters, so it's important +to run "./build.sh" from its own directory. + +Note that "./build.sh" will first re-build all images that current image +is derived from. E.g., *-tcwg-dev image will first re-build respective +*-tcwg-base image -- this can take a lot of time for the first run, +but, once cache is populated, re-builds are very quick. + Maintainer(s) ------------- diff --git a/bionic-amd64-tcwg-base/Dockerfile b/bionic-amd64-tcwg-base/Dockerfile index ab133638..1e639a57 100644 --- a/bionic-amd64-tcwg-base/Dockerfile +++ b/bionic-amd64-tcwg-base/Dockerfile @@ -1,9 +1,12 @@ # Auto generated from tcwg-base/Dockerfile.in. Do not edit. FROM ubuntu:bionic +# Unminimize Ubuntu Bionic to install contrib files of git (after package +# update, otherwise unminimize's "apt upgrade" might fail). RUN true \ && apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get dist-upgrade -y \ + && echo y | unminimize \ && DEBIAN_FRONTEND=noninteractive apt-get install -y devscripts \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ alien \ @@ -40,14 +43,19 @@ RUN true \ less \ libexpat1-dev \ libglib2.0-dev \ + libgmp-dev \ liblzma-dev \ + libmpc-dev \ + libmpfr-dev \ libncurses5-dev \ + libpixman-1-dev \ libpython2.7-dev \ libreadline-dev \ libssl-dev \ libtcnative-1 \ libtool \ linux-tools-generic \ + linux-tools-4.18.0-13-generic \ lzop \ make \ mingw-w64 \ @@ -72,6 +80,7 @@ RUN true \ texlive-fonts-recommended \ texlive-latex-recommended \ time \ + unifdef \ valgrind \ vim \ virtualenv \ @@ -85,8 +94,7 @@ RUN true \ /tmp/* \ /var/tmp/* -# Ubuntu Bionic has a quirk in installing contrib files of git; skip for now. -RUN true \ +RUN install -D -p -m0755 /usr/share/doc/git/contrib/workdir/git-new-workdir /usr/local/bin/git-new-workdir \ && 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 \ @@ -101,7 +109,25 @@ 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. +# Add ninja with support for memory-threshold job limitation. +# It's installed with ".bin" extension and containers then +# make wrappers around it in /usr/local/bin/ninja as needed. +RUN git clone -b master https://github.com/maxim-kuvyrkov/ninja.git \ + && cd ninja \ + && ./configure.py --bootstrap && ./ninja all && ./ninja_test \ + && mv ninja /usr/local/bin/ninja.bin \ + && cd .. \ + && rm -rf ninja + +RUN mkdir /tmp/docker-install-qemu.$$ \ + && cd /tmp/docker-install-qemu.$$ \ + && qemu_ver=3.1.0 && wget --progress=dot:giga http://download.qemu-project.org/qemu-${qemu_ver}.tar.xz \ + && tar xf qemu-${qemu_ver}.tar.xz \ + && mkdir build && cd build \ + && ../qemu-${qemu_ver}/configure --prefix=/usr/local --target-list=armeb-linux-user \ + && make all install -j $(nproc --all) \ + && cd && rm -rf /tmp/docker-install-qemu.$$ + COPY home-data/ /home-data/ COPY new-user.sh /usr/local/bin/ @@ -120,4 +146,4 @@ VOLUME /tmp EXPOSE 22 CMD ["/usr/sbin/sshd", "-D"] -# checksum: 4b61b97898b5eb0c598c220cc2d50f6a +# checksum: af1326e7c8496d13d3b9983562697055 diff --git a/bionic-amd64-tcwg-base/bionic-amd64-tcwg-build/Dockerfile b/bionic-amd64-tcwg-base/bionic-amd64-tcwg-build/Dockerfile new file mode 100644 index 00000000..2805cc4b --- /dev/null +++ b/bionic-amd64-tcwg-base/bionic-amd64-tcwg-build/Dockerfile @@ -0,0 +1,24 @@ +# Auto generated from tcwg-base/tcwg-build/Dockerfile.in. Do not edit. +FROM linaro/ci-amd64-tcwg-base-ubuntu:bionic + +RUN while read line; do \ + if [ x"$(echo "$line" | cut -d: -f 4)" != x"9000" ]; then \ + continue; \ + fi; \ + new-user.sh --passwd "$line"; \ + user=$(echo "$line" | cut -d: -f 1); \ + sudo -i -u $user ccache --print-config; \ + done </home-data/passwd + +# 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). +RUN \ + apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + wine-stable \ + && apt-get clean \ + && rm -rf \ + /var/lib/apt/lists/* \ + /tmp/* \ + /var/tmp/* +# checksum: edf5a5242fe46cab578b914fe031b6d0 diff --git a/bionic-amd64-tcwg-base/bionic-amd64-tcwg-build/build.sh b/bionic-amd64-tcwg-base/bionic-amd64-tcwg-build/build.sh new file mode 120000 index 00000000..50162e02 --- /dev/null +++ b/bionic-amd64-tcwg-base/bionic-amd64-tcwg-build/build.sh @@ -0,0 +1 @@ +../../tcwg-base/tcwg-build/build.sh
\ No newline at end of file diff --git a/bionic-amd64-tcwg-base/bionic-amd64-tcwg-build/gerrit-branches b/bionic-amd64-tcwg-base/bionic-amd64-tcwg-build/gerrit-branches new file mode 120000 index 00000000..628350a5 --- /dev/null +++ b/bionic-amd64-tcwg-base/bionic-amd64-tcwg-build/gerrit-branches @@ -0,0 +1 @@ +../../tcwg-base/tcwg-build/gerrit-branches
\ No newline at end of file diff --git a/bionic-amd64-tcwg-base/bionic-amd64-tcwg-dev/Dockerfile b/bionic-amd64-tcwg-base/bionic-amd64-tcwg-dev/Dockerfile index 96a5db63..bc19c8c3 100644 --- a/bionic-amd64-tcwg-base/bionic-amd64-tcwg-dev/Dockerfile +++ b/bionic-amd64-tcwg-base/bionic-amd64-tcwg-dev/Dockerfile @@ -3,29 +3,17 @@ FROM linaro/ci-amd64-tcwg-base-ubuntu:bionic RUN apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y \ - software-properties-common \ - && apt-get clean \ - && rm -rf \ - /var/lib/apt/lists/* \ - /tmp/* \ - /var/tmp/* - -RUN apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y \ apt-file \ git-gui \ git-svn \ gnat-5 \ less \ locales \ - libgmp-dev \ - libmpc-dev \ - libmpfr-dev \ mc \ screen \ + software-properties-common \ stgit \ tmux \ - unifdef \ && apt-get clean \ && rm -rf \ /var/lib/apt/lists/* \ @@ -43,4 +31,4 @@ COPY run.sh start.sh / ENTRYPOINT ["/run.sh"] CMD ["start.sh"] -# checksum: 286aa782c315c534aeae4e1fef031429 +# checksum: e0acd069d02b7a2424ac723f3a7bf358 diff --git a/bionic-amd64-tcwg-base/bionic-amd64-tcwg-dev/bionic-amd64-tcwg-x2go/Dockerfile b/bionic-amd64-tcwg-base/bionic-amd64-tcwg-dev/bionic-amd64-tcwg-x2go/Dockerfile index 6691e70a..631ee616 100644 --- a/bionic-amd64-tcwg-base/bionic-amd64-tcwg-dev/bionic-amd64-tcwg-x2go/Dockerfile +++ b/bionic-amd64-tcwg-base/bionic-amd64-tcwg-dev/bionic-amd64-tcwg-x2go/Dockerfile @@ -12,8 +12,7 @@ RUN apt-get update \ /tmp/* \ /var/tmp/* -RUN true \ - && apt-get update \ +RUN apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y \ duplicity \ mate-desktop-environment \ @@ -33,4 +32,4 @@ RUN apt-get update \ /var/lib/apt/lists/* \ /tmp/* \ /var/tmp/* -# checksum: 6cae4c37eaa031fb02326a6ebda501f6 +# checksum: a30214ab5fb77eefe535dc3b2edc9d44 diff --git a/bionic-arm64-tcwg-base/Dockerfile b/bionic-arm64-tcwg-base/Dockerfile index 277c219d..3c995343 100644 --- a/bionic-arm64-tcwg-base/Dockerfile +++ b/bionic-arm64-tcwg-base/Dockerfile @@ -1,9 +1,12 @@ # Auto generated from tcwg-base/Dockerfile.in. Do not edit. FROM ubuntu:bionic +# Unminimize Ubuntu Bionic to install contrib files of git (after package +# update, otherwise unminimize's "apt upgrade" might fail). RUN true \ && apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get dist-upgrade -y \ + && echo y | unminimize \ && DEBIAN_FRONTEND=noninteractive apt-get install -y devscripts \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ alien \ @@ -37,7 +40,10 @@ RUN true \ groff \ less \ libexpat1-dev \ + libgmp-dev \ liblzma-dev \ + libmpc-dev \ + libmpfr-dev \ libncurses5-dev \ libpython2.7-dev \ libreadline-dev \ @@ -45,6 +51,7 @@ RUN true \ libtcnative-1 \ libtool \ linux-tools-generic \ + linux-tools-4.18.0-13-generic \ lzop \ make \ net-tools \ @@ -67,6 +74,7 @@ RUN true \ texlive-fonts-recommended \ texlive-latex-recommended \ time \ + unifdef \ valgrind \ vim \ virtualenv \ @@ -80,8 +88,7 @@ RUN true \ /tmp/* \ /var/tmp/* -# Ubuntu Bionic has a quirk in installing contrib files of git; skip for now. -RUN true \ +RUN install -D -p -m0755 /usr/share/doc/git/contrib/workdir/git-new-workdir /usr/local/bin/git-new-workdir \ && 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 \ @@ -96,7 +103,16 @@ 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. +# Add ninja with support for memory-threshold job limitation. +# It's installed with ".bin" extension and containers then +# make wrappers around it in /usr/local/bin/ninja as needed. +RUN git clone -b master https://github.com/maxim-kuvyrkov/ninja.git \ + && cd ninja \ + && ./configure.py --bootstrap && ./ninja all && ./ninja_test \ + && mv ninja /usr/local/bin/ninja.bin \ + && cd .. \ + && rm -rf ninja + COPY home-data/ /home-data/ COPY new-user.sh /usr/local/bin/ @@ -115,4 +131,4 @@ VOLUME /tmp EXPOSE 22 CMD ["/usr/sbin/sshd", "-D"] -# checksum: 70e28af2a1592e6c1a4c267f37866dff +# checksum: 50a99c601dd50c455613a9aa28c5c136 diff --git a/bionic-arm64-tcwg-base/bionic-arm64-tcwg-dev/Dockerfile b/bionic-arm64-tcwg-base/bionic-arm64-tcwg-dev/Dockerfile index eb53a3b0..78fde257 100644 --- a/bionic-arm64-tcwg-base/bionic-arm64-tcwg-dev/Dockerfile +++ b/bionic-arm64-tcwg-base/bionic-arm64-tcwg-dev/Dockerfile @@ -3,29 +3,17 @@ FROM linaro/ci-arm64-tcwg-base-ubuntu:bionic RUN apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y \ - software-properties-common \ - && apt-get clean \ - && rm -rf \ - /var/lib/apt/lists/* \ - /tmp/* \ - /var/tmp/* - -RUN apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y \ apt-file \ git-gui \ git-svn \ gnat-5 \ less \ locales \ - libgmp-dev \ - libmpc-dev \ - libmpfr-dev \ mc \ screen \ + software-properties-common \ stgit \ tmux \ - unifdef \ && apt-get clean \ && rm -rf \ /var/lib/apt/lists/* \ @@ -43,4 +31,4 @@ COPY run.sh start.sh / ENTRYPOINT ["/run.sh"] CMD ["start.sh"] -# checksum: 94f16771ce67ae1223d2715b82c3f98e +# checksum: e1d4f2e78ee4ff7ae86f1e22953e476d diff --git a/ci-amd64-llp-alpine/Dockerfile b/ci-amd64-llp-alpine/Dockerfile index ee804cdf..0a5e28af 100644 --- a/ci-amd64-llp-alpine/Dockerfile +++ b/ci-amd64-llp-alpine/Dockerfile @@ -12,12 +12,13 @@ RUN mkdir -p $APPDIR WORKDIR $APPDIR -RUN apk --update --no-cache add python2 py2-pip mysql-client git py-gunicorn sqlite && \ - apk --no-cache add gcc g++ python2-dev musl-dev libffi-dev postgresql-dev && \ - git clone https://git.linaro.org/infrastructure/linaro-license-protection.git/ $APPDIR && \ - pip2 install --upgrade pip setuptools six && \ - pip2 install -U -r $APPDIR/requirements.txt && \ - apk del gcc g++ python3-dev musl-dev libffi-dev +RUN apk update && \ + apk --no-cache add python2 py2-pip mysql-client git py-gunicorn sqlite && \ + apk --no-cache add gcc g++ python2-dev musl-dev libffi-dev postgresql-dev && \ + git clone https://git.linaro.org/infrastructure/linaro-license-protection.git/ $APPDIR && \ + pip2 install --upgrade pip setuptools six && \ + pip2 install -U -r $APPDIR/requirements.txt && \ + apk del gcc g++ python3-dev musl-dev libffi-dev EXPOSE $PORT diff --git a/ci-amd64-llp-alpine/test_run.sh b/ci-amd64-llp-alpine/test_run.sh new file mode 100755 index 00000000..fd2767d7 --- /dev/null +++ b/ci-amd64-llp-alpine/test_run.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +REPO=/tmp/test-llp-root + +mkdir -p $REPO/test-llp.linaro.org +test \! -d $REPO/linaro-license-protection && (cd $REPO; git clone https://git.linaro.org/infrastructure/linaro-license-protection.git) + +docker run --name test-llp --rm -p 8080:8080 -v $REPO/test-llp.linaro.org:/srv -v $REPO/linaro-license-protection:/srv/linaro-license-protection linaro/ci-amd64-llp-alpine diff --git a/jessie-amd64-jenkins-master/Dockerfile b/jessie-amd64-jenkins-master/Dockerfile index e4459ba0..84a52d2c 100644 --- a/jessie-amd64-jenkins-master/Dockerfile +++ b/jessie-amd64-jenkins-master/Dockerfile @@ -1,4 +1,4 @@ -FROM jenkins/jenkins:2.121.2 +FROM jenkins/jenkins:2.150.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" @@ -10,7 +10,7 @@ USER root RUN wget -q https://bootstrap.pypa.io/get-pip.py -O /tmp/get-pip.py \ && python /tmp/get-pip.py \ && rm -f /tmp/get-pip.py \ - && pip install jenkins-job-builder==2.0.5 pyyaml==3.12 jinja2==2.9.6 python-jenkins==0.4.15 \ + && pip install jenkins-job-builder==2.5.0 pyyaml==3.12 jinja2==2.9.6 python-jenkins==0.4.15 \ && git clone --depth 1 https://git.linaro.org/infrastructure/jjb-linaro-plugin.git \ && cd jjb-linaro-plugin && python setup.py install \ && cd .. && rm -rf jjb-linaro-plugin \ diff --git a/jessie-amd64-jenkins-master/plugins.txt b/jessie-amd64-jenkins-master/plugins.txt index d5ea0090..be8dffd0 100644 --- a/jessie-amd64-jenkins-master/plugins.txt +++ b/jessie-amd64-jenkins-master/plugins.txt @@ -1,41 +1,40 @@ -ansicolor:0.5.2 -ant:1.8 +ansicolor:0.6.1 +ant:1.9 antisamy-markup-formatter:1.5 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 +bouncycastle-api:2.17 +build-blocker-plugin:1.7.3 +build-monitor-plugin:1.12+build.201809061734 build-name-setter:1.6.9 build-timeout:1.19 command-launcher:1.2 -copy-to-slave:1.4.4 copyartifact:1.41 -coverity:1.11.1 -crowd2:2.0.0 +copy-to-slave:1.4.4 +coverity:1.11.3 +crowd2:2.0.1 cvs:2.14 docker-build-publish:1.3.2 -docker-plugin:1.0.0 docker-slaves:1.0.7 dropdown-viewstabbar-plugin:1.7 dynamic-axis:1.0.3 -ec2:1.39 +ec2:1.41 email-ext:2.63 embeddable-build-status:1.9 extended-choice-parameter:0.76 extended-read-permission:2.0 external-monitor-job:1.7 ghprb:1.42.0 -gerrit-trigger:2.27.5 +gerrit-trigger:2.28.0 github-organization-folder:1.6 greenballs:1.15 -groovy-postbuild:2.4.1 +groovy-postbuild:2.4.3 heavy-job:1.1 -htmlpublisher:1.16 +htmlpublisher:1.17 ircbot:2.30 -jdk-tool:1.1 -jira:3.0.0 +jdk-tool:1.2 +jira:3.0.5 jenkins-multijob-plugin:1.31 -jobConfigHistory:2.18 +jobConfigHistory:2.19 ldap:1.20 leastload:2.0.1 log-parser:2.0 @@ -44,28 +43,29 @@ matrix-combinations-parameter:1.3.0 matrixtieparent:1.2 mercurial:1.61 metrics:4.0.2.2 -monitoring:1.73.1 +monitoring:1.75.0 multiple-scms:0.6 naginator:1.17.2 nodelabelparameter:1.7.2 -pam-auth:1.3 -pipeline-utility-steps:2.1.0 +pam-auth:1.4 +postbuildscript:2.8.1 +pipeline-utility-steps:2.2.0 plot:1.11 PrioritySorter:3.6.0 -publish-over-ssh:1.19.1 -rebuild:1.28 +publish-over-ssh:1.20.1 +rebuild:1.29 repo:1.10.7 -simple-theme-plugin:0.4 -ssh-agent:1.16 -subversion:2.11.1 +simple-theme-plugin:0.5.1 +ssh-agent:1.17 +subversion:2.12.1 tap:2.2.1 throttle-concurrents:2.0.1 timestamper:1.8.10 translation:1.16 urltrigger:0.44 -warnings:4.68 -windows-slaves:1.3.1 -workflow-aggregator:2.5 -ws-cleanup:0.34 +warnings:5.0.0 +windows-slaves:1.4 +workflow-aggregator:2.6 +ws-cleanup:0.37 xvfb:1.1.3 -yet-another-docker-plugin:0.1.0-rc48 +yet-another-docker-plugin:0.1.0-rc50 diff --git a/lava/dispatcher/staging/stretch-amd64/Dockerfile b/lava/dispatcher/staging/stretch-amd64/Dockerfile index 970218d2..f6a21d26 100644 --- a/lava/dispatcher/staging/stretch-amd64/Dockerfile +++ b/lava/dispatcher/staging/stretch-amd64/Dockerfile @@ -16,9 +16,9 @@ RUN echo 'locales locales/locales_to_be_generated multiselect C.UTF-8 UTF-8, en_ bridge-utils dfu-util img2simg emacs-nox vim gnupg2 sed expect grep wget \ 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 - && \ - echo "deb http://images.validation.linaro.org/production-repo stretch-backports main" >/etc/apt/sources.list.d/linaro.list +# Add LAVA stretch-backports staging repo +RUN wget -qO - http://images.validation.linaro.org/staging-repo/staging-repo.key.asc | apt-key add - && \ + echo "deb http://images.validation.linaro.org/staging-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 && \ diff --git a/stretch-amd64-obsworker/Dockerfile b/stretch-amd64-obsworker/Dockerfile index 5ed36dd9..4cae6c58 100644 --- a/stretch-amd64-obsworker/Dockerfile +++ b/stretch-amd64-obsworker/Dockerfile @@ -25,6 +25,7 @@ RUN apt-get update \ /tmp/* \ /var/tmp/* + COPY start-obsworker / CMD ["/start-obsworker"] diff --git a/stretch-arm64-obsworker/Dockerfile b/stretch-arm64-obsworker/Dockerfile index 5ed36dd9..4cae6c58 100644 --- a/stretch-arm64-obsworker/Dockerfile +++ b/stretch-arm64-obsworker/Dockerfile @@ -25,6 +25,7 @@ RUN apt-get update \ /tmp/* \ /var/tmp/* + COPY start-obsworker / CMD ["/start-obsworker"] diff --git a/stretch-arm64-testdef/Dockerfile b/stretch-arm64-testdef/Dockerfile index 8a7aaa99..cd20f093 100644 --- a/stretch-arm64-testdef/Dockerfile +++ b/stretch-arm64-testdef/Dockerfile @@ -3,8 +3,9 @@ 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 \ + && git clone http://git.linaro.org/qa/test-definitions.git \ && cd test-definitions \ + && git checkout master \ && pip install -r automated/utils/requirements.txt \ && apt-get clean \ && rm -rf \ diff --git a/stretch-arm64-testdef/build.sh b/stretch-arm64-testdef/build.sh index ac64154b..df1b8212 100755 --- a/stretch-arm64-testdef/build.sh +++ b/stretch-arm64-testdef/build.sh @@ -4,10 +4,18 @@ 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) +if [ -z "$1" ]; then + echo "Usage: ./build.sh <git_tag>" + tag="$(git ls-remote https://git.linaro.org/qa/test-definitions.git refs/heads/master | cut -c1-7)" + echo "Warning: git tag not specified, latest commit (${tag}) on master branch is used." +else + tag="$1" + sed -i "s/git checkout master/git checkout ${tag} -b ${tag}/" Dockerfile +fi -image=linaro/testdef-${ARCHITECTURE}-debian-${DISTRIBUTION}:${COMMIT_HASH} -docker build --pull --tag=$image . -echo $image > .docker-tag +DISTRIBUTION="$(basename "${PWD}" | cut -f1 -d '-')" +ARCHITECTURE="$(basename "${PWD}" | cut -f2 -d '-')" + +image=linaro/testdef-${ARCHITECTURE}-debian-${DISTRIBUTION}:${tag} +docker build --pull --tag="$image" . +echo "$image" > .docker-tag diff --git a/stretch-armhf-obsworker/Dockerfile b/stretch-armhf-obsworker/Dockerfile new file mode 100644 index 00000000..4cae6c58 --- /dev/null +++ b/stretch-armhf-obsworker/Dockerfile @@ -0,0 +1,31 @@ +FROM debian:stretch + +RUN apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + apt-utils \ + binutils \ + bsdtar \ + cpio \ + curl \ + debootstrap \ + libcompress-raw-zlib-perl \ + libtimedate-perl \ + libxml-parser-perl \ + libxml-simple-perl \ + lsb-base \ + lvm2 \ + lzma \ + psmisc \ + rpm \ + util-linux \ + xz-utils \ + && apt-get clean \ + && rm -rf \ + /var/lib/apt/lists/* \ + /tmp/* \ + /var/tmp/* + + +COPY start-obsworker / + +CMD ["/start-obsworker"] diff --git a/trusty-amd64-art/build.sh b/stretch-armhf-obsworker/build.sh index 14167821..5d3614ac 100755 --- a/trusty-amd64-art/build.sh +++ b/stretch-armhf-obsworker/build.sh @@ -7,6 +7,6 @@ export LANG=C DISTRIBUTION=$(basename ${PWD} | cut -f1 -d '-') ARCHITECTURE=$(basename ${PWD} | cut -f2 -d '-') -image=linaro/ci-${ARCHITECTURE}-art-ubuntu:${DISTRIBUTION} +image=linaro/ci-${ARCHITECTURE}-obsworker docker build --pull --tag=$image . echo $image > .docker-tag diff --git a/stretch-armhf-obsworker/start-obsworker b/stretch-armhf-obsworker/start-obsworker new file mode 100755 index 00000000..3788a0aa --- /dev/null +++ b/stretch-armhf-obsworker/start-obsworker @@ -0,0 +1,16 @@ +#!/bin/bash + +rm -rf /srv/obs +mkdir -p /srv/obs/worker/root_1 +mkdir -p /srv/obs/run/worker/{boot,1} +cd /srv/obs/run/worker/boot +echo $OBS_IP $OBS_SERVER >> /etc/hosts +curl -s "http://$OBS_SERVER:5252/getworkercode" | cpio --quiet --extract +ln -s . XML + +if [ ! -z $OBS_TMPFS ] +then + extra_args="--vmdisk-rootsize $OBS_TMPFS --tmpfs" +fi + +exec /usr/bin/perl -w ./bs_worker --hardstatus --port $OBS_PORT --root /srv/obs/worker/root_1 --statedir /srv/obs/run/worker/1 --id `hostname`:1 --reposerver http://$OBS_SERVER:5252 --jobs $OBS_JOBS $extra_args diff --git a/stretch-armhf-testdef/Dockerfile b/stretch-armhf-testdef/Dockerfile index ecfab1dc..59417e34 100644 --- a/stretch-armhf-testdef/Dockerfile +++ b/stretch-armhf-testdef/Dockerfile @@ -3,8 +3,9 @@ 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 \ + && git clone http://git.linaro.org/qa/test-definitions.git \ && cd test-definitions \ + && git checkout master \ && pip install -r automated/utils/requirements.txt \ && apt-get clean \ && rm -rf \ diff --git a/stretch-armhf-testdef/build.sh b/stretch-armhf-testdef/build.sh index ac64154b..df1b8212 100755 --- a/stretch-armhf-testdef/build.sh +++ b/stretch-armhf-testdef/build.sh @@ -4,10 +4,18 @@ 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) +if [ -z "$1" ]; then + echo "Usage: ./build.sh <git_tag>" + tag="$(git ls-remote https://git.linaro.org/qa/test-definitions.git refs/heads/master | cut -c1-7)" + echo "Warning: git tag not specified, latest commit (${tag}) on master branch is used." +else + tag="$1" + sed -i "s/git checkout master/git checkout ${tag} -b ${tag}/" Dockerfile +fi -image=linaro/testdef-${ARCHITECTURE}-debian-${DISTRIBUTION}:${COMMIT_HASH} -docker build --pull --tag=$image . -echo $image > .docker-tag +DISTRIBUTION="$(basename "${PWD}" | cut -f1 -d '-')" +ARCHITECTURE="$(basename "${PWD}" | cut -f2 -d '-')" + +image=linaro/testdef-${ARCHITECTURE}-debian-${DISTRIBUTION}:${tag} +docker build --pull --tag="$image" . +echo "$image" > .docker-tag diff --git a/tcwg-base/Dockerfile.in b/tcwg-base/Dockerfile.in index 2ff712f8..16cedea6 100644 --- a/tcwg-base/Dockerfile.in +++ b/tcwg-base/Dockerfile.in @@ -20,10 +20,15 @@ RUN (url="http://ports.ubuntu.com/ubuntu-ports/"; \ echo; \ done) > /etc/apt/sources.list \ #else +# Unminimize Ubuntu Bionic to install contrib files of git (after package +# update, otherwise unminimize's "apt upgrade" might fail). RUN true \ #endif && apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get dist-upgrade -y \ +#if DISTRO_bionic + && echo y | unminimize \ +#endif #if ARCH_i386 && dpkg-divert --local --rename --add /sbin/initctl \ && ln -s /bin/true /sbin/initctl \ @@ -68,14 +73,23 @@ RUN true \ #if ARCH_amd64 || ARCH_i386 libglib2.0-dev \ #endif + libgmp-dev \ liblzma-dev \ + libmpc-dev \ + libmpfr-dev \ libncurses5-dev \ +#if ARCH_amd64 || ARCH_i386 + libpixman-1-dev \ +#endif libpython2.7-dev \ libreadline-dev \ libssl-dev \ libtcnative-1 \ libtool \ linux-tools-generic \ +#if DISTRO_bionic + linux-tools-4.18.0-13-generic \ +#endif lzop \ make \ #if ARCH_amd64 || ARCH_i386 @@ -113,6 +127,7 @@ RUN true \ texlive-fonts-recommended \ texlive-latex-recommended \ time \ + unifdef \ valgrind \ vim \ #if !DISTRO_trusty @@ -130,12 +145,7 @@ RUN true \ /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 \ @@ -150,11 +160,20 @@ 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 +# Add ninja with support for memory-threshold job limitation. +# It's installed with ".bin" extension and containers then +# make wrappers around it in /usr/local/bin/ninja as needed. +RUN git clone -b master https://github.com/maxim-kuvyrkov/ninja.git \ + && cd ninja \ + && ./configure.py --bootstrap && ./ninja all && ./ninja_test \ + && mv ninja /usr/local/bin/ninja.bin \ + && cd .. \ + && rm -rf ninja + #if ARCH_amd64 || ARCH_i386 RUN mkdir /tmp/docker-install-qemu.$$ \ && cd /tmp/docker-install-qemu.$$ \ - && qemu_ver=2.8.0 && wget --progress=dot:giga http://download.qemu-project.org/qemu-${qemu_ver}.tar.xz \ + && qemu_ver=3.1.0 && wget --progress=dot:giga http://download.qemu-project.org/qemu-${qemu_ver}.tar.xz \ && tar xf qemu-${qemu_ver}.tar.xz \ && mkdir build && cd build \ && ../qemu-${qemu_ver}/configure --prefix=/usr/local --target-list=armeb-linux-user \ @@ -162,10 +181,7 @@ RUN mkdir /tmp/docker-install-qemu.$$ \ && 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/home-data/diana.picus/.ssh/authorized_keys b/tcwg-base/home-data/diana.picus/.ssh/authorized_keys new file mode 100644 index 00000000..dcec2466 --- /dev/null +++ b/tcwg-base/home-data/diana.picus/.ssh/authorized_keys @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCUPyyKwGTn6TwizPOErps0mgMNwLNDbYyEr8m2KwvkGQfLwesaTuOwHtFg3zr4u2Nqk8zmUn2/jZekru+gVXGKEQQDzSJKK7llNQCKkBJUPO8wTkkGoIzT3Bt1ftKC/OUUDVVckdQ0LCNctsLcFa9D11fk2hCUkg2V06QJu87e8T5xyhyA6H0WKyfA2JkRwgnmZyM/uJo5ga/XUSTvA49k+Keu0GLCrODtUXA/jqw6niLrG+lH/ce49B+MxUu6pF4vUu6lba/jh35bSvDKMZj6vT3IUxQ7rdWO687yNrkRw6osmJhv0PRruqxeP+IYcHHqRTog0Hv2Y9C780TW9ect diana@Gjallarhorn diff --git a/tcwg-base/home-data/group b/tcwg-base/home-data/group index a0dbbf79..29de913d 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,omair.javaid -tcwg-llvm:x:9001:maxim.kuvyrkov,peter.smith,thomas.preudhomme,omair.javaid +tcwg-users:x:10000:maxim.kuvyrkov,alex.bennee,christophe.lyon,peter.smith,richard.henderson,prathamesh.kulkarni,omair.javaid,kugan.vivekanandarajah,diana.picus,yvan.roux +tcwg-llvm:x:9001:maxim.kuvyrkov,peter.smith,omair.javaid,diana.picus,yvan.roux,prathamesh.kulkarni diff --git a/tcwg-base/home-data/kugan.vivekanandarajah/.ssh/authorized_keys b/tcwg-base/home-data/kugan.vivekanandarajah/.ssh/authorized_keys new file mode 100644 index 00000000..40ffb8c8 --- /dev/null +++ b/tcwg-base/home-data/kugan.vivekanandarajah/.ssh/authorized_keys @@ -0,0 +1,2 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDDOYEfDePDvheSVenZ3ulL2ZlxRdCat0Yr38dHXrcEMkvLVbHabDJoI1hQ9bG93ycmKVvSvRylx1Wb5WIXyV4BR1rp4JZwwVMEE/R+N9rNEkAB2nZ+0bbEO07vP29036XvXOnQETz6g2K+DHjWhrUzS67s354EOqW9K4y8ADi0grCkt7BzHiO77naL4k82UZnfvVn05/sAtSmd2c90D3K0HG24hcNvtkYkFlfF1f7Nc0mYPuoiDZl5qPlBcV+q0uvGCRM7ep/6U1ed7+4cpzNxgU/mrILNtLhgFH9YgeboVhgOfw4otLMFw8DHpH7O8dwVuMZAxoZKvFsIXypx482H kugan@kugan-Satellite-L850 +ssh-dss AAAAB3NzaC1kc3MAAACBAI9K4Pb/JiWcbe3Mj5YAzcGtGV8hDaXXzi7348aqqHsbVH3vuub8QvPBEQ5/Z/ZoHoaBLqKqYDzkj5OZbaJwYqmvbYzcnz5REzmwu9LuwR7SK9MWFBIP9vCmpPRat45H/71Nl4xty4rkngzzYqesQMHR3eVtI+J26KbpOVCx3B7DAAAAFQDgWEoC2laItuCf6cF2TqLlFRgTyQAAAIAY+jUXsbIgg2gW6WtCSyLu82EZbMdaj9dSib6iOPLwJSrSFRny91+BiW4FOlFsQzsuESQhylIbphOE+QtWOsd5aWBpw+dvq6TC1hchmnQTQi6K/j+LecIY+Gcm0UnqB9BSaiviHLLgCILXPKjoIJGWqFPHXTHZ/LE5cXubKdGt9AAAAIEAhhPkBB+KWrsESq1zfhZOJDke/NdtQLOWAK8CUnx9zjxUyqtMstBP8brdS+nc/jin+OjkKytWZLVrWT7xXT0cdFUbHA1a5YWXCEET3NmH07pusEtAacFIXJgGC+ADyv4wmtuvDWQJdMXq/pPva2Yu+qA6b/qyRriu9/phpuXCChw= kugan@kugan-T430u diff --git a/tcwg-base/home-data/passwd b/tcwg-base/home-data/passwd index f9a98f65..f596805f 100644 --- a/tcwg-base/home-data/passwd +++ b/tcwg-base/home-data/passwd @@ -4,7 +4,9 @@ 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 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 +kugan.vivekanandarajah:x:10179:10000:Kugan Vivekanandarajah::/bin/bash +diana.picus:x:12361:10000:Diana Picus::/bin/bash +yvan.roux:x:10168:10000:Yvan Roux::/bin/bash diff --git a/tcwg-base/home-data/tcwg-buildslave/.ssh/config b/tcwg-base/home-data/tcwg-buildslave/.ssh/config index ba32e1ef..b5086896 100644 --- a/tcwg-base/home-data/tcwg-buildslave/.ssh/config +++ b/tcwg-base/home-data/tcwg-buildslave/.ssh/config @@ -6,7 +6,7 @@ # !!! 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 +Host *.tcwglab people.linaro.org lab.validation.linaro.org #User @LDAP_USER@ #IdentityFile ~/.ssh/id_rsa @@ -20,15 +20,11 @@ Host *proxy.* Host *.tcwglab ProxyCommand ~/.ssh/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 - # 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 tcwg-d05-01 libgomp-d05 tcwg-thx1-01 +Host *.tcwglab *.lab tcwg-d05-01 libgomp-d05 tcwg-thx1-01 # Enable automatic multiplexing. ControlMaster auto # Soften up potential problems with killing master connection by using @@ -39,13 +35,8 @@ Host *.tcwglab *.aus-colo *.lab tcwg-d05-01 libgomp-d05 tcwg-thx1-01 # 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 @@ -57,10 +48,10 @@ Host *.tcwglab *.aus-colo *.lab tcwg-d05-01 libgomp-d05 tcwg-thx1-01 Host ci.linaro.org Port 2020 -Host git.linaro.org dev-private-git.linaro.org +Host git*.linaro.org dev-private-git.linaro.org User git -Host tcwg-d05-01 libgomp-d05 tcwg-thx1-01 +Host tcwg-d05-01 libgomp-d05 tcwg-thx1-01 tcwg-sq-*.tcwglab Port 2022 Host tcwg-d05-01 libgomp-d05 @@ -71,4 +62,11 @@ Host tcwg-thx1-01 Host tcwg-ex40-01 ex40-01 Hostname ex40-01.tcwglab.linaro.org + +Host * + # There is little point in forwarding X11 to machines outside of local network. + ForwardX11 no + # Ping server every 5min to avoid routers dropping connection. + # This matches -o BatchMode=yes setting used in cross-testing (see ABE) + ServerAliveInterval 300 # === 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 index a1a108b4..910daa41 100644 --- a/tcwg-base/home-data/tcwg-buildslave/.ssh/known_hosts +++ b/tcwg-base/home-data/tcwg-buildslave/.ssh/known_hosts @@ -3,6 +3,7 @@ aus-colo.linaro.org ssh-dss AAAAB3NzaC1kc3MAAACBALdjDe/FnDjKDz+QzKWD/J1jIVVjied+ 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 +[ci.linaro.org]:2222 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCAxH/zCl/clVrd2Q8Tai5wea0homs6uPPf57qemRP/MFHOz4cIYKEbEczLD87b8u2dK+qfjKsr33jSmW8NbJbvJZ6bFhVUcpXl2BxAYbFQVZJq5YDsDEmRFbvkjzEjiRGHMKCl8ouh1c5lTLkLAKZMu2cKc7X0sIMqwrwOPn/RE8cCrDYkhxTZy2IJ8O8MrJoXmwjiT5mJpe5y7kGVzzESvHBbhtknLa5HuYuyzU88Zyi8m6LjJc9OOTxPBuXiO1c7Oblq7q2Sjk7X+iDld1+m+uUkI2Bro5P2oxneapx2As6R9IUc3zd+YGWcjSiI1CnCb1EykIBzS+yKDfoPg+M7 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 diff --git a/tcwg-base/home-data/thomas.preudhomme/.ssh/authorized_keys b/tcwg-base/home-data/thomas.preudhomme/.ssh/authorized_keys deleted file mode 100644 index 68d7168d..00000000 --- a/tcwg-base/home-data/thomas.preudhomme/.ssh/authorized_keys +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDFtoCUhkeZ3yC2s7oUfSrM33SVgBKLGJ/4FiEGnQRmU1g8rxuOyDOscGz6AIHDNfYcBZGgwHVu5rBd+w+GKZf89kzc6apqBCNmPXUX9vJleb8otqgDL9msifgGOjhDyWVd5pdW6MFzmWMIJyBbY+D3JguUgAMSHMiGh5Sf4+pskn6XOCqnKGbLYRMwpAD1u7ket/liAZnagFP1CuTCgNkmvnFzEw5a4bOdVYtp9x20LYq0L0OMSNhT4KajxUmxgEteLuKCXaafgPgIWq6B8skqkZzyVSU2+RR2Yd6wGQgP6fRFCh84lo59otU5C7VacYqryzCyfdiiE5FXzh94ypu0uKtnq4nSz9DUeL/TAcjr+Y+jAfgwCm087SK/WIPhF37yd6/b/AEeF/4mT8jAR+h74u8ULR9mRkWirBEldG2I80C9p916h73lrc9Vta7CA7XzseIHSKv1S1OQlkCMF8Jj4AwMTF5DOXLju9WNF17OAP44IMEJvpG2HcxTPLbrHd9GX2G4PDzJBaIuaFybJIQH28ZpbIVKpx6iVtPFQ2ehRh+STi7rApgLGPiKjwKYskLnpLcoCyhhyw8BpW7SQ4U690ZcPEboYDF5sqPwEP3EKmrXBG3siUNmlnrLY0E/INON/SKEHAgAAxKm2s4UhtnrfN3y1Wh1ILPRnJq6Fk3K3w== thopre01@e108577-lin diff --git a/tcwg-base/home-data/yvan.roux/.ssh/authorized_keys b/tcwg-base/home-data/yvan.roux/.ssh/authorized_keys new file mode 100644 index 00000000..05661935 --- /dev/null +++ b/tcwg-base/home-data/yvan.roux/.ssh/authorized_keys @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDh/oEDJ6J0ye3Mi86OnfG/agqZbNc7qYX5CLl8QVz2YInzSfRTKhqpNSVGBV+wjzzRRJNfXo7OISkE1Rut4tD8TZoeqz/ZeDBtcgbSb84F9iMXnXBSh+75/JjlmOaxkMkwSEpbtH+9WabVW21mX5Fl4WLj8O6DKl3guF6B6nuxX793uDdSD1sRH0qrRYKOSM1AdrTJgNvG/pQCPVcTYNWq7DeeWGo+9pi2vb+jNS2OaKhl/j29Vjdj+hO29AHCQTjFsWpYY+KWvqsFYO2tB67s6kWQaJRuI/lg4OhNUFYBlReSTYYF+1Gnyx6SoM/UV1HGBIOgMRgK0PuQR2P/rZerLleTOjEtc2zf9eSD3NTyzormuSlNrtiGXk4Mum29JeudB1qEGCsYrddi3igopX+2TMHtgmMKN6RobE/tvZQtBl4jXboKkCTx/Otsc8pPIrxmyUbDLMvsS8WMXZIYP5rdL9tJRb269k3lvga0h1K6ZA89MlAphjBSYNiOL4doMQukJN44RwSwoty6vtNELzVbfZjicWzzi55xjhpqvAqEIQAKN2CsPuisULk+18iELa3RBfUgYDuwwOTqYp+VvGV3TGJpAcwiBVMUtpjMGXG6Rr41fF77dulfqrs93tubYHuc1F/xXNsUwb7uFbSI5GwO74WCN2kAPkn5XPRsm353Aw== yvan.roux@linaro.org diff --git a/tcwg-base/home-data/yvan.roux/.tmux.conf b/tcwg-base/home-data/yvan.roux/.tmux.conf new file mode 100644 index 00000000..2a041028 --- /dev/null +++ b/tcwg-base/home-data/yvan.roux/.tmux.conf @@ -0,0 +1,10 @@ +set -g default-terminal "screen-256color" +set-option -g prefix ` +bind-key ` send-prefix +set -g mouse on +set-window-option -g mode-keys vi +set -g status-bg "colour0" +set -g status-left "#[fg=colour9][#H] " +set -g status-right '#[fg=colour33,bg=default] %l:%M%p' +setw -g window-status-current-format "#[fg=colour1,bg=colour234,nobold,nounderscore,noitalics]#[fg=colour41,bg=default,bold] #I:#W #[fg=colour231,bg=default,nobold,nounderscore,noitalics]" +setw -g window-status-format "#[fg=colour31,bg=default,nobold,nounderscore,noitalics] #I:#W #[fg=colour234,bg=default,nobold,nounderscore,noitalics]" diff --git a/tcwg-base/tcwg-build/Dockerfile.in b/tcwg-base/tcwg-build/Dockerfile.in index d9a8f692..9033a56b 100644 --- a/tcwg-base/tcwg-build/Dockerfile.in +++ b/tcwg-base/tcwg-build/Dockerfile.in @@ -5,18 +5,24 @@ RUN while read line; do \ continue; \ fi; \ new-user.sh --passwd "$line"; \ + user=$(echo "$line" | cut -d: -f 1); \ + sudo -i -u $user ccache --print-config; \ done </home-data/passwd #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). RUN \ -#if ARCH_amd64 +#if ARCH_amd64 && (DISTRO_trusty || DISTRO_xenial) dpkg --add-architecture i386 && \ #endif apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ +#if DISTRO_trusty || DISTRO_xenial wine \ +#else + wine-stable \ +#endif && apt-get clean \ && rm -rf \ /var/lib/apt/lists/* \ diff --git a/tcwg-base/tcwg-dev/Dockerfile.in b/tcwg-base/tcwg-dev/Dockerfile.in index e0eda9e3..4aed65d8 100644 --- a/tcwg-base/tcwg-dev/Dockerfile.in +++ b/tcwg-base/tcwg-dev/Dockerfile.in @@ -2,15 +2,6 @@ FROM linaro/ci-#{ARCH}-tcwg-base-ubuntu:#{DISTRO} RUN apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y \ - software-properties-common \ - && apt-get clean \ - && rm -rf \ - /var/lib/apt/lists/* \ - /tmp/* \ - /var/tmp/* - -RUN apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y \ apt-file \ git-gui \ git-svn \ @@ -23,14 +14,11 @@ RUN apt-get update \ #endif less \ locales \ - libgmp-dev \ - libmpc-dev \ - libmpfr-dev \ mc \ screen \ + software-properties-common \ stgit \ tmux \ - unifdef \ && apt-get clean \ && rm -rf \ /var/lib/apt/lists/* \ diff --git a/tcwg-base/tcwg-dev/start.sh b/tcwg-base/tcwg-dev/start.sh index b281d34b..c22f008f 100755 --- a/tcwg-base/tcwg-dev/start.sh +++ b/tcwg-base/tcwg-dev/start.sh @@ -100,7 +100,9 @@ case "$home" in esac # Use at most half of all available RAM. -memlimit=$(($(free -g | awk '/^Mem/ { print $2 }') / 2))G +memlimit=$(free -m | awk '/^Mem/ { print $2 }') +memlimit=$(($memlimit / 2))m + # IPC_LOCK is required for some implementations of ssh-agent (e.g., MATE's). # SYS_PTRACE is required for debugger work. # seccomp=unconfined to allow disabling of ASLR for sanitizer regression tests. diff --git a/tcwg-base/tcwg-dev/tcwg-x2go/Dockerfile.in b/tcwg-base/tcwg-dev/tcwg-x2go/Dockerfile.in index 5191918a..35853ad5 100644 --- a/tcwg-base/tcwg-dev/tcwg-x2go/Dockerfile.in +++ b/tcwg-base/tcwg-dev/tcwg-x2go/Dockerfile.in @@ -11,19 +11,10 @@ RUN apt-get update \ /tmp/* \ /var/tmp/* -#if DISTRO_xenial -RUN add-apt-repository ppa:x2go/stable \ -#else -RUN true \ -#endif - && apt-get update \ +RUN 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 \ diff --git a/tcwg-base/tcwg-host/start.sh b/tcwg-base/tcwg-host/start.sh index a9a5519c..9a865db7 100755 --- a/tcwg-base/tcwg-host/start.sh +++ b/tcwg-base/tcwg-host/start.sh @@ -76,6 +76,7 @@ mounts="$mounts -v /var/run/docker.sock:/var/run/docker.sock" 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 +memlimit=$(free -m | awk '/^Mem/ { print $2 }') +memlimit=$(($memlimit / 2))m $DOCKER run -dt --name=$task --network host --restart=unless-stopped $mounts --memory=$memlimit --pids-limit=5000 $image "$group" "$task" diff --git a/tcwg-base/tcwg-llvmbot/Dockerfile.in b/tcwg-base/tcwg-llvmbot/Dockerfile.in index 24233ed9..5771509b 100644 --- a/tcwg-base/tcwg-llvmbot/Dockerfile.in +++ b/tcwg-base/tcwg-llvmbot/Dockerfile.in @@ -1,8 +1,12 @@ FROM linaro/ci-#{ARCH}-tcwg-base-ubuntu:#{DISTRO} RUN apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y software-properties-common \ + && DEBIAN_FRONTEND=noninteractive add-apt-repository -y ppa:ubuntu-toolchain-r/test \ + && apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y \ buildbot \ + g++-7 \ && apt-get clean \ && rm -rf \ /var/lib/apt/lists/* \ @@ -21,14 +25,6 @@ RUN cd ./llvm-config-buildslave/ \ /var/tmp/* \ && sudo -i -u buildslave mkdir /home/buildslave/buildslave -# Add ninja with support for memory-threshold job limitation. -RUN git clone -b master https://github.com/maxim-kuvyrkov/ninja.git \ - && cd ninja \ - && ./configure.py --bootstrap && ./ninja all && ./ninja_test \ - && mv ninja /usr/local/bin/ninja.bin \ - && cd .. \ - && rm -rf ninja - # Add current clang for libcxx bots. RUN \ #if ARCH_arm64 diff --git a/tcwg-base/tcwg-llvmbot/run.sh b/tcwg-base/tcwg-llvmbot/run.sh index aec8e31b..04bd6450 100755 --- a/tcwg-base/tcwg-llvmbot/run.sh +++ b/tcwg-base/tcwg-llvmbot/run.sh @@ -4,10 +4,10 @@ set -e bare_metal_bot_p () { - case "$1" in - "linaro-tk1-"*) return 0 ;; - *) return 1 ;; - esac + if [ -f "/.dockerenv" ]; then + return 1 + fi + return 0 } use_clang_p () @@ -31,6 +31,8 @@ use_clang_p () # Use the oldest maintained clang release (latest - 1). setup_clang_release() { + local bot_name="$1" + # 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 @@ -44,11 +46,14 @@ setup_clang_release() esac # Download and install clang+llvm into /usr/local - ( - cd /usr/local - wget -c --progress=dot:giga http://releases.llvm.org/${release_num}/$clang_ver.tar.xz - tar xf $clang_ver.tar.xz - ) + # Docker bots already have clang+llvm downloaded and installed in the image. + if bare_metal_bot_p $bot_name; then + ( + cd /usr/local + wget -c --progress=dot:giga http://releases.llvm.org/${release_num}/$clang_ver.tar.xz + tar xf $clang_ver.tar.xz + ) + fi cc=/usr/local/$clang_ver/bin/clang cxx=/usr/local/$clang_ver/bin/clang++ } @@ -65,10 +70,10 @@ if ! [ -f ~buildslave/buildslave/buildbot.tac ]; then fi if use_clang_p $2 ; then - setup_clang_release + setup_clang_release $2 else - cc=gcc - cxx=g++ + cc=gcc-7 + cxx=g++-7 fi # With default PATH /usr/local/bin/cc and /usr/local/bin/c++ are detected as @@ -122,24 +127,39 @@ Linker: $(ld --version | head -n 1) C Library: $(ldd --version | head -n 1) EOF -if bare_metal_bot_p "$2"; then - # TK1s have CPU hot-plug, so ninja might detect smaller number of cores - # available for parallelism. Explicitly set "default" parallelism. - cat > /usr/local/bin/ninja <<EOF +case "$2" in + linaro-tk1-*) + # TK1s have CPU hot-plug, so ninja might detect smaller number of cores + # available for parallelism. Explicitly set "default" parallelism. + cat > /usr/local/bin/ninja <<EOF #!/bin/sh exec /usr/bin/ninja -j$n_cores "\$@" EOF -else - # Throttle ninja on system load, system memory and container memory limit. - # When running with "-l 2*N_CORES -m 50 -M 50" ninja will not start new jobs - # if system or container memory utilization is beyond 50% or when load is - # above double the core count. Ninja will also stall up to 5 seconds (-D 5000) - # before starting a new job to avoid rapid increase of resource usage. - cat > /usr/local/bin/ninja <<EOF + ;; + *) + # Throttle ninja on system load, system memory and container memory + # limits. + case "$1" in + lab.llvm.org:9994) + # Run silent bots with single-threaded ninja when average load + # is beyond twice the number of cores. + avg_load_opt="-l $((2*$n_cores))" + ;; + *) + avg_load_opt="" + ;; + esac + # Make ninja run single-threaded if system or container memory + # utilization is beyond 50% (-m 50 -M 50). + # Make ninja stall for up to 5 seconds (-D 5000) before starting + # a new job when usage decreases under threshold (to avoid rapid + # increase of resource usage from N_CORES-1 new processes). + cat > /usr/local/bin/ninja <<EOF #!/bin/sh -exec /usr/local/bin/ninja.bin -j$n_cores -l $((2*$n_cores)) -m 50 -M 50 -D 5000 "\$@" +exec /usr/local/bin/ninja.bin -j$n_cores $avg_load_opt -m 50 -M 50 -D 5000 "\$@" EOF -fi + ;; +esac chmod +x /usr/local/bin/ninja sudo -i -u buildslave buildslave restart ~buildslave/buildslave diff --git a/tcwg-base/tcwg-llvmbot/start.sh b/tcwg-base/tcwg-llvmbot/start.sh index 38ee277b..f337f967 100755 --- a/tcwg-base/tcwg-llvmbot/start.sh +++ b/tcwg-base/tcwg-llvmbot/start.sh @@ -25,6 +25,37 @@ else DOCKER="sudo docker" fi +case "$slavename" in + linaro-armv8-01-aarch64-full) ;; + linaro-armv8-01-aarch64-global-isel) ;; + linaro-armv8-01-aarch64-libcxx) ;; + linaro-armv8-01-aarch64-libcxx-noeh) ;; + linaro-armv8-01-aarch64-lld) ;; + linaro-armv8-01-aarch64-quick) ;; + linaro-armv8-01-arm-full) ;; + linaro-armv8-01-arm-full-selfhost) ;; + linaro-armv8-01-arm-global-isel) ;; + linaro-armv8-01-arm-libcxx) ;; + linaro-armv8-01-arm-libcxx-noeh) ;; + linaro-armv8-01-arm-lld) ;; + linaro-armv8-01-arm-lnt) ;; + linaro-armv8-01-arm-quick) ;; + linaro-armv8-01-arm-selfhost-neon) ;; + linaro-tk1-*) ;; + *) + echo "WARNING: Unknown slavename $slavename" +esac + +case "$slavename:$image" in + *-aarch64-*:*-arm64-*) ;; + *-arm-*:*-armhf-*) ;; + linaro-tk1-*:*-armhf-*) ;; + *) + echo "ERROR: $slavename should not run on $image." + echo "Make sure you're running an AArch64 bot on an arm64 image or an ARM bot on an armhf image." + exit 1 +esac + case "$buildmaster" in "normal") mastername="normal" @@ -47,8 +78,17 @@ case "$mastername" in *) cpu_shares=1000 ;; esac -# Use 64G out of 128G. -memlimit="64" +memlimit=$(free -m | awk '/^Mem/ { print $2 }') +case "$slavename" in + linaro-tk1-*) + # Use at most 90% of RAM on TK1s + memlimit=$(($memlimit * 9 / 10))m + ;; + *) + # Use at most half of all available RAM. + memlimit=$(($memlimit / 2))m + ;; +esac case "$slavename" in *-lld) pids_limit="15000" ;; @@ -60,4 +100,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 --cpu-shares=$cpu_shares --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 --pids-limit=$pids_limit $caps "$image" "$masterurl" "$slavename" "$password" diff --git a/trusty-amd64-art/Dockerfile b/trusty-amd64-art/Dockerfile deleted file mode 100644 index 650c3054..00000000 --- a/trusty-amd64-art/Dockerfile +++ /dev/null @@ -1,63 +0,0 @@ -FROM ubuntu:trusty - -RUN dpkg --add-architecture i386 \ - && apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends software-properties-common \ - && add-apt-repository -y ppa:git-core/ppa \ - && add-apt-repository -y ppa:linaro-maintainers/tools \ - && apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get dist-upgrade -y \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - acpica-tools \ - android-tools-adb \ - bc \ - bison \ - ccache \ - clang \ - curl \ - default-jdk \ - gcc-4.6 \ - g++-multilib \ - genisoimage \ - git \ - gperf \ - lcov \ - less \ - lib32ncurses5 \ - libxml2-utils \ - make \ - openssh-client \ - openssh-server \ - python-mako \ - python-networkx \ - python-requests \ - rsync \ - scons \ - time \ - unzip \ - wget \ - xml-twig-tools \ - zip \ - zlib1g-dev:i386 \ - && wget -q \ - http://snapshot.debian.org/archive/debian/20160609T104519Z/pool/main/a/acpica-unix/acpica-tools_20160527-1_amd64.deb \ - http://de.archive.ubuntu.com/ubuntu/pool/main/m/make-dfsg/make_3.81-8.2ubuntu3_amd64.deb \ - http://mirrors.kernel.org/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jre-headless_8u45-b14-1_amd64.deb \ - http://mirrors.kernel.org/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jre_8u45-b14-1_amd64.deb \ - http://mirrors.kernel.org/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jdk_8u45-b14-1_amd64.deb \ - && dpkg -i --force-all *.deb \ - && apt-mark hold make \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* *.deb - -RUN useradd -m -G plugdev buildslave \ - && echo 'buildslave ALL = NOPASSWD: ALL' > /etc/sudoers.d/jenkins \ - && chmod 0440 /etc/sudoers.d/jenkins \ - && mkdir -p /var/run/sshd /home/buildslave/bin \ - && curl https://raw.githubusercontent.com/google/styleguide/gh-pages/cpplint/cpplint.py > /home/buildslave/bin/cpplint.py \ - && curl https://storage.googleapis.com/git-repo-downloads/repo > /home/buildslave/bin/repo \ - && chmod a+x /home/buildslave/bin/* \ - && chown -R buildslave:buildslave /home/buildslave/bin - -EXPOSE 22 -CMD ["/usr/sbin/sshd", "-D"] diff --git a/trusty-amd64-tcwg-base/Dockerfile b/trusty-amd64-tcwg-base/Dockerfile index bdc767b1..e31b6105 100644 --- a/trusty-amd64-tcwg-base/Dockerfile +++ b/trusty-amd64-tcwg-base/Dockerfile @@ -47,8 +47,12 @@ RUN (url="http://archive.ubuntu.com/ubuntu/"; \ less \ libexpat1-dev \ libglib2.0-dev \ + libgmp-dev \ liblzma-dev \ + libmpc-dev \ + libmpfr-dev \ libncurses5-dev \ + libpixman-1-dev \ libpython2.7-dev \ libreadline-dev \ libssl-dev \ @@ -80,6 +84,7 @@ RUN (url="http://archive.ubuntu.com/ubuntu/"; \ texlive-fonts-recommended \ texlive-latex-recommended \ time \ + unifdef \ valgrind \ vim \ python-virtualenv \ @@ -108,15 +113,26 @@ COPY postfix-sasl_password.in /etc/postfix/sasl_password RUN chown root:root /etc/postfix/sasl_password \ && chmod 600 /etc/postfix/sasl_password +# Add ninja with support for memory-threshold job limitation. +# It's installed with ".bin" extension and containers then +# make wrappers around it in /usr/local/bin/ninja as needed. +RUN git clone -b master https://github.com/maxim-kuvyrkov/ninja.git \ + && cd ninja \ + && ./configure.py --bootstrap && ./ninja all && ./ninja_test \ + && mv ninja /usr/local/bin/ninja.bin \ + && cd .. \ + && rm -rf ninja + RUN mkdir /tmp/docker-install-qemu.$$ \ && cd /tmp/docker-install-qemu.$$ \ - && qemu_ver=2.8.0 && wget --progress=dot:giga http://download.qemu-project.org/qemu-${qemu_ver}.tar.xz \ + && qemu_ver=3.1.0 && wget --progress=dot:giga http://download.qemu-project.org/qemu-${qemu_ver}.tar.xz \ && tar xf qemu-${qemu_ver}.tar.xz \ && mkdir build && cd build \ && ../qemu-${qemu_ver}/configure --prefix=/usr/local --target-list=armeb-linux-user \ && make all install -j $(nproc --all) \ && cd && rm -rf /tmp/docker-install-qemu.$$ + COPY home-data/ /home-data/ COPY new-user.sh /usr/local/bin/ @@ -134,4 +150,4 @@ VOLUME /tmp EXPOSE 22 CMD ["/usr/sbin/sshd", "-D"] -# checksum: 814a72154c55af0cb2e75c091393359b +# checksum: af4fa2fbc82a8ade63491e2a489bb96b diff --git a/trusty-amd64-tcwg-base/trusty-amd64-tcwg-build/Dockerfile b/trusty-amd64-tcwg-base/trusty-amd64-tcwg-build/Dockerfile index f0d30e44..088e35a3 100644 --- a/trusty-amd64-tcwg-base/trusty-amd64-tcwg-build/Dockerfile +++ b/trusty-amd64-tcwg-base/trusty-amd64-tcwg-build/Dockerfile @@ -6,6 +6,8 @@ RUN while read line; do \ continue; \ fi; \ new-user.sh --passwd "$line"; \ + user=$(echo "$line" | cut -d: -f 1); \ + sudo -i -u $user ccache --print-config; \ done </home-data/passwd # Install wine. On amd64 arch we need to enable i386, otherwise wine @@ -20,4 +22,4 @@ RUN \ /var/lib/apt/lists/* \ /tmp/* \ /var/tmp/* -# checksum: 0d3f78647975acb724f2bed4e767ab96 +# checksum: 8cf045e109118559e5638f49e6b22120 diff --git a/trusty-amd64-tcwg-base/trusty-amd64-tcwg-dev/Dockerfile b/trusty-amd64-tcwg-base/trusty-amd64-tcwg-dev/Dockerfile index 4a43d2c8..c1e25ee6 100644 --- a/trusty-amd64-tcwg-base/trusty-amd64-tcwg-dev/Dockerfile +++ b/trusty-amd64-tcwg-base/trusty-amd64-tcwg-dev/Dockerfile @@ -3,29 +3,17 @@ FROM linaro/ci-amd64-tcwg-base-ubuntu:trusty RUN apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y \ - software-properties-common \ - && apt-get clean \ - && rm -rf \ - /var/lib/apt/lists/* \ - /tmp/* \ - /var/tmp/* - -RUN apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y \ apt-file \ git-gui \ git-svn \ gnat \ less \ locales \ - libgmp-dev \ - libmpc-dev \ - libmpfr-dev \ mc \ screen \ + software-properties-common \ stgit \ tmux \ - unifdef \ && apt-get clean \ && rm -rf \ /var/lib/apt/lists/* \ @@ -43,4 +31,4 @@ COPY run.sh start.sh / ENTRYPOINT ["/run.sh"] CMD ["start.sh"] -# checksum: 672122d88b9e3cc028e8cd0df5834752 +# checksum: 4b050cb9917e9068a64dccf1f6d4f57a diff --git a/trusty-arm64-tcwg-base/Dockerfile b/trusty-arm64-tcwg-base/Dockerfile index 271893d6..2d20e996 100644 --- a/trusty-arm64-tcwg-base/Dockerfile +++ b/trusty-arm64-tcwg-base/Dockerfile @@ -44,7 +44,10 @@ RUN (url="http://ports.ubuntu.com/ubuntu-ports/"; \ groff \ less \ libexpat1-dev \ + libgmp-dev \ liblzma-dev \ + libmpc-dev \ + libmpfr-dev \ libncurses5-dev \ libpython2.7-dev \ libreadline-dev \ @@ -73,6 +76,7 @@ RUN (url="http://ports.ubuntu.com/ubuntu-ports/"; \ texlive-fonts-recommended \ texlive-latex-recommended \ time \ + unifdef \ valgrind \ vim \ python-virtualenv \ @@ -101,6 +105,17 @@ COPY postfix-sasl_password.in /etc/postfix/sasl_password RUN chown root:root /etc/postfix/sasl_password \ && chmod 600 /etc/postfix/sasl_password +# Add ninja with support for memory-threshold job limitation. +# It's installed with ".bin" extension and containers then +# make wrappers around it in /usr/local/bin/ninja as needed. +RUN git clone -b master https://github.com/maxim-kuvyrkov/ninja.git \ + && cd ninja \ + && ./configure.py --bootstrap && ./ninja all && ./ninja_test \ + && mv ninja /usr/local/bin/ninja.bin \ + && cd .. \ + && rm -rf ninja + + COPY home-data/ /home-data/ COPY new-user.sh /usr/local/bin/ @@ -118,4 +133,4 @@ VOLUME /tmp EXPOSE 22 CMD ["/usr/sbin/sshd", "-D"] -# checksum: 6cf5d2ef5d0c45e74eb710cb5660ab3c +# checksum: 9a5ebe95dcd5b6352f12f31a90067e8e diff --git a/trusty-arm64-tcwg-base/trusty-arm64-tcwg-build/Dockerfile b/trusty-arm64-tcwg-base/trusty-arm64-tcwg-build/Dockerfile index ec0ab025..403cd1fd 100644 --- a/trusty-arm64-tcwg-base/trusty-arm64-tcwg-build/Dockerfile +++ b/trusty-arm64-tcwg-base/trusty-arm64-tcwg-build/Dockerfile @@ -6,6 +6,8 @@ RUN while read line; do \ continue; \ fi; \ new-user.sh --passwd "$line"; \ + user=$(echo "$line" | cut -d: -f 1); \ + sudo -i -u $user ccache --print-config; \ done </home-data/passwd -# checksum: 36d4ba8834ee42fc1ca4643f5b011bda +# checksum: b3846a54f517aff06c5447eb552dd15a diff --git a/trusty-arm64-tcwg-base/trusty-arm64-tcwg-dev/Dockerfile b/trusty-arm64-tcwg-base/trusty-arm64-tcwg-dev/Dockerfile index 8309de9d..e26b4d27 100644 --- a/trusty-arm64-tcwg-base/trusty-arm64-tcwg-dev/Dockerfile +++ b/trusty-arm64-tcwg-base/trusty-arm64-tcwg-dev/Dockerfile @@ -3,28 +3,16 @@ FROM linaro/ci-arm64-tcwg-base-ubuntu:trusty RUN apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y \ - software-properties-common \ - && apt-get clean \ - && rm -rf \ - /var/lib/apt/lists/* \ - /tmp/* \ - /var/tmp/* - -RUN apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y \ apt-file \ git-gui \ git-svn \ less \ locales \ - libgmp-dev \ - libmpc-dev \ - libmpfr-dev \ mc \ screen \ + software-properties-common \ stgit \ tmux \ - unifdef \ && apt-get clean \ && rm -rf \ /var/lib/apt/lists/* \ @@ -42,4 +30,4 @@ COPY run.sh start.sh / ENTRYPOINT ["/run.sh"] CMD ["start.sh"] -# checksum: 136835f5e64afb27c28164ca451962f4 +# checksum: dc6a18a98fea5a25a5193d4e57b5a59d diff --git a/trusty-armhf-tcwg-base/Dockerfile b/trusty-armhf-tcwg-base/Dockerfile index f31f7d4c..bb6b66c8 100644 --- a/trusty-armhf-tcwg-base/Dockerfile +++ b/trusty-armhf-tcwg-base/Dockerfile @@ -44,7 +44,10 @@ RUN (url="http://ports.ubuntu.com/ubuntu-ports/"; \ groff \ less \ libexpat1-dev \ + libgmp-dev \ liblzma-dev \ + libmpc-dev \ + libmpfr-dev \ libncurses5-dev \ libpython2.7-dev \ libreadline-dev \ @@ -73,6 +76,7 @@ RUN (url="http://ports.ubuntu.com/ubuntu-ports/"; \ texlive-fonts-recommended \ texlive-latex-recommended \ time \ + unifdef \ valgrind \ vim \ python-virtualenv \ @@ -101,6 +105,17 @@ COPY postfix-sasl_password.in /etc/postfix/sasl_password RUN chown root:root /etc/postfix/sasl_password \ && chmod 600 /etc/postfix/sasl_password +# Add ninja with support for memory-threshold job limitation. +# It's installed with ".bin" extension and containers then +# make wrappers around it in /usr/local/bin/ninja as needed. +RUN git clone -b master https://github.com/maxim-kuvyrkov/ninja.git \ + && cd ninja \ + && ./configure.py --bootstrap && ./ninja all && ./ninja_test \ + && mv ninja /usr/local/bin/ninja.bin \ + && cd .. \ + && rm -rf ninja + + COPY home-data/ /home-data/ COPY new-user.sh /usr/local/bin/ @@ -118,4 +133,4 @@ VOLUME /tmp EXPOSE 22 CMD ["linux32", "/usr/sbin/sshd", "-D"] -# checksum: 29383efafa7903e14c3dc0023ae9d711 +# checksum: 43dd94b79ec30383f8b930e4d0d36681 diff --git a/trusty-armhf-tcwg-base/trusty-armhf-tcwg-build/Dockerfile b/trusty-armhf-tcwg-base/trusty-armhf-tcwg-build/Dockerfile index 13aa42a6..46ed9d64 100644 --- a/trusty-armhf-tcwg-base/trusty-armhf-tcwg-build/Dockerfile +++ b/trusty-armhf-tcwg-base/trusty-armhf-tcwg-build/Dockerfile @@ -6,6 +6,8 @@ RUN while read line; do \ continue; \ fi; \ new-user.sh --passwd "$line"; \ + user=$(echo "$line" | cut -d: -f 1); \ + sudo -i -u $user ccache --print-config; \ done </home-data/passwd -# checksum: f0b16677dd91a122dea1a7f6cb00c8a9 +# checksum: 65590c772b7855a6a5746503ff220e72 diff --git a/trusty-armhf-tcwg-base/trusty-armhf-tcwg-dev/Dockerfile b/trusty-armhf-tcwg-base/trusty-armhf-tcwg-dev/Dockerfile index fdb4dc2d..6cddb9ac 100644 --- a/trusty-armhf-tcwg-base/trusty-armhf-tcwg-dev/Dockerfile +++ b/trusty-armhf-tcwg-base/trusty-armhf-tcwg-dev/Dockerfile @@ -3,29 +3,17 @@ FROM linaro/ci-armhf-tcwg-base-ubuntu:trusty RUN apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y \ - software-properties-common \ - && apt-get clean \ - && rm -rf \ - /var/lib/apt/lists/* \ - /tmp/* \ - /var/tmp/* - -RUN apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y \ apt-file \ git-gui \ git-svn \ gnat \ less \ locales \ - libgmp-dev \ - libmpc-dev \ - libmpfr-dev \ mc \ screen \ + software-properties-common \ stgit \ tmux \ - unifdef \ && apt-get clean \ && rm -rf \ /var/lib/apt/lists/* \ @@ -43,4 +31,4 @@ COPY run.sh start.sh / ENTRYPOINT ["linux32", "/run.sh"] CMD ["start.sh"] -# checksum: 13bbddb6be801c28b19e50633ed8f6c8 +# checksum: 3da6f55017f367a840b7513fb3479177 diff --git a/trusty-i386-tcwg-base/Dockerfile b/trusty-i386-tcwg-base/Dockerfile index 9d8fe98a..c0a61ece 100644 --- a/trusty-i386-tcwg-base/Dockerfile +++ b/trusty-i386-tcwg-base/Dockerfile @@ -49,8 +49,12 @@ RUN (url="http://archive.ubuntu.com/ubuntu/"; \ less \ libexpat1-dev \ libglib2.0-dev \ + libgmp-dev \ liblzma-dev \ + libmpc-dev \ + libmpfr-dev \ libncurses5-dev \ + libpixman-1-dev \ libpython2.7-dev \ libreadline-dev \ libssl-dev \ @@ -81,6 +85,7 @@ RUN (url="http://archive.ubuntu.com/ubuntu/"; \ texlive-fonts-recommended \ texlive-latex-recommended \ time \ + unifdef \ valgrind \ vim \ python-virtualenv \ @@ -109,15 +114,26 @@ COPY postfix-sasl_password.in /etc/postfix/sasl_password RUN chown root:root /etc/postfix/sasl_password \ && chmod 600 /etc/postfix/sasl_password +# Add ninja with support for memory-threshold job limitation. +# It's installed with ".bin" extension and containers then +# make wrappers around it in /usr/local/bin/ninja as needed. +RUN git clone -b master https://github.com/maxim-kuvyrkov/ninja.git \ + && cd ninja \ + && ./configure.py --bootstrap && ./ninja all && ./ninja_test \ + && mv ninja /usr/local/bin/ninja.bin \ + && cd .. \ + && rm -rf ninja + RUN mkdir /tmp/docker-install-qemu.$$ \ && cd /tmp/docker-install-qemu.$$ \ - && qemu_ver=2.8.0 && wget --progress=dot:giga http://download.qemu-project.org/qemu-${qemu_ver}.tar.xz \ + && qemu_ver=3.1.0 && wget --progress=dot:giga http://download.qemu-project.org/qemu-${qemu_ver}.tar.xz \ && tar xf qemu-${qemu_ver}.tar.xz \ && mkdir build && cd build \ && ../qemu-${qemu_ver}/configure --prefix=/usr/local --target-list=armeb-linux-user \ && make all install -j $(nproc --all) \ && cd && rm -rf /tmp/docker-install-qemu.$$ + COPY home-data/ /home-data/ COPY new-user.sh /usr/local/bin/ @@ -135,4 +151,4 @@ VOLUME /tmp EXPOSE 22 CMD ["linux32", "/usr/sbin/sshd", "-D"] -# checksum: b81c7618ccf0ea3a18826ed36123cdee +# checksum: 28f82b9ce96b1387fbb2f487e16ab011 diff --git a/trusty-i386-tcwg-base/trusty-i386-tcwg-build/Dockerfile b/trusty-i386-tcwg-base/trusty-i386-tcwg-build/Dockerfile index c5a14d34..3f344b51 100644 --- a/trusty-i386-tcwg-base/trusty-i386-tcwg-build/Dockerfile +++ b/trusty-i386-tcwg-base/trusty-i386-tcwg-build/Dockerfile @@ -6,6 +6,8 @@ RUN while read line; do \ continue; \ fi; \ new-user.sh --passwd "$line"; \ + user=$(echo "$line" | cut -d: -f 1); \ + sudo -i -u $user ccache --print-config; \ done </home-data/passwd # Install wine. On amd64 arch we need to enable i386, otherwise wine @@ -19,4 +21,4 @@ RUN \ /var/lib/apt/lists/* \ /tmp/* \ /var/tmp/* -# checksum: 05747b8e543f8061bcbfb8136b6d852b +# checksum: 00d6640fb2e9cd0c816c1186e0026634 diff --git a/utopic-amd64-art/Dockerfile b/utopic-amd64-art/Dockerfile index 1e134b03..7d749ab7 100644 --- a/utopic-amd64-art/Dockerfile +++ b/utopic-amd64-art/Dockerfile @@ -36,6 +36,7 @@ RUN dpkg --add-architecture i386 \ openssh-client \ openssh-server \ patch \ + parallel \ python-mako \ python-networkx \ python-requests \ @@ -50,9 +51,9 @@ RUN dpkg --add-architecture i386 \ && wget -q \ http://snapshot.debian.org/archive/debian/20160609T104519Z/pool/main/a/acpica-unix/acpica-tools_20160527-1_amd64.deb \ http://de.archive.ubuntu.com/ubuntu/pool/main/m/make-dfsg/make_3.81-8.2ubuntu3_amd64.deb \ - http://mirrors.kernel.org/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jre-headless_8u45-b14-1_amd64.deb \ - http://mirrors.kernel.org/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jre_8u45-b14-1_amd64.deb \ - http://mirrors.kernel.org/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jdk_8u45-b14-1_amd64.deb \ + http://mirrors.edge.kernel.org/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jre-headless_8u181-b13-1_amd64.deb \ + http://mirrors.edge.kernel.org/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jre_8u181-b13-1_amd64.deb \ + http://mirrors.edge.kernel.org/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jdk_8u181-b13-1_amd64.deb \ && dpkg -i --force-all *.deb \ && apt-mark hold make \ && apt-get clean \ diff --git a/xenial-amd64-tcwg-base/Dockerfile b/xenial-amd64-tcwg-base/Dockerfile index 17b29cdd..4aadf6a4 100644 --- a/xenial-amd64-tcwg-base/Dockerfile +++ b/xenial-amd64-tcwg-base/Dockerfile @@ -47,8 +47,12 @@ RUN (url="http://archive.ubuntu.com/ubuntu/"; \ less \ libexpat1-dev \ libglib2.0-dev \ + libgmp-dev \ liblzma-dev \ + libmpc-dev \ + libmpfr-dev \ libncurses5-dev \ + libpixman-1-dev \ libpython2.7-dev \ libreadline-dev \ libssl-dev \ @@ -79,6 +83,7 @@ RUN (url="http://archive.ubuntu.com/ubuntu/"; \ texlive-fonts-recommended \ texlive-latex-recommended \ time \ + unifdef \ valgrind \ vim \ virtualenv \ @@ -107,15 +112,26 @@ COPY postfix-sasl_password.in /etc/postfix/sasl_password RUN chown root:root /etc/postfix/sasl_password \ && chmod 600 /etc/postfix/sasl_password +# Add ninja with support for memory-threshold job limitation. +# It's installed with ".bin" extension and containers then +# make wrappers around it in /usr/local/bin/ninja as needed. +RUN git clone -b master https://github.com/maxim-kuvyrkov/ninja.git \ + && cd ninja \ + && ./configure.py --bootstrap && ./ninja all && ./ninja_test \ + && mv ninja /usr/local/bin/ninja.bin \ + && cd .. \ + && rm -rf ninja + RUN mkdir /tmp/docker-install-qemu.$$ \ && cd /tmp/docker-install-qemu.$$ \ - && qemu_ver=2.8.0 && wget --progress=dot:giga http://download.qemu-project.org/qemu-${qemu_ver}.tar.xz \ + && qemu_ver=3.1.0 && wget --progress=dot:giga http://download.qemu-project.org/qemu-${qemu_ver}.tar.xz \ && tar xf qemu-${qemu_ver}.tar.xz \ && mkdir build && cd build \ && ../qemu-${qemu_ver}/configure --prefix=/usr/local --target-list=armeb-linux-user \ && make all install -j $(nproc --all) \ && cd && rm -rf /tmp/docker-install-qemu.$$ + COPY home-data/ /home-data/ COPY new-user.sh /usr/local/bin/ @@ -133,4 +149,4 @@ VOLUME /tmp EXPOSE 22 CMD ["/usr/sbin/sshd", "-D"] -# checksum: 99c24a8b676909e9f2ea94c1942a3d14 +# checksum: 45c951efede684cca687084277d49621 diff --git a/xenial-amd64-tcwg-base/xenial-amd64-tcwg-build/Dockerfile b/xenial-amd64-tcwg-base/xenial-amd64-tcwg-build/Dockerfile index 42b8d8d1..65b4d824 100644 --- a/xenial-amd64-tcwg-base/xenial-amd64-tcwg-build/Dockerfile +++ b/xenial-amd64-tcwg-base/xenial-amd64-tcwg-build/Dockerfile @@ -6,6 +6,8 @@ RUN while read line; do \ continue; \ fi; \ new-user.sh --passwd "$line"; \ + user=$(echo "$line" | cut -d: -f 1); \ + sudo -i -u $user ccache --print-config; \ done </home-data/passwd # Install wine. On amd64 arch we need to enable i386, otherwise wine @@ -20,4 +22,4 @@ RUN \ /var/lib/apt/lists/* \ /tmp/* \ /var/tmp/* -# checksum: 5ec4314bb47180f2d9b6430d56a1292f +# checksum: 55ac8c54cb4645138ac4fda8ed8586f5 diff --git a/xenial-amd64-tcwg-base/xenial-amd64-tcwg-dev/Dockerfile b/xenial-amd64-tcwg-base/xenial-amd64-tcwg-dev/Dockerfile index 6ee6609f..3a589c73 100644 --- a/xenial-amd64-tcwg-base/xenial-amd64-tcwg-dev/Dockerfile +++ b/xenial-amd64-tcwg-base/xenial-amd64-tcwg-dev/Dockerfile @@ -3,29 +3,17 @@ FROM linaro/ci-amd64-tcwg-base-ubuntu:xenial RUN apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y \ - software-properties-common \ - && apt-get clean \ - && rm -rf \ - /var/lib/apt/lists/* \ - /tmp/* \ - /var/tmp/* - -RUN apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y \ apt-file \ git-gui \ git-svn \ gnat-5 \ less \ locales \ - libgmp-dev \ - libmpc-dev \ - libmpfr-dev \ mc \ screen \ + software-properties-common \ stgit \ tmux \ - unifdef \ && apt-get clean \ && rm -rf \ /var/lib/apt/lists/* \ @@ -43,4 +31,4 @@ COPY run.sh start.sh / ENTRYPOINT ["/run.sh"] CMD ["start.sh"] -# checksum: ce97ce5f929251c1dd59473d63aa00c0 +# checksum: f54252755ff04b9508233acaee33cd32 diff --git a/xenial-amd64-tcwg-base/xenial-amd64-tcwg-dev/xenial-amd64-tcwg-x2go/Dockerfile b/xenial-amd64-tcwg-base/xenial-amd64-tcwg-dev/xenial-amd64-tcwg-x2go/Dockerfile deleted file mode 100644 index a7909d59..00000000 --- a/xenial-amd64-tcwg-base/xenial-amd64-tcwg-dev/xenial-amd64-tcwg-x2go/Dockerfile +++ /dev/null @@ -1,38 +0,0 @@ -# Auto generated from tcwg-base/tcwg-dev/tcwg-x2go/Dockerfile.in. Do not edit. -FROM linaro/ci-amd64-tcwg-dev-ubuntu:xenial - -COPY start.sh . - -RUN apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y \ - ubuntu-desktop \ - && apt-get clean \ - && rm -rf \ - /var/lib/apt/lists/* \ - /tmp/* \ - /var/tmp/* - -RUN add-apt-repository ppa:x2go/stable \ - && apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y \ - duplicity \ - mate-desktop-environment \ - x2godesktopsharing \ - x2gomatebindings \ - x2goserver \ - x2goserver-xsession \ - && apt-get clean \ - && rm -rf \ - /var/lib/apt/lists/* \ - /tmp/* \ - /var/tmp/* - -RUN apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y \ - ddd \ - && apt-get clean \ - && rm -rf \ - /var/lib/apt/lists/* \ - /tmp/* \ - /var/tmp/* -# checksum: 3e1c139ac1715b1096130c6e90c55fc9 diff --git a/xenial-amd64-tcwg-base/xenial-amd64-tcwg-dev/xenial-amd64-tcwg-x2go/build.sh b/xenial-amd64-tcwg-base/xenial-amd64-tcwg-dev/xenial-amd64-tcwg-x2go/build.sh deleted file mode 120000 index 6e52e4e6..00000000 --- a/xenial-amd64-tcwg-base/xenial-amd64-tcwg-dev/xenial-amd64-tcwg-x2go/build.sh +++ /dev/null @@ -1 +0,0 @@ -../../../tcwg-base/tcwg-dev/tcwg-x2go/build.sh
\ No newline at end of file diff --git a/xenial-amd64-tcwg-base/xenial-amd64-tcwg-dev/xenial-amd64-tcwg-x2go/gerrit-branches b/xenial-amd64-tcwg-base/xenial-amd64-tcwg-dev/xenial-amd64-tcwg-x2go/gerrit-branches deleted file mode 120000 index 748350c7..00000000 --- a/xenial-amd64-tcwg-base/xenial-amd64-tcwg-dev/xenial-amd64-tcwg-x2go/gerrit-branches +++ /dev/null @@ -1 +0,0 @@ -../../../tcwg-base/tcwg-dev/tcwg-x2go/gerrit-branches
\ No newline at end of file diff --git a/xenial-arm64-tcwg-base/Dockerfile b/xenial-arm64-tcwg-base/Dockerfile index 196d5829..2ba6c04f 100644 --- a/xenial-arm64-tcwg-base/Dockerfile +++ b/xenial-arm64-tcwg-base/Dockerfile @@ -44,7 +44,10 @@ RUN (url="http://ports.ubuntu.com/ubuntu-ports/"; \ groff \ less \ libexpat1-dev \ + libgmp-dev \ liblzma-dev \ + libmpc-dev \ + libmpfr-dev \ libncurses5-dev \ libpython2.7-dev \ libreadline-dev \ @@ -74,6 +77,7 @@ RUN (url="http://ports.ubuntu.com/ubuntu-ports/"; \ texlive-fonts-recommended \ texlive-latex-recommended \ time \ + unifdef \ valgrind \ vim \ virtualenv \ @@ -102,6 +106,17 @@ COPY postfix-sasl_password.in /etc/postfix/sasl_password RUN chown root:root /etc/postfix/sasl_password \ && chmod 600 /etc/postfix/sasl_password +# Add ninja with support for memory-threshold job limitation. +# It's installed with ".bin" extension and containers then +# make wrappers around it in /usr/local/bin/ninja as needed. +RUN git clone -b master https://github.com/maxim-kuvyrkov/ninja.git \ + && cd ninja \ + && ./configure.py --bootstrap && ./ninja all && ./ninja_test \ + && mv ninja /usr/local/bin/ninja.bin \ + && cd .. \ + && rm -rf ninja + + COPY home-data/ /home-data/ COPY new-user.sh /usr/local/bin/ @@ -119,4 +134,4 @@ VOLUME /tmp EXPOSE 22 CMD ["/usr/sbin/sshd", "-D"] -# checksum: f331e97904e7806cfc56a0a00c8aaaae +# checksum: 5d69a0e67de38ed9fb2fd87244c1b6ce diff --git a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-build/Dockerfile b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-build/Dockerfile index 310695a9..41b05edd 100644 --- a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-build/Dockerfile +++ b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-build/Dockerfile @@ -6,6 +6,8 @@ RUN while read line; do \ continue; \ fi; \ new-user.sh --passwd "$line"; \ + user=$(echo "$line" | cut -d: -f 1); \ + sudo -i -u $user ccache --print-config; \ done </home-data/passwd -# checksum: 4d88d7f7bd807bc14693d2641fd270c3 +# checksum: 443d79e453fa3bdf6ad9089f670cd90f diff --git a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-dev/Dockerfile b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-dev/Dockerfile index 7ea48035..db0cd0ba 100644 --- a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-dev/Dockerfile +++ b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-dev/Dockerfile @@ -3,29 +3,17 @@ FROM linaro/ci-arm64-tcwg-base-ubuntu:xenial RUN apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y \ - software-properties-common \ - && apt-get clean \ - && rm -rf \ - /var/lib/apt/lists/* \ - /tmp/* \ - /var/tmp/* - -RUN apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y \ apt-file \ git-gui \ git-svn \ gnat-5 \ less \ locales \ - libgmp-dev \ - libmpc-dev \ - libmpfr-dev \ mc \ screen \ + software-properties-common \ stgit \ tmux \ - unifdef \ && apt-get clean \ && rm -rf \ /var/lib/apt/lists/* \ @@ -43,4 +31,4 @@ COPY run.sh start.sh / ENTRYPOINT ["/run.sh"] CMD ["start.sh"] -# checksum: af20c5a49f8dfcab4991049770e8aeaf +# checksum: 7d7b7765e822f49af3ecb6fad5353a16 diff --git a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-llvmbot/Dockerfile b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-llvmbot/Dockerfile index fb8fc11f..439570e5 100644 --- a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-llvmbot/Dockerfile +++ b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-llvmbot/Dockerfile @@ -2,8 +2,12 @@ FROM linaro/ci-arm64-tcwg-base-ubuntu:xenial RUN apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y software-properties-common \ + && DEBIAN_FRONTEND=noninteractive add-apt-repository -y ppa:ubuntu-toolchain-r/test \ + && apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y \ buildbot \ + g++-7 \ && apt-get clean \ && rm -rf \ /var/lib/apt/lists/* \ @@ -22,14 +26,6 @@ RUN cd ./llvm-config-buildslave/ \ /var/tmp/* \ && sudo -i -u buildslave mkdir /home/buildslave/buildslave -# Add ninja with support for memory-threshold job limitation. -RUN git clone -b master https://github.com/maxim-kuvyrkov/ninja.git \ - && cd ninja \ - && ./configure.py --bootstrap && ./ninja all && ./ninja_test \ - && mv ninja /usr/local/bin/ninja.bin \ - && cd .. \ - && rm -rf ninja - # Add current clang for libcxx bots. RUN \ clang_ver=clang+llvm-6.0.0-aarch64-linux-gnu \ @@ -45,4 +41,4 @@ COPY start.sh . ENTRYPOINT ["/run.sh"] CMD ["start.sh"] -# checksum: 765b3adb1b9e9f5ee905e980c41f2a32 +# checksum: 3601aae3505cd568a70051c768ab6cd9 diff --git a/xenial-armhf-tcwg-base/Dockerfile b/xenial-armhf-tcwg-base/Dockerfile index 3d957386..9964f843 100644 --- a/xenial-armhf-tcwg-base/Dockerfile +++ b/xenial-armhf-tcwg-base/Dockerfile @@ -44,7 +44,10 @@ RUN (url="http://ports.ubuntu.com/ubuntu-ports/"; \ groff \ less \ libexpat1-dev \ + libgmp-dev \ liblzma-dev \ + libmpc-dev \ + libmpfr-dev \ libncurses5-dev \ libpython2.7-dev \ libreadline-dev \ @@ -74,6 +77,7 @@ RUN (url="http://ports.ubuntu.com/ubuntu-ports/"; \ texlive-fonts-recommended \ texlive-latex-recommended \ time \ + unifdef \ valgrind \ vim \ virtualenv \ @@ -102,6 +106,17 @@ COPY postfix-sasl_password.in /etc/postfix/sasl_password RUN chown root:root /etc/postfix/sasl_password \ && chmod 600 /etc/postfix/sasl_password +# Add ninja with support for memory-threshold job limitation. +# It's installed with ".bin" extension and containers then +# make wrappers around it in /usr/local/bin/ninja as needed. +RUN git clone -b master https://github.com/maxim-kuvyrkov/ninja.git \ + && cd ninja \ + && ./configure.py --bootstrap && ./ninja all && ./ninja_test \ + && mv ninja /usr/local/bin/ninja.bin \ + && cd .. \ + && rm -rf ninja + + COPY home-data/ /home-data/ COPY new-user.sh /usr/local/bin/ @@ -119,4 +134,4 @@ VOLUME /tmp EXPOSE 22 CMD ["linux32", "/usr/sbin/sshd", "-D"] -# checksum: 3e029e523b443199b700a681508f4514 +# checksum: 85986dd6dd8ddc162d40addb2a4f80b8 diff --git a/xenial-armhf-tcwg-base/xenial-armhf-tcwg-build/Dockerfile b/xenial-armhf-tcwg-base/xenial-armhf-tcwg-build/Dockerfile index 61718983..09c06be4 100644 --- a/xenial-armhf-tcwg-base/xenial-armhf-tcwg-build/Dockerfile +++ b/xenial-armhf-tcwg-base/xenial-armhf-tcwg-build/Dockerfile @@ -6,6 +6,8 @@ RUN while read line; do \ continue; \ fi; \ new-user.sh --passwd "$line"; \ + user=$(echo "$line" | cut -d: -f 1); \ + sudo -i -u $user ccache --print-config; \ done </home-data/passwd -# checksum: c815138e51130526b39402332535d2e5 +# checksum: 42236a4db3a31045c88d1a3859571f0f diff --git a/xenial-armhf-tcwg-base/xenial-armhf-tcwg-dev/Dockerfile b/xenial-armhf-tcwg-base/xenial-armhf-tcwg-dev/Dockerfile index 52fdb594..49a67cbe 100644 --- a/xenial-armhf-tcwg-base/xenial-armhf-tcwg-dev/Dockerfile +++ b/xenial-armhf-tcwg-base/xenial-armhf-tcwg-dev/Dockerfile @@ -3,29 +3,17 @@ FROM linaro/ci-armhf-tcwg-base-ubuntu:xenial RUN apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y \ - software-properties-common \ - && apt-get clean \ - && rm -rf \ - /var/lib/apt/lists/* \ - /tmp/* \ - /var/tmp/* - -RUN apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y \ apt-file \ git-gui \ git-svn \ gnat-5 \ less \ locales \ - libgmp-dev \ - libmpc-dev \ - libmpfr-dev \ mc \ screen \ + software-properties-common \ stgit \ tmux \ - unifdef \ && apt-get clean \ && rm -rf \ /var/lib/apt/lists/* \ @@ -43,4 +31,4 @@ COPY run.sh start.sh / ENTRYPOINT ["linux32", "/run.sh"] CMD ["start.sh"] -# checksum: 86ef26614d9556c57c42136f4cf5b87f +# checksum: b8cb9f0df64f714ab0d4514517850f35 diff --git a/xenial-armhf-tcwg-base/xenial-armhf-tcwg-host/Dockerfile b/xenial-armhf-tcwg-base/xenial-armhf-tcwg-host/Dockerfile new file mode 100644 index 00000000..069193ec --- /dev/null +++ b/xenial-armhf-tcwg-base/xenial-armhf-tcwg-host/Dockerfile @@ -0,0 +1,11 @@ +# Auto generated from tcwg-base/tcwg-host/Dockerfile.in. Do not edit. +FROM linaro/ci-armhf-tcwg-base-ubuntu:xenial + +COPY docker-wrapper /usr/local/bin/docker +COPY docker-stats /usr/local/bin/ + +COPY run.sh start.sh / + +ENTRYPOINT ["linux32", "/run.sh"] +CMD ["start.sh"] +# checksum: ba7a02aa96c3b6df313c3fac751b47bc diff --git a/xenial-armhf-tcwg-base/xenial-armhf-tcwg-host/build.sh b/xenial-armhf-tcwg-base/xenial-armhf-tcwg-host/build.sh new file mode 120000 index 00000000..2c954456 --- /dev/null +++ b/xenial-armhf-tcwg-base/xenial-armhf-tcwg-host/build.sh @@ -0,0 +1 @@ +../../tcwg-base/tcwg-host/build.sh
\ No newline at end of file diff --git a/xenial-armhf-tcwg-base/xenial-armhf-tcwg-host/gerrit-branches b/xenial-armhf-tcwg-base/xenial-armhf-tcwg-host/gerrit-branches new file mode 120000 index 00000000..44e3578e --- /dev/null +++ b/xenial-armhf-tcwg-base/xenial-armhf-tcwg-host/gerrit-branches @@ -0,0 +1 @@ +../../tcwg-base/tcwg-host/gerrit-branches
\ No newline at end of file diff --git a/xenial-armhf-tcwg-base/xenial-armhf-tcwg-llvmbot/Dockerfile b/xenial-armhf-tcwg-base/xenial-armhf-tcwg-llvmbot/Dockerfile index 51f57671..7efb553f 100644 --- a/xenial-armhf-tcwg-base/xenial-armhf-tcwg-llvmbot/Dockerfile +++ b/xenial-armhf-tcwg-base/xenial-armhf-tcwg-llvmbot/Dockerfile @@ -2,8 +2,12 @@ FROM linaro/ci-armhf-tcwg-base-ubuntu:xenial RUN apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y software-properties-common \ + && DEBIAN_FRONTEND=noninteractive add-apt-repository -y ppa:ubuntu-toolchain-r/test \ + && apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y \ buildbot \ + g++-7 \ && apt-get clean \ && rm -rf \ /var/lib/apt/lists/* \ @@ -22,14 +26,6 @@ RUN cd ./llvm-config-buildslave/ \ /var/tmp/* \ && sudo -i -u buildslave mkdir /home/buildslave/buildslave -# Add ninja with support for memory-threshold job limitation. -RUN git clone -b master https://github.com/maxim-kuvyrkov/ninja.git \ - && cd ninja \ - && ./configure.py --bootstrap && ./ninja all && ./ninja_test \ - && mv ninja /usr/local/bin/ninja.bin \ - && cd .. \ - && rm -rf ninja - # Add current clang for libcxx bots. RUN \ clang_ver=clang+llvm-6.0.0-armv7a-linux-gnueabihf \ @@ -45,4 +41,4 @@ COPY start.sh . ENTRYPOINT ["linux32", "/run.sh"] CMD ["start.sh"] -# checksum: fba53876c5cbd698ed2ca6b27da7f04e +# checksum: cf73c99640ab904d9997a941177001f1 diff --git a/xenial-i386-tcwg-base/Dockerfile b/xenial-i386-tcwg-base/Dockerfile index 67d8d304..1023b6ed 100644 --- a/xenial-i386-tcwg-base/Dockerfile +++ b/xenial-i386-tcwg-base/Dockerfile @@ -49,8 +49,12 @@ RUN (url="http://archive.ubuntu.com/ubuntu/"; \ less \ libexpat1-dev \ libglib2.0-dev \ + libgmp-dev \ liblzma-dev \ + libmpc-dev \ + libmpfr-dev \ libncurses5-dev \ + libpixman-1-dev \ libpython2.7-dev \ libreadline-dev \ libssl-dev \ @@ -81,6 +85,7 @@ RUN (url="http://archive.ubuntu.com/ubuntu/"; \ texlive-fonts-recommended \ texlive-latex-recommended \ time \ + unifdef \ valgrind \ vim \ virtualenv \ @@ -109,15 +114,26 @@ COPY postfix-sasl_password.in /etc/postfix/sasl_password RUN chown root:root /etc/postfix/sasl_password \ && chmod 600 /etc/postfix/sasl_password +# Add ninja with support for memory-threshold job limitation. +# It's installed with ".bin" extension and containers then +# make wrappers around it in /usr/local/bin/ninja as needed. +RUN git clone -b master https://github.com/maxim-kuvyrkov/ninja.git \ + && cd ninja \ + && ./configure.py --bootstrap && ./ninja all && ./ninja_test \ + && mv ninja /usr/local/bin/ninja.bin \ + && cd .. \ + && rm -rf ninja + RUN mkdir /tmp/docker-install-qemu.$$ \ && cd /tmp/docker-install-qemu.$$ \ - && qemu_ver=2.8.0 && wget --progress=dot:giga http://download.qemu-project.org/qemu-${qemu_ver}.tar.xz \ + && qemu_ver=3.1.0 && wget --progress=dot:giga http://download.qemu-project.org/qemu-${qemu_ver}.tar.xz \ && tar xf qemu-${qemu_ver}.tar.xz \ && mkdir build && cd build \ && ../qemu-${qemu_ver}/configure --prefix=/usr/local --target-list=armeb-linux-user \ && make all install -j $(nproc --all) \ && cd && rm -rf /tmp/docker-install-qemu.$$ + COPY home-data/ /home-data/ COPY new-user.sh /usr/local/bin/ @@ -135,4 +151,4 @@ VOLUME /tmp EXPOSE 22 CMD ["linux32", "/usr/sbin/sshd", "-D"] -# checksum: 69c56b854878cdb5a7cba9969ac207ea +# checksum: 6250ecddc1d62a1bd9c34d0a1af2b5de diff --git a/xenial-i386-tcwg-base/xenial-i386-tcwg-build/Dockerfile b/xenial-i386-tcwg-base/xenial-i386-tcwg-build/Dockerfile index 101688c0..9ef8d56d 100644 --- a/xenial-i386-tcwg-base/xenial-i386-tcwg-build/Dockerfile +++ b/xenial-i386-tcwg-base/xenial-i386-tcwg-build/Dockerfile @@ -6,6 +6,8 @@ RUN while read line; do \ continue; \ fi; \ new-user.sh --passwd "$line"; \ + user=$(echo "$line" | cut -d: -f 1); \ + sudo -i -u $user ccache --print-config; \ done </home-data/passwd # Install wine. On amd64 arch we need to enable i386, otherwise wine @@ -19,4 +21,4 @@ RUN \ /var/lib/apt/lists/* \ /tmp/* \ /var/tmp/* -# checksum: 187d9beb3498e962ef96cdc3ca97a938 +# checksum: c9e664ac8fbca90586d162b8dce9dd53 diff --git a/xenial-i386-tcwg-base/xenial-i386-tcwg-dev/Dockerfile b/xenial-i386-tcwg-base/xenial-i386-tcwg-dev/Dockerfile index 16b67a8d..e06816fe 100644 --- a/xenial-i386-tcwg-base/xenial-i386-tcwg-dev/Dockerfile +++ b/xenial-i386-tcwg-base/xenial-i386-tcwg-dev/Dockerfile @@ -3,29 +3,17 @@ FROM linaro/ci-i386-tcwg-base-ubuntu:xenial RUN apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y \ - software-properties-common \ - && apt-get clean \ - && rm -rf \ - /var/lib/apt/lists/* \ - /tmp/* \ - /var/tmp/* - -RUN apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y \ apt-file \ git-gui \ git-svn \ gnat-5 \ less \ locales \ - libgmp-dev \ - libmpc-dev \ - libmpfr-dev \ mc \ screen \ + software-properties-common \ stgit \ tmux \ - unifdef \ && apt-get clean \ && rm -rf \ /var/lib/apt/lists/* \ @@ -43,4 +31,4 @@ COPY run.sh start.sh / ENTRYPOINT ["linux32", "/run.sh"] CMD ["start.sh"] -# checksum: f4c0c13056527d2caf20e2e2682098c0 +# checksum: f1db2fea09ca33b4f8f4f94e36a373ec |