[CI] Change upstream reference (elastic#20296) (elastic#20297)

v1v · web-flow · commit a0c882804624 · 2020-07-29T09:47:33.000+01:00
diff --git a/.ci/apm-beats-update.groovy b/.ci/apm-beats-update.groovy
@@ -27,7 +27,7 @@ pipeline {
   }
   triggers {
     issueCommentTrigger('(?i).*/run\\s+(?:apm-beats-update\\W+)?.*')
-    upstream("Beats/beats-beats-mbp/${ env.JOB_BASE_NAME.startsWith('PR-') ? 'none' : env.JOB_BASE_NAME }")
+    upstream("Beats/beats/${ env.JOB_BASE_NAME.startsWith('PR-') ? 'none' : env.JOB_BASE_NAME }")
   }
   stages {
     stage('Filter build') {
diff --git a/.ci/packaging.groovy b/.ci/packaging.groovy
@@ -26,7 +26,7 @@ pipeline {
   triggers {
     issueCommentTrigger('(?i)^\\/packag[ing|e]$')
     // disable upstream trigger on a PR basis
-    upstream("Beats/beats-beats-mbp/${ env.JOB_BASE_NAME.startsWith('PR-') ? 'none' : env.JOB_BASE_NAME }")
+    upstream("Beats/beats/${ env.JOB_BASE_NAME.startsWith('PR-') ? 'none' : env.JOB_BASE_NAME }")
   }
   parameters {
     booleanParam(name: 'macos', defaultValue: false, description: 'Allow macOS stages.')

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ pipeline {`
`27`	`27`	`}`
`28`	`28`	`triggers {`
`29`	`29`	`issueCommentTrigger('(?i)./run\\s+(?:apm-beats-update\\W+)?.')`
`30`		`- upstream("Beats/beats-beats-mbp/${ env.JOB_BASE_NAME.startsWith('PR-') ? 'none' : env.JOB_BASE_NAME }")`
	`30`	`+ upstream("Beats/beats/${ env.JOB_BASE_NAME.startsWith('PR-') ? 'none' : env.JOB_BASE_NAME }")`
`31`	`31`	`}`
`32`	`32`	`stages {`
`33`	`33`	`stage('Filter build') {`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ pipeline {`
`26`	`26`	`triggers {`
`27`	`27`	`issueCommentTrigger('(?i)^\\/packag[ing\|e]$')`
`28`	`28`	`// disable upstream trigger on a PR basis`
`29`		`- upstream("Beats/beats-beats-mbp/${ env.JOB_BASE_NAME.startsWith('PR-') ? 'none' : env.JOB_BASE_NAME }")`
	`29`	`+ upstream("Beats/beats/${ env.JOB_BASE_NAME.startsWith('PR-') ? 'none' : env.JOB_BASE_NAME }")`
`30`	`30`	`}`
`31`	`31`	`parameters {`
`32`	`32`	`booleanParam(name: 'macos', defaultValue: false, description: 'Allow macOS stages.')`