aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bionic-amd64-tf-a-build/Dockerfile4
-rw-r--r--bionic-amd64-tf-a-build/requirements_python3.txt11
-rw-r--r--bullseye-amd64-tf-m-qemu/Dockerfile1
-rw-r--r--jessie-amd64-jenkins-master/Dockerfile4
-rw-r--r--jessie-amd64-jenkins-master/plugins.txt32
5 files changed, 28 insertions, 24 deletions
diff --git a/bionic-amd64-tf-a-build/Dockerfile b/bionic-amd64-tf-a-build/Dockerfile
index a1c52e0..af6419c 100644
--- a/bionic-amd64-tf-a-build/Dockerfile
+++ b/bionic-amd64-tf-a-build/Dockerfile
@@ -8,9 +8,11 @@ ENV TOOLS_DIR=/home/buildslave/tools
ENV PATH=${TOOLS_DIR}/bin:${PATH}
ENV PLANTUML_JAR_PATH=/usr/share/plantuml/plantuml.jar
ENV PKG_DEPS="\
+ bc \
bison \
build-essential \
clang-tools-6.0 \
+ cpio \
curl \
default-jre \
device-tree-compiler \
@@ -65,7 +67,7 @@ RUN set -e ;\
apt update -q=2 ;\
apt install -q=2 --yes --no-install-recommends git-lfs ;\
# Install Python requirements
- curl -s https://bootstrap.pypa.io/get-pip.py -o /tmp/get-pip.py ;\
+ curl -s https://bootstrap.pypa.io/3.5/get-pip.py -o /tmp/get-pip.py ;\
python2 /tmp/get-pip.py ;\
pip2 install --no-cache-dir -r /opt/requirements_python2.txt ;\
python3 /tmp/get-pip.py ;\
diff --git a/bionic-amd64-tf-a-build/requirements_python3.txt b/bionic-amd64-tf-a-build/requirements_python3.txt
index 510bb63..99e67e0 100644
--- a/bionic-amd64-tf-a-build/requirements_python3.txt
+++ b/bionic-amd64-tf-a-build/requirements_python3.txt
@@ -1,17 +1,18 @@
+Jinja2==2.10
+MarkupSafe==1.1.0
+PyYAML==3.12
+Sphinx==2.0.1
cbor==1.0.0
configobj==5.0.6
cryptography==2.7
docker==4.3.1
imgtool==1.6.0
-Jinja2==2.10
+lavacli==1.0
m2r==0.2.1
-MarkupSafe==1.1.0
-PyYAML==3.12
-pycryptodome==3.6.6
pyasn1==0.1.9
+pycryptodome==3.6.6
requests==2.22.0
ruamel.yaml==0.16.12
-Sphinx==2.0.1
sphinx-rtd-theme==0.4.3
sphinxcontrib-plantuml==0.15
xmltodict==0.12.0
diff --git a/bullseye-amd64-tf-m-qemu/Dockerfile b/bullseye-amd64-tf-m-qemu/Dockerfile
index 3b50c21..822ce20 100644
--- a/bullseye-amd64-tf-m-qemu/Dockerfile
+++ b/bullseye-amd64-tf-m-qemu/Dockerfile
@@ -1,5 +1,6 @@
FROM debian:sid-slim
+ENV QEMU_VERSION="1:5.2+dfsg-6"
ENV DEBIAN_FRONTEND=noninteractive
ENV PKG_DEPS="\
ca-certificates \
diff --git a/jessie-amd64-jenkins-master/Dockerfile b/jessie-amd64-jenkins-master/Dockerfile
index c73245a..c3dba3e 100644
--- a/jessie-amd64-jenkins-master/Dockerfile
+++ b/jessie-amd64-jenkins-master/Dockerfile
@@ -1,4 +1,4 @@
-FROM jenkins/jenkins:2.249.3
+FROM jenkins/jenkins:2.263.3
ENV JENKINS_JAVA_PARAMETERS="-server -XX:+AlwaysPreTouch -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/var/log/jenkins/heapdump.log -verbose:gc -Xloggc:/var/log/jenkins/gc-%t.log -XX:NumberOfGCLogFiles=2 -XX:+UseGCLogFileRotation -XX:GCLogFileSize=100m -XX:+PrintGC -XX:+PrintGCDateStamps -XX:+PrintGCDetails -XX:+PrintHeapAtGC -XX:+PrintGCCause -XX:+PrintTenuringDistribution -XX:+PrintReferenceGC -XX:+PrintAdaptiveSizePolicy -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+ParallelRefProcEnabled -XX:+ExplicitGCInvokesConcurrent -XX:+UnlockDiagnosticVMOptions -XX:G1SummarizeRSetStatsPeriod=1 -XX:MaxMetaspaceExpansion=64M -Djenkins.model.Jenkins.logStartupPerformance=true"
ENV JAVA_OPTS="-Xms8g -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"
@@ -7,7 +7,7 @@ ENV JENKINS_OPTS="--sessionTimeout=1440 --sessionEviction=86400"
# Install jenkins job builder
# Create plugins directory, symlinked on host machine
USER root
-RUN wget -q https://bootstrap.pypa.io/get-pip.py -O /tmp/get-pip.py \
+RUN wget -q https://bootstrap.pypa.io/3.5/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.10.0 pyyaml==5.1 jinja2==2.10.1 python-jenkins==1.4.0 \
diff --git a/jessie-amd64-jenkins-master/plugins.txt b/jessie-amd64-jenkins-master/plugins.txt
index 4e253d4..67ce452 100644
--- a/jessie-amd64-jenkins-master/plugins.txt
+++ b/jessie-amd64-jenkins-master/plugins.txt
@@ -1,34 +1,34 @@
amazon-ecs:1.37
build-name-setter:2.1.0
build-timeout:1.20
-blueocean:1.24.1
-copyartifact:1.45.2
-docker-plugin:1.2.1
+blueocean:1.24.4
+copyartifact:1.46
+docker-plugin:1.2.2
docker-slaves:1.0.7
-ec2:1.53
-email-ext:2.77
+ec2:1.56
+email-ext:2.81
envinject:2.3.0
-flexible-publish:0.15.2
-gerrit-trigger:2.30.5
-git:4.3.0
+extended-read-permission:3.2
+flexible-publish:0.16.1
+gerrit-trigger:2.32.0
+git:4.5.2
github-oauth:0.33
groovy-postbuild:2.5
jdk-tool:1.4
-jenkins-multijob-plugin:1.33
+jenkins-multijob-plugin:1.36
jobConfigHistory:2.26
leastload:3.0.0
-matrix-auth:2.6.3
-monitoring:1.85.0
+matrix-auth:2.6.5
+monitoring:1.86.0
multiple-scms:0.6
parameterized-trigger:2.39
pipeline-utility-steps:2.6.1
-postbuildscript:2.9.1
+postbuildscript:2.11.0
rebuild:1.31
-rich-text-publisher-plugin:1.4
ssh-agent:1.20
-ssh-slaves:1.31.2
-timestamper:1.11.5
-throttle-concurrents:2.0.3
+ssh-slaves:1.31.5
+timestamper:1.11.8
+throttle-concurrents:2.1
workflow-aggregator:2.6
ws-cleanup:0.38
yet-another-docker-plugin:0.2.0