From 169880c61a17d2faf77841b2e6c2fa51d1720b39 Mon Sep 17 00:00:00 2001 From: ysh329 Date: Sat, 8 Jul 2023 23:25:37 +0800 Subject: [PATCH 1/2] [release] Disable git merge to avoid conflict --- ci/jenkins/generated/arm_jenkinsfile.groovy | 5 +++-- ci/jenkins/generated/cortexm_jenkinsfile.groovy | 5 +++-- ci/jenkins/generated/cpu_jenkinsfile.groovy | 5 +++-- ci/jenkins/generated/docker_jenkinsfile.groovy | 5 +++-- ci/jenkins/generated/gpu_jenkinsfile.groovy | 5 +++-- ci/jenkins/generated/hexagon_jenkinsfile.groovy | 5 +++-- ci/jenkins/generated/i386_jenkinsfile.groovy | 5 +++-- ci/jenkins/generated/lint_jenkinsfile.groovy | 5 +++-- ci/jenkins/generated/minimal_cross_isa_jenkinsfile.groovy | 5 +++-- ci/jenkins/generated/minimal_jenkinsfile.groovy | 5 +++-- ci/jenkins/generated/riscv_jenkinsfile.groovy | 5 +++-- ci/jenkins/generated/wasm_jenkinsfile.groovy | 5 +++-- 12 files changed, 36 insertions(+), 24 deletions(-) diff --git a/ci/jenkins/generated/arm_jenkinsfile.groovy b/ci/jenkins/generated/arm_jenkinsfile.groovy index ccfb5ef7df89..0d9a5d920a15 100644 --- a/ci/jenkins/generated/arm_jenkinsfile.groovy +++ b/ci/jenkins/generated/arm_jenkinsfile.groovy @@ -60,7 +60,7 @@ // 'python3 jenkins/generate.py' // Note: This timestamp is here to ensure that updates to the Jenkinsfile are // always rebased on main before merging: -// Generated at 2023-06-09T15:32:58.342947 +// Generated at 2023-07-08T23:22:10.582613 import org.jenkinsci.plugins.pipeline.modeldefinition.Utils // These are set at runtime from data in ci/jenkins/docker-images.yml, update @@ -150,7 +150,8 @@ def init_git() { update_upstream_revision("HEAD") } else { // This is PR branch so merge with latest main. - merge_with_main() + // merge_with_main() + update_upstream_revision("HEAD") } sh( diff --git a/ci/jenkins/generated/cortexm_jenkinsfile.groovy b/ci/jenkins/generated/cortexm_jenkinsfile.groovy index 02390087f989..46d962b33f72 100644 --- a/ci/jenkins/generated/cortexm_jenkinsfile.groovy +++ b/ci/jenkins/generated/cortexm_jenkinsfile.groovy @@ -60,7 +60,7 @@ // 'python3 jenkins/generate.py' // Note: This timestamp is here to ensure that updates to the Jenkinsfile are // always rebased on main before merging: -// Generated at 2023-06-09T15:32:58.237181 +// Generated at 2023-07-08T23:22:10.686270 import org.jenkinsci.plugins.pipeline.modeldefinition.Utils // These are set at runtime from data in ci/jenkins/docker-images.yml, update @@ -150,7 +150,8 @@ def init_git() { update_upstream_revision("HEAD") } else { // This is PR branch so merge with latest main. - merge_with_main() + // merge_with_main() + update_upstream_revision("HEAD") } sh( diff --git a/ci/jenkins/generated/cpu_jenkinsfile.groovy b/ci/jenkins/generated/cpu_jenkinsfile.groovy index 38f806be798a..c451f60cbbf8 100644 --- a/ci/jenkins/generated/cpu_jenkinsfile.groovy +++ b/ci/jenkins/generated/cpu_jenkinsfile.groovy @@ -60,7 +60,7 @@ // 'python3 jenkins/generate.py' // Note: This timestamp is here to ensure that updates to the Jenkinsfile are // always rebased on main before merging: -// Generated at 2023-06-09T15:32:58.358921 +// Generated at 2023-07-08T23:22:10.554758 import org.jenkinsci.plugins.pipeline.modeldefinition.Utils // These are set at runtime from data in ci/jenkins/docker-images.yml, update @@ -150,7 +150,8 @@ def init_git() { update_upstream_revision("HEAD") } else { // This is PR branch so merge with latest main. - merge_with_main() + // merge_with_main() + update_upstream_revision("HEAD") } sh( diff --git a/ci/jenkins/generated/docker_jenkinsfile.groovy b/ci/jenkins/generated/docker_jenkinsfile.groovy index c4f7651321f8..07fbc6c35e08 100644 --- a/ci/jenkins/generated/docker_jenkinsfile.groovy +++ b/ci/jenkins/generated/docker_jenkinsfile.groovy @@ -60,7 +60,7 @@ // 'python3 jenkins/generate.py' // Note: This timestamp is here to ensure that updates to the Jenkinsfile are // always rebased on main before merging: -// Generated at 2023-06-09T15:32:58.270108 +// Generated at 2023-07-08T23:22:10.714864 import org.jenkinsci.plugins.pipeline.modeldefinition.Utils // These are set at runtime from data in ci/jenkins/docker-images.yml, update @@ -150,7 +150,8 @@ def init_git() { update_upstream_revision("HEAD") } else { // This is PR branch so merge with latest main. - merge_with_main() + // merge_with_main() + update_upstream_revision("HEAD") } sh( diff --git a/ci/jenkins/generated/gpu_jenkinsfile.groovy b/ci/jenkins/generated/gpu_jenkinsfile.groovy index a71e2f63aaa1..bc549980fccb 100644 --- a/ci/jenkins/generated/gpu_jenkinsfile.groovy +++ b/ci/jenkins/generated/gpu_jenkinsfile.groovy @@ -60,7 +60,7 @@ // 'python3 jenkins/generate.py' // Note: This timestamp is here to ensure that updates to the Jenkinsfile are // always rebased on main before merging: -// Generated at 2023-06-09T15:32:58.400867 +// Generated at 2023-07-08T23:22:10.740767 import org.jenkinsci.plugins.pipeline.modeldefinition.Utils // These are set at runtime from data in ci/jenkins/docker-images.yml, update @@ -150,7 +150,8 @@ def init_git() { update_upstream_revision("HEAD") } else { // This is PR branch so merge with latest main. - merge_with_main() + // merge_with_main() + update_upstream_revision("HEAD") } sh( diff --git a/ci/jenkins/generated/hexagon_jenkinsfile.groovy b/ci/jenkins/generated/hexagon_jenkinsfile.groovy index 8ec0c27e5cf7..b906fb3497fe 100644 --- a/ci/jenkins/generated/hexagon_jenkinsfile.groovy +++ b/ci/jenkins/generated/hexagon_jenkinsfile.groovy @@ -60,7 +60,7 @@ // 'python3 jenkins/generate.py' // Note: This timestamp is here to ensure that updates to the Jenkinsfile are // always rebased on main before merging: -// Generated at 2023-06-09T15:32:58.328389 +// Generated at 2023-07-08T23:22:10.657740 import org.jenkinsci.plugins.pipeline.modeldefinition.Utils // These are set at runtime from data in ci/jenkins/docker-images.yml, update @@ -150,7 +150,8 @@ def init_git() { update_upstream_revision("HEAD") } else { // This is PR branch so merge with latest main. - merge_with_main() + // merge_with_main() + update_upstream_revision("HEAD") } sh( diff --git a/ci/jenkins/generated/i386_jenkinsfile.groovy b/ci/jenkins/generated/i386_jenkinsfile.groovy index ca69c440025a..3490714ae86b 100644 --- a/ci/jenkins/generated/i386_jenkinsfile.groovy +++ b/ci/jenkins/generated/i386_jenkinsfile.groovy @@ -60,7 +60,7 @@ // 'python3 jenkins/generate.py' // Note: This timestamp is here to ensure that updates to the Jenkinsfile are // always rebased on main before merging: -// Generated at 2023-06-09T15:32:58.285500 +// Generated at 2023-07-08T23:22:10.527461 import org.jenkinsci.plugins.pipeline.modeldefinition.Utils // These are set at runtime from data in ci/jenkins/docker-images.yml, update @@ -150,7 +150,8 @@ def init_git() { update_upstream_revision("HEAD") } else { // This is PR branch so merge with latest main. - merge_with_main() + // merge_with_main() + update_upstream_revision("HEAD") } sh( diff --git a/ci/jenkins/generated/lint_jenkinsfile.groovy b/ci/jenkins/generated/lint_jenkinsfile.groovy index 77228d878c43..c103d2344400 100644 --- a/ci/jenkins/generated/lint_jenkinsfile.groovy +++ b/ci/jenkins/generated/lint_jenkinsfile.groovy @@ -60,7 +60,7 @@ // 'python3 jenkins/generate.py' // Note: This timestamp is here to ensure that updates to the Jenkinsfile are // always rebased on main before merging: -// Generated at 2023-06-09T15:32:58.300218 +// Generated at 2023-07-08T23:22:10.632522 import org.jenkinsci.plugins.pipeline.modeldefinition.Utils // These are set at runtime from data in ci/jenkins/docker-images.yml, update @@ -150,7 +150,8 @@ def init_git() { update_upstream_revision("HEAD") } else { // This is PR branch so merge with latest main. - merge_with_main() + // merge_with_main() + update_upstream_revision("HEAD") } sh( diff --git a/ci/jenkins/generated/minimal_cross_isa_jenkinsfile.groovy b/ci/jenkins/generated/minimal_cross_isa_jenkinsfile.groovy index 0039c30de39a..5c2dba0fe29b 100644 --- a/ci/jenkins/generated/minimal_cross_isa_jenkinsfile.groovy +++ b/ci/jenkins/generated/minimal_cross_isa_jenkinsfile.groovy @@ -60,7 +60,7 @@ // 'python3 jenkins/generate.py' // Note: This timestamp is here to ensure that updates to the Jenkinsfile are // always rebased on main before merging: -// Generated at 2023-06-09T15:32:58.314634 +// Generated at 2023-07-08T23:22:10.609341 import org.jenkinsci.plugins.pipeline.modeldefinition.Utils // These are set at runtime from data in ci/jenkins/docker-images.yml, update @@ -150,7 +150,8 @@ def init_git() { update_upstream_revision("HEAD") } else { // This is PR branch so merge with latest main. - merge_with_main() + // merge_with_main() + update_upstream_revision("HEAD") } sh( diff --git a/ci/jenkins/generated/minimal_jenkinsfile.groovy b/ci/jenkins/generated/minimal_jenkinsfile.groovy index a00abbc101b6..2e47f8c09246 100644 --- a/ci/jenkins/generated/minimal_jenkinsfile.groovy +++ b/ci/jenkins/generated/minimal_jenkinsfile.groovy @@ -60,7 +60,7 @@ // 'python3 jenkins/generate.py' // Note: This timestamp is here to ensure that updates to the Jenkinsfile are // always rebased on main before merging: -// Generated at 2023-06-09T15:32:58.255987 +// Generated at 2023-07-08T23:22:10.820101 import org.jenkinsci.plugins.pipeline.modeldefinition.Utils // These are set at runtime from data in ci/jenkins/docker-images.yml, update @@ -150,7 +150,8 @@ def init_git() { update_upstream_revision("HEAD") } else { // This is PR branch so merge with latest main. - merge_with_main() + // merge_with_main() + update_upstream_revision("HEAD") } sh( diff --git a/ci/jenkins/generated/riscv_jenkinsfile.groovy b/ci/jenkins/generated/riscv_jenkinsfile.groovy index b81477950d3d..1b8e2744d8e3 100644 --- a/ci/jenkins/generated/riscv_jenkinsfile.groovy +++ b/ci/jenkins/generated/riscv_jenkinsfile.groovy @@ -60,7 +60,7 @@ // 'python3 jenkins/generate.py' // Note: This timestamp is here to ensure that updates to the Jenkinsfile are // always rebased on main before merging: -// Generated at 2023-06-09T15:32:58.386864 +// Generated at 2023-07-08T23:22:10.796237 import org.jenkinsci.plugins.pipeline.modeldefinition.Utils // These are set at runtime from data in ci/jenkins/docker-images.yml, update @@ -150,7 +150,8 @@ def init_git() { update_upstream_revision("HEAD") } else { // This is PR branch so merge with latest main. - merge_with_main() + // merge_with_main() + update_upstream_revision("HEAD") } sh( diff --git a/ci/jenkins/generated/wasm_jenkinsfile.groovy b/ci/jenkins/generated/wasm_jenkinsfile.groovy index 46670cb31ed7..5785f8587495 100644 --- a/ci/jenkins/generated/wasm_jenkinsfile.groovy +++ b/ci/jenkins/generated/wasm_jenkinsfile.groovy @@ -60,7 +60,7 @@ // 'python3 jenkins/generate.py' // Note: This timestamp is here to ensure that updates to the Jenkinsfile are // always rebased on main before merging: -// Generated at 2023-06-09T15:32:58.374509 +// Generated at 2023-07-08T23:22:10.774419 import org.jenkinsci.plugins.pipeline.modeldefinition.Utils // These are set at runtime from data in ci/jenkins/docker-images.yml, update @@ -150,7 +150,8 @@ def init_git() { update_upstream_revision("HEAD") } else { // This is PR branch so merge with latest main. - merge_with_main() + // merge_with_main() + update_upstream_revision("HEAD") } sh( From d20ddd44b456caa9c1f97d961de2240d435660e7 Mon Sep 17 00:00:00 2001 From: ysh329 Date: Sun, 9 Jul 2023 18:30:22 +0800 Subject: [PATCH 2/2] fix in prepare groovy --- ci/jenkins/templates/utils/Prepare.groovy.j2 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/jenkins/templates/utils/Prepare.groovy.j2 b/ci/jenkins/templates/utils/Prepare.groovy.j2 index 3f27b98861f6..c03ef8e9b03c 100644 --- a/ci/jenkins/templates/utils/Prepare.groovy.j2 +++ b/ci/jenkins/templates/utils/Prepare.groovy.j2 @@ -20,7 +20,8 @@ def init_git() { update_upstream_revision("HEAD") } else { // This is PR branch so merge with latest main. - merge_with_main() + // merge_with_main() + update_upstream_revision("HEAD") } sh(