Merge pull request #4436 from Ximinhan/update-labels

openshift-merge-bot[bot] · web-flow · commit ac21d10a5bc5 · 2025-07-11T05:16:55.000Z
Update default bug labels
diff --git a/scheduled-jobs/build/sync-ci-images/Jenkinsfile b/scheduled-jobs/build/sync-ci-images/Jenkinsfile
@@ -176,7 +176,7 @@ node {
                     } else {
                         withCredentials([string(credentialsId: 'openshift-bot-token', variable: 'GITHUB_TOKEN'), string(credentialsId: 'jboss-jira-token', variable: 'JIRA_TOKEN')]) {
                             if ( (major == 4 && minor >= 12) || major > 4 ) {
-                                other_args = '--add-label "bugzilla/valid-bug" --add-label "cherry-pick-approved" --add-label "backport-risk-assessed"'
+                                other_args = '--add-label "jira/valid-bug"'
                                 for ( label in params.ADD_LABELS.split() ) {
                                     other_args += " --add-label '${label}'"
                                 }

Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ node {`
`176`	`176`	`} else {`
`177`	`177`	`withCredentials([string(credentialsId: 'openshift-bot-token', variable: 'GITHUB_TOKEN'), string(credentialsId: 'jboss-jira-token', variable: 'JIRA_TOKEN')]) {`
`178`	`178`	`if ( (major == 4 && minor >= 12) \|\| major > 4 ) {`
`179`		`- other_args = '--add-label "bugzilla/valid-bug" --add-label "cherry-pick-approved" --add-label "backport-risk-assessed"'`
	`179`	`+ other_args = '--add-label "jira/valid-bug"'`
`180`	`180`	`for ( label in params.ADD_LABELS.split() ) {`
`181`	`181`	`other_args += " --add-label '${label}'"`
`182`	`182`	`}`