From eebf259da21cb526c2848f01ae38f3acac021d31 Mon Sep 17 00:00:00 2001 From: Sebastien Besson Date: Tue, 19 Sep 2017 12:15:18 +0100 Subject: [PATCH 1/7] Bump auto-installed JDK version to latest JDK 8 This should prevent the requirement on a Oracle password --- home/config.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/config.xml b/home/config.xml index 61ff5827..09351dc2 100644 --- a/home/config.xml +++ b/home/config.xml @@ -29,7 +29,7 @@ - jdk-8u131-oth-JPR + jdk-8u144-oth-JPR true From d35c322c93cc84ba4ba59151c6df7571d7ccb560 Mon Sep 17 00:00:00 2001 From: Sebastien Besson Date: Tue, 19 Sep 2017 12:15:48 +0100 Subject: [PATCH 2/7] Bump Jenkins version to 2.46.2 --- jenkins/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins/Dockerfile b/jenkins/Dockerfile index 0f28e841..84ab06c9 100644 --- a/jenkins/Dockerfile +++ b/jenkins/Dockerfile @@ -1,4 +1,4 @@ -FROM jenkins:2.46.2 +FROM jenkins:2.46.3 MAINTAINER OME # Temp fix robot test results From 2bd8ef2885a2d9fdf7907f89ee692b55ea2e74fd Mon Sep 17 00:00:00 2001 From: Sebastien Besson Date: Tue, 19 Sep 2017 12:16:49 +0100 Subject: [PATCH 3/7] Bump plugins versions to match ci.openmicroscopy.org This bumps should bump the version of the Jenkins plugins to include several security fixes. The versions should now be inline with what is deployed on mainline CI so that we can reduce the gap and pretest plugins upgrade via devspace before deploying to mainline as well. --- jenkins/plugins.txt | 85 ++++++++++++++++++++++----------------------- 1 file changed, 42 insertions(+), 43 deletions(-) diff --git a/jenkins/plugins.txt b/jenkins/plugins.txt index d5a061b0..25982a4b 100644 --- a/jenkins/plugins.txt +++ b/jenkins/plugins.txt @@ -1,15 +1,15 @@ swarm:3.4 -git:3.2.0 -git-client:2.4.1 +git:3.3.2 +git-client:2.4.6 git-server:1.7 mailer:1.20 scm-api:2.1.1 -matrix-project:1.9 +matrix-project:1.11 ssh-credentials:1.13 -credentials:2.1.12 -script-security:1.27 -role-strategy:2.4.0 -matrix-auth:1.5 +credentials:2.1.14 +script-security:1.31 +role-strategy:2.5.1 +matrix-auth:1.7 icon-shim:2.0.3 authentication-tokens:1.3 @@ -18,67 +18,66 @@ testng-plugin:1.14 javadoc:1.4 -artifactory:2.10.3 -ant:1.4 -gradle:1.26 +artifactory:2.12.1 +ant:1.5 +gradle:1.27.1 ivy:1.27.1 -config-file-provider:2.15.7 +config-file-provider:2.16.2 copyartifact:1.38.1 -branch-api:2.0.8 +branch-api:2.0.10 mapdb-api:1.0.9.0 -display-url-api:1.1.1 -durable-task:1.12 -structs:1.6 -conditional-buildstep:1.3.5 +display-url-api:2.0 +structs:1.9 +conditional-buildstep:1.3.6 run-condition:1.0 # As a repository repository:1.3 -maven-plugin:2.15.1 +maven-plugin:2.17 # Optional -parameterized-trigger:2.33 -subversion:2.7.1 +parameterized-trigger:2.35.1 +subversion:2.9 token-macro:2.1 -promoted-builds:2.28.1 -cloudbees-folder:6.0.3 +promoted-builds:2.29 +cloudbees-folder:6.0.4 # Workflow # See: https://github.com/jenkinsci/workflow-plugin/blob/master/demo/plugins.txt -durable-task:1.13 +durable-task:1.14 ace-editor:1.1 jquery-detached:1.2.1 workflow-aggregator:2.5 -workflow-api:2.12 -workflow-basic-steps:2.4 -workflow-cps:2.29 -workflow-cps-global-lib:2.7 -workflow-durable-task-step:2.10 -workflow-job:2.9 -workflow-multibranch:2.10 +workflow-api:2.18 +workflow-basic-steps:2.6 +workflow-cps:2.36.1 +workflow-cps-global-lib:2.8 +workflow-durable-task-step:2.12 +workflow-job:2.11.1 +workflow-multibranch:2.16 workflow-remote-loader:1.4 -workflow-scm-step:2.4 -workflow-step-api:2.9 +workflow-scm-step:2.5 +workflow-step-api:2.12 workflow-support:2.14 -pipeline-rest-api:2.6 -pipeline-stage-view:2.6 +pipeline-rest-api:2.8 +pipeline-stage-view:2.8 pipeline-stage-step:2.2 -pipeline-build-step:2.5 -pipeline-input-step:2.5 +pipeline-build-step:2.5.1 +pipeline-input-step:2.8 pipeline-milestone-step:1.3.1 -pipeline-graph-analysis:1.3 +pipeline-graph-analysis:1.4 pipeline-model-definition:1.1.2 -pipeline-model-api:1.1.2 +pipeline-model-api:1.1.8 pipeline-model-declarative-agent:1.1.1 -pipeline-model-extensions:1.1.2 -pipeline-stage-tags-metadata:1.1.2 +pipeline-model-extensions:1.1.8 +pipeline-stage-tags-metadata:1.1.8 -docker-workflow:1.10 -docker-commons:1.6 +docker-workflow:1.12 +docker-commons:1.8 credentials-binding:1.11 plain-credentials:1.4 @@ -91,8 +90,8 @@ robot:1.6.4 # Utils greenballs:1.15 timestamper:1.8.8 -jobConfigHistory:2.15 +jobConfigHistory:2.16 rundeck:3.6.1 # ldap -ldap:1.14 \ No newline at end of file +ldap:1.16 \ No newline at end of file From ce1afb2a9ac5b219582839e07351d24b59ea2e24 Mon Sep 17 00:00:00 2001 From: Sebastien Besson Date: Tue, 19 Sep 2017 12:57:29 +0100 Subject: [PATCH 4/7] Bump missed plugins --- jenkins/plugins.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jenkins/plugins.txt b/jenkins/plugins.txt index 25982a4b..a52e2752 100644 --- a/jenkins/plugins.txt +++ b/jenkins/plugins.txt @@ -70,7 +70,7 @@ pipeline-build-step:2.5.1 pipeline-input-step:2.8 pipeline-milestone-step:1.3.1 pipeline-graph-analysis:1.4 -pipeline-model-definition:1.1.2 +pipeline-model-definition:1.1.8 pipeline-model-api:1.1.8 pipeline-model-declarative-agent:1.1.1 pipeline-model-extensions:1.1.8 @@ -79,7 +79,7 @@ pipeline-stage-tags-metadata:1.1.8 docker-workflow:1.12 docker-commons:1.8 -credentials-binding:1.11 +credentials-binding:1.12 plain-credentials:1.4 handlebars:1.1.1 momentjs:1.1.1 From 03540156dfd60c9ec358902d563ada6e70d451c3 Mon Sep 17 00:00:00 2001 From: Sebastien Besson Date: Tue, 19 Sep 2017 13:39:55 +0100 Subject: [PATCH 5/7] Add XML to disable Jenkins CLI --- home/jenkins.CLI.xml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 home/jenkins.CLI.xml diff --git a/home/jenkins.CLI.xml b/home/jenkins.CLI.xml new file mode 100644 index 00000000..7a901944 --- /dev/null +++ b/home/jenkins.CLI.xml @@ -0,0 +1,4 @@ + + + false + \ No newline at end of file From bb48149b5b0de477dae090a0ef34aed7a29b335e Mon Sep 17 00:00:00 2001 From: Sebastien Besson Date: Fri, 6 Oct 2017 20:00:49 +0100 Subject: [PATCH 6/7] Bump revisions in job configurations --- home/jobs/BIOFORMATS-ant/config.xml | 2 +- home/jobs/BIOFORMATS-maven/config.xml | 2 +- home/jobs/OMERO-build/config.xml | 2 +- home/jobs/OMERO-docs/config.xml | 2 +- home/jobs/OMERO-push/config.xml | 2 +- home/jobs/Trigger/config.xml | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/home/jobs/BIOFORMATS-ant/config.xml b/home/jobs/BIOFORMATS-ant/config.xml index a79daec9..5eb96538 100644 --- a/home/jobs/BIOFORMATS-ant/config.xml +++ b/home/jobs/BIOFORMATS-ant/config.xml @@ -32,7 +32,7 @@ - + 2 diff --git a/home/jobs/BIOFORMATS-maven/config.xml b/home/jobs/BIOFORMATS-maven/config.xml index c6235eda..d02046ce 100644 --- a/home/jobs/BIOFORMATS-maven/config.xml +++ b/home/jobs/BIOFORMATS-maven/config.xml @@ -13,7 +13,7 @@ - + 2 diff --git a/home/jobs/OMERO-build/config.xml b/home/jobs/OMERO-build/config.xml index 0b7ca953..0744f05b 100644 --- a/home/jobs/OMERO-build/config.xml +++ b/home/jobs/OMERO-build/config.xml @@ -13,7 +13,7 @@ - + 2 diff --git a/home/jobs/OMERO-docs/config.xml b/home/jobs/OMERO-docs/config.xml index 376235b3..d23d8a3a 100644 --- a/home/jobs/OMERO-docs/config.xml +++ b/home/jobs/OMERO-docs/config.xml @@ -22,7 +22,7 @@ - + 2 diff --git a/home/jobs/OMERO-push/config.xml b/home/jobs/OMERO-push/config.xml index aee92f34..e5eeb482 100644 --- a/home/jobs/OMERO-push/config.xml +++ b/home/jobs/OMERO-push/config.xml @@ -30,7 +30,7 @@ - + 2 diff --git a/home/jobs/Trigger/config.xml b/home/jobs/Trigger/config.xml index f023c0b9..984519e1 100644 --- a/home/jobs/Trigger/config.xml +++ b/home/jobs/Trigger/config.xml @@ -1,5 +1,5 @@ - + false @@ -12,7 +12,7 @@ - +