You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tvm.apache.org by ar...@apache.org on 2023/02/24 18:28:27 UTC
[tvm] 02/02: Try using CHANGE_ID to identify pull requests instead of hardcoding main.
This is an automated email from the ASF dual-hosted git repository.
areusch pushed a commit to branch areusch/fix-branch-release-ci
in repository https://gitbox.apache.org/repos/asf/tvm.git
commit 0ed6135ef5c5f94812651d6355ac4f1ee9239c65
Author: Andrew Reusch <ar...@gmail.com>
AuthorDate: Fri Feb 24 10:27:37 2023 -0800
Try using CHANGE_ID to identify pull requests instead of hardcoding main.
---
ci/jenkins/generated/arm_jenkinsfile.groovy | 10 ++++++++--
ci/jenkins/generated/cortexm_jenkinsfile.groovy | 10 ++++++++--
ci/jenkins/generated/cpu_jenkinsfile.groovy | 10 ++++++++--
ci/jenkins/generated/docker_jenkinsfile.groovy | 10 ++++++++--
ci/jenkins/generated/gpu_jenkinsfile.groovy | 10 ++++++++--
ci/jenkins/generated/hexagon_jenkinsfile.groovy | 10 ++++++++--
ci/jenkins/generated/i386_jenkinsfile.groovy | 10 ++++++++--
ci/jenkins/generated/lint_jenkinsfile.groovy | 10 ++++++++--
ci/jenkins/generated/minimal_jenkinsfile.groovy | 10 ++++++++--
ci/jenkins/generated/riscv_jenkinsfile.groovy | 10 ++++++++--
ci/jenkins/generated/wasm_jenkinsfile.groovy | 10 ++++++++--
ci/jenkins/templates/utils/Prepare.groovy.j2 | 8 +++++++-
12 files changed, 95 insertions(+), 23 deletions(-)
diff --git a/ci/jenkins/generated/arm_jenkinsfile.groovy b/ci/jenkins/generated/arm_jenkinsfile.groovy
index 0fc71b430c..7ad84bc7b9 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 2022-12-09T15:39:24.387114
+// Generated at 2023-02-24T10:27:10.759658
import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
// These are set at runtime from data in ci/jenkins/docker-images.yml, update
@@ -144,8 +144,14 @@ def init_git() {
label: 'Show executor node info',
)
+ sh(
+ script: """
+ env
+ """,
+ label: 'Print env',
+ )
// Determine merge commit to use for all stages
- if (env.BRANCH_NAME == 'main') {
+ if (env.CHANGE_ID == '') {
// Only set upstream_revision to HEAD and skip merging to avoid a race with another commit merged to main.
update_upstream_revision("HEAD")
} else {
diff --git a/ci/jenkins/generated/cortexm_jenkinsfile.groovy b/ci/jenkins/generated/cortexm_jenkinsfile.groovy
index 25846f5b4b..e8cfd7cbf1 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 2022-12-09T15:39:24.437899
+// Generated at 2023-02-24T10:27:10.641446
import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
// These are set at runtime from data in ci/jenkins/docker-images.yml, update
@@ -144,8 +144,14 @@ def init_git() {
label: 'Show executor node info',
)
+ sh(
+ script: """
+ env
+ """,
+ label: 'Print env',
+ )
// Determine merge commit to use for all stages
- if (env.BRANCH_NAME == 'main') {
+ if (env.CHANGE_ID == '') {
// Only set upstream_revision to HEAD and skip merging to avoid a race with another commit merged to main.
update_upstream_revision("HEAD")
} else {
diff --git a/ci/jenkins/generated/cpu_jenkinsfile.groovy b/ci/jenkins/generated/cpu_jenkinsfile.groovy
index f9ede00399..447717b60b 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 2022-12-09T15:39:24.540570
+// Generated at 2023-02-24T10:27:10.727925
import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
// These are set at runtime from data in ci/jenkins/docker-images.yml, update
@@ -144,8 +144,14 @@ def init_git() {
label: 'Show executor node info',
)
+ sh(
+ script: """
+ env
+ """,
+ label: 'Print env',
+ )
// Determine merge commit to use for all stages
- if (env.BRANCH_NAME == 'main') {
+ if (env.CHANGE_ID == '') {
// Only set upstream_revision to HEAD and skip merging to avoid a race with another commit merged to main.
update_upstream_revision("HEAD")
} else {
diff --git a/ci/jenkins/generated/docker_jenkinsfile.groovy b/ci/jenkins/generated/docker_jenkinsfile.groovy
index 9e1946c194..d0a1748237 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 2022-12-09T15:39:24.508775
+// Generated at 2023-02-24T10:27:10.624025
import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
// These are set at runtime from data in ci/jenkins/docker-images.yml, update
@@ -144,8 +144,14 @@ def init_git() {
label: 'Show executor node info',
)
+ sh(
+ script: """
+ env
+ """,
+ label: 'Print env',
+ )
// Determine merge commit to use for all stages
- if (env.BRANCH_NAME == 'main') {
+ if (env.CHANGE_ID == '') {
// Only set upstream_revision to HEAD and skip merging to avoid a race with another commit merged to main.
update_upstream_revision("HEAD")
} else {
diff --git a/ci/jenkins/generated/gpu_jenkinsfile.groovy b/ci/jenkins/generated/gpu_jenkinsfile.groovy
index a5609697af..5b4ddc0087 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 2022-12-09T15:39:24.455336
+// Generated at 2023-02-24T10:27:10.658488
import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
// These are set at runtime from data in ci/jenkins/docker-images.yml, update
@@ -144,8 +144,14 @@ def init_git() {
label: 'Show executor node info',
)
+ sh(
+ script: """
+ env
+ """,
+ label: 'Print env',
+ )
// Determine merge commit to use for all stages
- if (env.BRANCH_NAME == 'main') {
+ if (env.CHANGE_ID == '') {
// Only set upstream_revision to HEAD and skip merging to avoid a race with another commit merged to main.
update_upstream_revision("HEAD")
} else {
diff --git a/ci/jenkins/generated/hexagon_jenkinsfile.groovy b/ci/jenkins/generated/hexagon_jenkinsfile.groovy
index c2f39a0d08..3aeea67a89 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 2022-12-09T15:39:24.369191
+// Generated at 2023-02-24T10:27:10.777539
import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
// These are set at runtime from data in ci/jenkins/docker-images.yml, update
@@ -144,8 +144,14 @@ def init_git() {
label: 'Show executor node info',
)
+ sh(
+ script: """
+ env
+ """,
+ label: 'Print env',
+ )
// Determine merge commit to use for all stages
- if (env.BRANCH_NAME == 'main') {
+ if (env.CHANGE_ID == '') {
// Only set upstream_revision to HEAD and skip merging to avoid a race with another commit merged to main.
update_upstream_revision("HEAD")
} else {
diff --git a/ci/jenkins/generated/i386_jenkinsfile.groovy b/ci/jenkins/generated/i386_jenkinsfile.groovy
index ae66fbe3e4..858784d769 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 2022-12-09T15:39:24.421467
+// Generated at 2023-02-24T10:27:10.711614
import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
// These are set at runtime from data in ci/jenkins/docker-images.yml, update
@@ -144,8 +144,14 @@ def init_git() {
label: 'Show executor node info',
)
+ sh(
+ script: """
+ env
+ """,
+ label: 'Print env',
+ )
// Determine merge commit to use for all stages
- if (env.BRANCH_NAME == 'main') {
+ if (env.CHANGE_ID == '') {
// Only set upstream_revision to HEAD and skip merging to avoid a race with another commit merged to main.
update_upstream_revision("HEAD")
} else {
diff --git a/ci/jenkins/generated/lint_jenkinsfile.groovy b/ci/jenkins/generated/lint_jenkinsfile.groovy
index f8dccc8635..40c8c389c0 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 2022-12-09T15:39:24.476946
+// Generated at 2023-02-24T10:27:10.679672
import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
// These are set at runtime from data in ci/jenkins/docker-images.yml, update
@@ -144,8 +144,14 @@ def init_git() {
label: 'Show executor node info',
)
+ sh(
+ script: """
+ env
+ """,
+ label: 'Print env',
+ )
// Determine merge commit to use for all stages
- if (env.BRANCH_NAME == 'main') {
+ if (env.CHANGE_ID == '') {
// Only set upstream_revision to HEAD and skip merging to avoid a race with another commit merged to main.
update_upstream_revision("HEAD")
} else {
diff --git a/ci/jenkins/generated/minimal_jenkinsfile.groovy b/ci/jenkins/generated/minimal_jenkinsfile.groovy
index 6c4abb0bd5..69ad880492 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 2022-12-09T15:39:24.492813
+// Generated at 2023-02-24T10:27:10.605478
import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
// These are set at runtime from data in ci/jenkins/docker-images.yml, update
@@ -144,8 +144,14 @@ def init_git() {
label: 'Show executor node info',
)
+ sh(
+ script: """
+ env
+ """,
+ label: 'Print env',
+ )
// Determine merge commit to use for all stages
- if (env.BRANCH_NAME == 'main') {
+ if (env.CHANGE_ID == '') {
// Only set upstream_revision to HEAD and skip merging to avoid a race with another commit merged to main.
update_upstream_revision("HEAD")
} else {
diff --git a/ci/jenkins/generated/riscv_jenkinsfile.groovy b/ci/jenkins/generated/riscv_jenkinsfile.groovy
index 7b9bbe7ad3..b0e7ddcc84 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 2022-12-09T15:39:24.405262
+// Generated at 2023-02-24T10:27:10.695436
import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
// These are set at runtime from data in ci/jenkins/docker-images.yml, update
@@ -144,8 +144,14 @@ def init_git() {
label: 'Show executor node info',
)
+ sh(
+ script: """
+ env
+ """,
+ label: 'Print env',
+ )
// Determine merge commit to use for all stages
- if (env.BRANCH_NAME == 'main') {
+ if (env.CHANGE_ID == '') {
// Only set upstream_revision to HEAD and skip merging to avoid a race with another commit merged to main.
update_upstream_revision("HEAD")
} else {
diff --git a/ci/jenkins/generated/wasm_jenkinsfile.groovy b/ci/jenkins/generated/wasm_jenkinsfile.groovy
index 8c8ee03886..8b92985cb3 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 2022-12-09T15:39:24.526394
+// Generated at 2023-02-24T10:27:10.745343
import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
// These are set at runtime from data in ci/jenkins/docker-images.yml, update
@@ -144,8 +144,14 @@ def init_git() {
label: 'Show executor node info',
)
+ sh(
+ script: """
+ env
+ """,
+ label: 'Print env',
+ )
// Determine merge commit to use for all stages
- if (env.BRANCH_NAME == 'main') {
+ if (env.CHANGE_ID == '') {
// Only set upstream_revision to HEAD and skip merging to avoid a race with another commit merged to main.
update_upstream_revision("HEAD")
} else {
diff --git a/ci/jenkins/templates/utils/Prepare.groovy.j2 b/ci/jenkins/templates/utils/Prepare.groovy.j2
index d5aebdc070..f0fd74ca37 100644
--- a/ci/jenkins/templates/utils/Prepare.groovy.j2
+++ b/ci/jenkins/templates/utils/Prepare.groovy.j2
@@ -14,8 +14,14 @@ def init_git() {
label: 'Show executor node info',
)
+ sh(
+ script: """
+ env
+ """,
+ label: 'Print env',
+ )
// Determine merge commit to use for all stages
- if (env.BRANCH_NAME == 'main') {
+ if (env.CHANGE_ID == '') {
// Only set upstream_revision to HEAD and skip merging to avoid a race with another commit merged to main.
update_upstream_revision("HEAD")
} else {