diff --git a/docker/Dockerfile b/docker/Dockerfile index 1723db1..920f1bf 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -ARG VERSION=2.426.3 +ARG VERSION=2.452.2 FROM jenkins/jenkins:$VERSION MAINTAINER Mekom Solutions diff --git a/docker/config/plugins.txt b/docker/config/plugins.txt index 2d7942e..fe904a9 100644 --- a/docker/config/plugins.txt +++ b/docker/config/plugins.txt @@ -1,18 +1,19 @@ git:5.2.1 ansicolor:1.0.2 -workflow-aggregator:590.v6a_d052e5a_a_b_5 -nodejs:1.5.1 -envinject:2.866.v5c0403e3d4df -conditional-buildstep:1.4.2 -parameterized-trigger:2.46 -build-name-setter:2.2.0 +workflow-aggregator:600.vb_57cdd26fdd7 +nodejs:1.6.1 +envinject:2.908.v66a_774b_31d93 +conditional-buildstep:1.4.3 +parameterized-trigger:806.vf6fff3e28c3e +build-name-setter:2.4.2 pipeline-build-step:540.vb_e8849e1a_b_d8 -generic-webhook-trigger:1.84 -matrix-auth:3.1.5 -pipeline-utility-steps:2.13.0 +generic-webhook-trigger:2.2.2 +matrix-auth:3.2.2 +pipeline-utility-steps:2.17.0 groovy:442.v817e6d937d6c permissive-script-security:0.7 -simple-theme-plugin:103.va_161d09c38c7 +simple-theme-plugin:191.vcd207ef9dd24 login-theme:1.1 -blueocean:1.25.5 -maven-plugin:3.16 \ No newline at end of file +blueocean:1.27.13 +maven-plugin:3.16 +google-login:109.v022b_cf87b_e5b_ \ No newline at end of file diff --git a/jenkins/jenkins_home/config.xml b/jenkins/jenkins_home/config.xml index e4def5c..61ce3af 100644 --- a/jenkins/jenkins_home/config.xml +++ b/jenkins/jenkins_home/config.xml @@ -1,7 +1,9 @@ - - 2.426.3 + + org.jenkinsci.plugins.matrixauth.AmbiguityMonitor + + 2.452.2 2 NORMAL true @@ -124,5 +126,5 @@ - true + false \ No newline at end of file diff --git a/jenkins/jenkins_home/jobs/destroy-instance/config.xml b/jenkins/jenkins_home/jobs/destroy-instance/config.xml index 73573d4..8d3325b 100644 --- a/jenkins/jenkins_home/jobs/destroy-instance/config.xml +++ b/jenkins/jenkins_home/jobs/destroy-instance/config.xml @@ -5,7 +5,6 @@ Destroy instance false - @@ -52,14 +51,14 @@ - + if [ "$downstream_job" = "" ]; then echo "\e[1m\e[31m[ERR]\e[0m 'downstream_job' list is empty. Aborting." exit 1 fi exit 0 - + @@ -79,10 +78,10 @@ exit 0 - + - + if [ "$downstream_job" = "" ]; then echo "\e[1m\e[31m[ERR]\e[0m 'downstream_job' list is empty. Aborting." exit 0 @@ -93,7 +92,7 @@ exit 1 node /opt/node-scripts/src/destroy-instance/remove-instance-from-db.js - + diff --git a/jenkins/jenkins_home/jobs/instance-event/config.xml b/jenkins/jenkins_home/jobs/instance-event/config.xml index 8d8514f..1ce3b53 100644 --- a/jenkins/jenkins_home/jobs/instance-event/config.xml +++ b/jenkins/jenkins_home/jobs/instance-event/config.xml @@ -5,7 +5,6 @@ Instance Event false - -1 @@ -41,27 +40,27 @@ - + $JENKINS_HOME/jobs/$JOB_NAME/builds/$BUILD_NUMBER/environment.env - + ${ENV,var="build_name"} false true false - - + + if [ "$downstream_job" = "" ]; then echo "\e[1m\e[31m[ERR]\e[0m 'downstream_job' list is empty. Aborting." exit 1 fi exit 0 - + @@ -81,15 +80,15 @@ exit 0 - + - + xterm - + NodeJS 14.20.0 diff --git a/jenkins/jenkins_home/jobs/instance-events-cron/config.xml b/jenkins/jenkins_home/jobs/instance-events-cron/config.xml index 1dc0e40..b8a1ed2 100644 --- a/jenkins/jenkins_home/jobs/instance-events-cron/config.xml +++ b/jenkins/jenkins_home/jobs/instance-events-cron/config.xml @@ -5,9 +5,7 @@ Then triggers the start/restart of instances by passing those events to the appropriate downstream job. Instance Events Scheduler false - - - + true false @@ -28,7 +26,7 @@ Then triggers the start/restart of instances by passing those events to the appr -