Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

INFRA-468: Upgrade Jenkins and Fix outdated plugins #47

Merged
merged 1 commit into from
Jul 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG VERSION=2.426.3
ARG VERSION=2.452.2
FROM jenkins/jenkins:$VERSION
MAINTAINER Mekom Solutions <[email protected]>

Expand Down
25 changes: 13 additions & 12 deletions docker/config/plugins.txt
Original file line number Diff line number Diff line change
@@ -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
blueocean:1.27.13
maven-plugin:3.16
google-login:109.v022b_cf87b_e5b_
8 changes: 5 additions & 3 deletions jenkins/jenkins_home/config.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
<?xml version='1.1' encoding='UTF-8'?>
<hudson>
<disabledAdministrativeMonitors/>
<version>2.426.3</version>
<disabledAdministrativeMonitors>
<string>org.jenkinsci.plugins.matrixauth.AmbiguityMonitor</string>
</disabledAdministrativeMonitors>
<version>2.452.2</version>
<numExecutors>2</numExecutors>
<mode>NORMAL</mode>
<useSecurity>true</useSecurity>
Expand Down Expand Up @@ -124,5 +126,5 @@
</envVars>
</hudson.slaves.EnvironmentVariablesNodeProperty>
</globalNodeProperties>
<nodeRenameMigrationNeeded>true</nodeRenameMigrationNeeded>
<nodeRenameMigrationNeeded>false</nodeRenameMigrationNeeded>
</hudson>
11 changes: 5 additions & 6 deletions jenkins/jenkins_home/jobs/destroy-instance/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<displayName>Destroy instance</displayName>
<keepDependencies>false</keepDependencies>
<properties>
<hudson.plugins.jira.JiraProjectProperty plugin="[email protected]"/>
<hudson.model.ParametersDefinitionProperty>
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
Expand Down Expand Up @@ -52,14 +51,14 @@
<configuredLocalRules/>
</hudson.tasks.Shell>
<org.jenkinsci.plugins.conditionalbuildstep.singlestep.SingleConditionalBuilder plugin="[email protected]">
<condition class="org.jenkins_ci.plugins.run_condition.contributed.ShellCondition" plugin="run-condition@1.5">
<condition class="org.jenkins_ci.plugins.run_condition.contributed.ShellCondition" plugin="run-condition@1.7">
<command>if [ &quot;$downstream_job&quot; = &quot;&quot; ]; then
echo &quot;\e[1m\e[31m[ERR]\e[0m &apos;downstream_job&apos; list is empty. Aborting.&quot;
exit 1
fi
exit 0</command>
</condition>
<buildStep class="hudson.plugins.parameterizedtrigger.TriggerBuilder" plugin="parameterized-trigger@2.45">
<buildStep class="hudson.plugins.parameterizedtrigger.TriggerBuilder" plugin="parameterized-trigger@2.46">
<configs>
<hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
<configs>
Expand All @@ -79,10 +78,10 @@ exit 0</command>
</hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
</configs>
</buildStep>
<runner class="org.jenkins_ci.plugins.run_condition.BuildStepRunner$Fail" plugin="run-condition@1.5"/>
<runner class="org.jenkins_ci.plugins.run_condition.BuildStepRunner$Fail" plugin="run-condition@1.7"/>
</org.jenkinsci.plugins.conditionalbuildstep.singlestep.SingleConditionalBuilder>
<org.jenkinsci.plugins.conditionalbuildstep.singlestep.SingleConditionalBuilder plugin="[email protected]">
<condition class="org.jenkins_ci.plugins.run_condition.contributed.ShellCondition" plugin="run-condition@1.5">
<condition class="org.jenkins_ci.plugins.run_condition.contributed.ShellCondition" plugin="run-condition@1.7">
<command>if [ &quot;$downstream_job&quot; = &quot;&quot; ]; then
echo &quot;\e[1m\e[31m[ERR]\e[0m &apos;downstream_job&apos; list is empty. Aborting.&quot;
exit 0
Expand All @@ -93,7 +92,7 @@ exit 1</command>
<command>node /opt/node-scripts/src/destroy-instance/remove-instance-from-db.js</command>
<configuredLocalRules/>
</buildStep>
<runner class="org.jenkins_ci.plugins.run_condition.BuildStepRunner$Fail" plugin="run-condition@1.5"/>
<runner class="org.jenkins_ci.plugins.run_condition.BuildStepRunner$Fail" plugin="run-condition@1.7"/>
</org.jenkinsci.plugins.conditionalbuildstep.singlestep.SingleConditionalBuilder>
</builders>
<publishers/>
Expand Down
17 changes: 8 additions & 9 deletions jenkins/jenkins_home/jobs/instance-event/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<displayName>Instance Event</displayName>
<keepDependencies>false</keepDependencies>
<properties>
<hudson.plugins.jira.JiraProjectProperty plugin="[email protected]"/>
<jenkins.model.BuildDiscarderProperty>
<strategy class="hudson.tasks.LogRotator">
<daysToKeep>-1</daysToKeep>
Expand Down Expand Up @@ -41,27 +40,27 @@
</command>
<configuredLocalRules/>
</hudson.tasks.Shell>
<EnvInjectBuilder plugin="envinject@2.3.0">
<EnvInjectBuilder plugin="envinject@2.866.v5c0403e3d4df">
<info>
<propertiesFilePath>$JENKINS_HOME/jobs/$JOB_NAME/builds/$BUILD_NUMBER/environment.env</propertiesFilePath>
</info>
</EnvInjectBuilder>
<org.jenkinsci.plugins.buildnameupdater.BuildNameUpdater plugin="build-name-setter@2.1.0">
<org.jenkinsci.plugins.buildnameupdater.BuildNameUpdater plugin="build-name-setter@2.2.0">
<buildName></buildName>
<macroTemplate>${ENV,var=&quot;build_name&quot;}</macroTemplate>
<fromFile>false</fromFile>
<fromMacro>true</fromMacro>
<macroFirst>false</macroFirst>
</org.jenkinsci.plugins.buildnameupdater.BuildNameUpdater>
<org.jenkinsci.plugins.conditionalbuildstep.singlestep.SingleConditionalBuilder plugin="conditional-buildstep@1.3.6">
<condition class="org.jenkins_ci.plugins.run_condition.contributed.ShellCondition" plugin="run-condition@1.5">
<org.jenkinsci.plugins.conditionalbuildstep.singlestep.SingleConditionalBuilder plugin="conditional-buildstep@1.4.2">
<condition class="org.jenkins_ci.plugins.run_condition.contributed.ShellCondition" plugin="run-condition@1.7">
<command>if [ &quot;$downstream_job&quot; = &quot;&quot; ]; then
echo &quot;\e[1m\e[31m[ERR]\e[0m &apos;downstream_job&apos; list is empty. Aborting.&quot;
exit 1
fi
exit 0</command>
</condition>
<buildStep class="hudson.plugins.parameterizedtrigger.TriggerBuilder" plugin="parameterized-trigger@2.39">
<buildStep class="hudson.plugins.parameterizedtrigger.TriggerBuilder" plugin="parameterized-trigger@2.46">
<configs>
<hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
<configs>
Expand All @@ -81,15 +80,15 @@ exit 0</command>
</hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
</configs>
</buildStep>
<runner class="org.jenkins_ci.plugins.run_condition.BuildStepRunner$Fail" plugin="run-condition@1.5"/>
<runner class="org.jenkins_ci.plugins.run_condition.BuildStepRunner$Fail" plugin="run-condition@1.7"/>
</org.jenkinsci.plugins.conditionalbuildstep.singlestep.SingleConditionalBuilder>
</builders>
<publishers/>
<buildWrappers>
<hudson.plugins.ansicolor.AnsiColorBuildWrapper plugin="ansicolor@0.7.3">
<hudson.plugins.ansicolor.AnsiColorBuildWrapper plugin="ansicolor@1.0.2">
<colorMapName>xterm</colorMapName>
</hudson.plugins.ansicolor.AnsiColorBuildWrapper>
<jenkins.plugins.nodejs.NodeJSBuildWrapper plugin="nodejs@1.3.9">
<jenkins.plugins.nodejs.NodeJSBuildWrapper plugin="nodejs@1.5.1">
<nodeJSInstallationName>NodeJS 14.20.0</nodeJSInstallationName>
<cacheLocationStrategy class="jenkins.plugins.nodejs.cache.DefaultCacheLocationLocator"/>
</jenkins.plugins.nodejs.NodeJSBuildWrapper>
Expand Down
6 changes: 2 additions & 4 deletions jenkins/jenkins_home/jobs/instance-events-cron/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
Then triggers the start/restart of instances by passing those events to the appropriate downstream job.</description>
<displayName>Instance Events Scheduler</displayName>
<keepDependencies>false</keepDependencies>
<properties>
<hudson.plugins.jira.JiraProjectProperty plugin="[email protected]"/>
</properties>
<properties/>
<scm class="hudson.scm.NullSCM"/>
<canRoam>true</canRoam>
<disabled>false</disabled>
Expand All @@ -28,7 +26,7 @@ Then triggers the start/restart of instances by passing those events to the appr
</hudson.tasks.Shell>
<hudson.plugins.groovy.SystemGroovy plugin="[email protected]">
<source class="hudson.plugins.groovy.StringSystemScriptSource">
<script plugin="script-security@1175.v4b_d517d6db_f0">
<script plugin="script-security@1326.vdb_c154de8669">
<script>import hudson.model.*
import groovy.json.JsonSlurper
import groovy.json.JsonOutput
Expand Down
Loading