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.

Sign up for GitHub

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

OZ-726: Add main branch to SCM Webhook filter #49

Merged
merged 1 commit into from
Nov 4, 2024
Merged

OZ-726: Add main branch to SCM Webhook filter #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG VERSION=2.452.2
ARG VERSION=2.479.1
FROM jenkins/jenkins:$VERSION
MAINTAINER Mekom Solutions <[email protected]>

Expand Down
2 changes: 1 addition & 1 deletion docker/config/plugins.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
git:5.2.1
git:5.2.2
ansicolor:1.0.2
workflow-aggregator:600.vb_57cdd26fdd7
nodejs:1.6.1
Expand Down
3 changes: 2 additions & 1 deletion jenkins/jenkins_home/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@
<hudson>
<disabledAdministrativeMonitors>
<string>org.jenkinsci.plugins.matrixauth.AmbiguityMonitor</string>
<string>jenkins.diagnostics.ControllerExecutorsNoAgents</string>
</disabledAdministrativeMonitors>
<version>2.452.2</version>
<version>2.479.1</version>
<numExecutors>2</numExecutors>
<mode>NORMAL</mode>
<useSecurity>true</useSecurity>
Expand Down
13 changes: 8 additions & 5 deletions jenkins/jenkins_home/jobs/github-webhook/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ For example by appending the expected parameters to a configurable URL, such as
<displayName>SCM Webhook</displayName>
<keepDependencies>false</keepDependencies>
<properties>
<hudson.plugins.jira.JiraProjectProperty plugin="[email protected]"/>
<hudson.security.AuthorizationMatrixProperty>
<inheritanceStrategy class="org.jenkinsci.plugins.matrixauth.inheritance.InheritGlobalStrategy"/>
<permission>hudson.model.Item.Read:github</permission>
Expand All @@ -19,7 +20,7 @@ For example by appending the expected parameters to a configurable URL, such as
<blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
<blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
<triggers>
<org.jenkinsci.plugins.gwt.GenericTrigger plugin="generic-webhook-trigger@1.84">
<org.jenkinsci.plugins.gwt.GenericTrigger plugin="generic-webhook-trigger@2.2.2">
<spec></spec>
<genericVariables>
<org.jenkinsci.plugins.gwt.GenericVariable>
Expand Down Expand Up @@ -59,7 +60,7 @@ For example by appending the expected parameters to a configurable URL, such as
</org.jenkinsci.plugins.gwt.GenericVariable>
</genericVariables>
<regexpFilterText>$repoUrl $scmRef $scmRefForScheduledJobs</regexpFilterText>
<regexpFilterExpression>(refs/heads/master|refs/heads/main|refs/heads/develop|refs/heads/[0-9]+\.[0-9]+\.x)</regexpFilterExpression>
<regexpFilterExpression>(refs/heads/master|refs/heads/main|refs/heads/develop|refs/heads/[0-9]+\.[0-9]+\.x|main)</regexpFilterExpression>
enyachoke marked this conversation as resolved.
Show resolved Hide resolved
<genericRequestVariables>
<org.jenkinsci.plugins.gwt.GenericRequestVariable>
<key>projectType</key>
Expand All @@ -77,6 +78,8 @@ For example by appending the expected parameters to a configurable URL, such as
<tokenCredentialId></tokenCredentialId>
<silentResponse>false</silentResponse>
<overrideQuietPeriod>false</overrideQuietPeriod>
<shouldNotFlattern>false</shouldNotFlattern>
<allowSeveralTriggersPerBuild>false</allowSeveralTriggersPerBuild>
</org.jenkinsci.plugins.gwt.GenericTrigger>
</triggers>
<concurrentBuild>false</concurrentBuild>
Expand Down Expand Up @@ -108,12 +111,12 @@ echo &quot;Parsed event variables:&quot;
cat $BUILD_PATH/commit_metadata.env</command>
<configuredLocalRules/>
</hudson.tasks.Shell>
<EnvInjectBuilder plugin="envinject@2.866.v5c0403e3d4df">
<EnvInjectBuilder plugin="envinject@2.908.v66a_774b_31d93">
<info>
<propertiesFilePath>$JENKINS_HOME/jobs/$JOB_NAME/builds/$BUILD_NUMBER/commit_metadata.env</propertiesFilePath>
</info>
</EnvInjectBuilder>
<org.jenkinsci.plugins.buildnameupdater.BuildNameUpdater plugin="build-name-setter@2.2.0">
<org.jenkinsci.plugins.buildnameupdater.BuildNameUpdater plugin="build-name-setter@2.4.2">
<buildName>version.txt</buildName>
<macroTemplate>${ENV,var=&quot;repoName&quot;} - ${ENV,var=&quot;branchName&quot;} (${ENV,var=&quot;commitId&quot;})</macroTemplate>
<fromFile>false</fromFile>
Expand All @@ -122,7 +125,7 @@ cat $BUILD_PATH/commit_metadata.env</command>
</org.jenkinsci.plugins.buildnameupdater.BuildNameUpdater>
</builders>
<publishers>
<hudson.plugins.parameterizedtrigger.BuildTrigger plugin="parameterized-trigger@2.45">
<hudson.plugins.parameterizedtrigger.BuildTrigger plugin="parameterized-trigger@806.vf6fff3e28c3e">
<configs>
<hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
<configs>
Expand Down
Loading