aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Kuvyrkov <maxim.kuvyrkov@linaro.org>2018-01-14 16:32:45 +0000
committerMaxim Kuvyrkov <maxim.kuvyrkov@linaro.org>2018-01-14 16:35:06 +0000
commit95035bfe8cb95a2a88f12d27d33d1a4ae4c965eb (patch)
tree23cc051671c357730122e15b0604e603864be3d4
parent911b8700e3d28f66834ce1597e025af02be41a9d (diff)
parent4e90b93008127a5c8cd77415dd2eeb3b7457b1c5 (diff)
downloaddockerfiles-tcwg-llvmprod.tar.gz
Merge branch 'master' into tcwg-llvmprodtcwg-llvmprod
Change-Id: Ie2b7007eef6d0a70ceb3eabda89a28ebc1b4d88e
-rw-r--r--jessie-amd64-jenkins-master/Dockerfile10
-rw-r--r--jessie-amd64-jenkins-master/plugins.txt16
-rw-r--r--latest-amd64-tcwg-llvmmonitor/Dockerfile21
-rwxr-xr-xlatest-amd64-tcwg-llvmmonitor/build.sh23
-rw-r--r--latest-amd64-tcwg-llvmmonitor/gerrit-branches1
-rw-r--r--stretch-arm64-fai/Dockerfile33
-rwxr-xr-xstretch-arm64-fai/build.sh13
-rw-r--r--tcwg-base/tcwg-llvmbot/gerrit-branches1
8 files changed, 109 insertions, 9 deletions
diff --git a/jessie-amd64-jenkins-master/Dockerfile b/jessie-amd64-jenkins-master/Dockerfile
index f91866b..4620aaa 100644
--- a/jessie-amd64-jenkins-master/Dockerfile
+++ b/jessie-amd64-jenkins-master/Dockerfile
@@ -1,4 +1,4 @@
-FROM jenkinsci/jenkins:2.73.2
+FROM jenkinsci/jenkins:2.89.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"
@@ -19,13 +19,21 @@ RUN wget -q https://bootstrap.pypa.io/get-pip.py -O /tmp/get-pip.py \
&& ln -s /var/jenkins_home /var/lib/jenkins \
&& mkdir -p /usr/share/groovy/lib \
&& wget -q https://search.maven.org/remotecontent?filepath=org/codehaus/groovy/groovy-xmlrpc/0.8/groovy-xmlrpc-0.8.jar -O /usr/share/groovy/lib/groovy-xmlrpc-0.8.jar \
+ && wget -q https://storage.googleapis.com/git-repo-downloads/repo -O /usr/bin/repo \
+ && chmod +x /usr/bin/repo \
&& apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+ ansible \
debian-keyring \
devscripts \
+ dirmngr \
dput \
+ jq \
+ python-future \
python-paramiko \
python-requests \
+ sshpass \
+ virtualenv \
&& wget -q https://launchpad.net/ubuntu/+archive/primary/+files/dput_0.9.6.4ubuntu3_all.deb \
&& dpkg -i --force-all *.deb \
&& apt-get clean \
diff --git a/jessie-amd64-jenkins-master/plugins.txt b/jessie-amd64-jenkins-master/plugins.txt
index 23f0a1a..775a44d 100644
--- a/jessie-amd64-jenkins-master/plugins.txt
+++ b/jessie-amd64-jenkins-master/plugins.txt
@@ -15,26 +15,26 @@ docker-plugin:1.0.0
docker-slaves:1.0.7
dropdown-viewstabbar-plugin:1.7
dynamic-axis:1.0.3
-ec2:1.37
+ec2:1.38
email-ext:2.61
embeddable-build-status:1.9
extended-read-permission:2.0
external-monitor-job:1.7
ghprb:1.39.0
-gerrit-trigger:2.26.2
+gerrit-trigger:2.27.1
github-organization-folder:1.6
greenballs:1.15
groovy-postbuild:1.10
heavy-job:1.1
htmlpublisher:1.14
ircbot:2.30
-jira:2.4.2
+jira:2.5
jenkins-multijob-plugin:1.28
jobConfigHistory:2.18
-ldap:1.17
+ldap:1.18
leastload:1.0.3
log-parser:2.0
-matrix-auth:2.1
+matrix-auth:2.2
matrixtieparent:1.2
mercurial:1.61
metrics:3.1.2.10
@@ -51,14 +51,14 @@ rebuild:1.27
repo:1.10.7
simple-theme-plugin:0.3
ssh-agent:1.15
-subversion:2.9
+subversion:2.10.1
throttle-concurrents:2.0.1
timestamper:1.8.8
translation:1.15
urltrigger:0.41
-warnings:4.63
+warnings:4.64
windows-slaves:1.3.1
workflow-aggregator:2.5
ws-cleanup:0.34
xvfb:1.1.3
-yet-another-docker-plugin:0.1.0-rc45
+yet-another-docker-plugin:0.1.0-rc46
diff --git a/latest-amd64-tcwg-llvmmonitor/Dockerfile b/latest-amd64-tcwg-llvmmonitor/Dockerfile
new file mode 100644
index 0000000..9683fe9
--- /dev/null
+++ b/latest-amd64-tcwg-llvmmonitor/Dockerfile
@@ -0,0 +1,21 @@
+FROM nginx:latest
+
+RUN apt-get update \
+ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+ cron \
+ git \
+ libjson-perl \
+ libwww-perl \
+ && git clone https://git.linaro.org/toolchain/llvm/linaro-scripts.git \
+ && /linaro-scripts/monitor/install.sh /linaro-scripts-monitor \
+ && rm -rf /usr/share/nginx/html \
+ && ln -s /linaro-scripts-monitor/html /usr/share/nginx/html \
+ && echo "*/5 * * * * /linaro-scripts-monitor/bin/bot-status /linaro-scripts-monitor/bin/linaro.json /linaro-scripts-monitor/html/index.html && chmod +r /linaro-scripts-monitor/html/index.html" | crontab - \
+ && rm -rf \
+ /var/lib/apt/lists/* \
+ /tmp/* \
+ /var/tmp/*
+
+CMD ["bash", "-c", "service cron start && exec nginx -g 'daemon off;'"]
+
+# docker run -d -p 80:80 --name llvmmonitor linaro/ci-amd64-tcwg-llvmmonitor-nginx
diff --git a/latest-amd64-tcwg-llvmmonitor/build.sh b/latest-amd64-tcwg-llvmmonitor/build.sh
new file mode 100755
index 0000000..18775bf
--- /dev/null
+++ b/latest-amd64-tcwg-llvmmonitor/build.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+set -e
+
+trap cleanup_exit INT TERM EXIT
+
+cleanup_exit()
+{
+ :
+}
+
+export LANG=C
+top=$(git rev-parse --show-toplevel)
+distro=$(basename ${PWD} | cut -f1 -d '-')
+arch=$(basename ${PWD} | cut -f2 -d '-')
+name=$(basename ${PWD} | cut -f3- -d '-')
+image=linaro/ci-${arch}-${name}-nginx:${distro}
+baseimage=$(grep "^FROM" Dockerfile | head -n 1 | cut -d" " -f 2)
+
+docker pull $baseimage 2>/dev/null || true
+docker pull $image 2>/dev/null || true
+docker build --tag=$image .
+echo $image > .docker-tag
diff --git a/latest-amd64-tcwg-llvmmonitor/gerrit-branches b/latest-amd64-tcwg-llvmmonitor/gerrit-branches
new file mode 100644
index 0000000..1f7391f
--- /dev/null
+++ b/latest-amd64-tcwg-llvmmonitor/gerrit-branches
@@ -0,0 +1 @@
+master
diff --git a/stretch-arm64-fai/Dockerfile b/stretch-arm64-fai/Dockerfile
new file mode 100644
index 0000000..458d542
--- /dev/null
+++ b/stretch-arm64-fai/Dockerfile
@@ -0,0 +1,33 @@
+FROM linaro/base-arm64-debian:stretch
+
+COPY *.list *.key /etc/apt/sources.list.d/
+
+RUN apt-get update -q \
+ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gnupg \
+ && apt-key add /etc/apt/sources.list.d/*.key \
+ && apt-get update -q \
+ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+ android-tools-fsutils \
+ android-tools-mkbootimg \
+ debootstrap \
+ dosfstools \
+ e2fsprogs \
+ fai-server \
+ fai-setup-storage \
+ gdisk \
+ gettext-base \
+ git \
+ kpartx \
+ parted \
+ pigz \
+ procps \
+ qemu-utils \
+ wget \
+ xz-utils \
+ && apt-get clean \
+ && rm -rf \
+ /etc/apt/sources.list.d/*.key \
+ /var/lib/apt/lists/* \
+ /tmp/* \
+ /var/tmp/*
+
diff --git a/stretch-arm64-fai/build.sh b/stretch-arm64-fai/build.sh
new file mode 100755
index 0000000..f1c5bc8
--- /dev/null
+++ b/stretch-arm64-fai/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 '-')
+cp -a ../linaro-overlay-obs.list ../linaro-overlay-obs.key .
+
+image=linaro/${ARCHITECTURE}-fai
+docker build --pull --tag=$image .
+echo $image > .docker-tag
diff --git a/tcwg-base/tcwg-llvmbot/gerrit-branches b/tcwg-base/tcwg-llvmbot/gerrit-branches
index fb49cdf..6499512 100644
--- a/tcwg-base/tcwg-llvmbot/gerrit-branches
+++ b/tcwg-base/tcwg-llvmbot/gerrit-branches
@@ -1,3 +1,4 @@
master
tcwg-staging
tcwg-llvmprod
+