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 2022/07/12 21:48:13 UTC
[tvm] 28/47: fix escape
This is an automated email from the ASF dual-hosted git repository.
areusch pushed a commit to branch areusch/freeze-dependencies
in repository https://gitbox.apache.org/repos/asf/tvm.git
commit cd816ebb73c862deb51a44424215519d7ca26d60
Author: Andrew Reusch <ar...@gmail.com>
AuthorDate: Mon Jun 13 17:03:10 2022 -0700
fix escape
---
Jenkinsfile | 10 +++++-----
ci/jenkins/DockerBuild.groovy.j2 | 8 ++++----
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index efc7560f8f..6df3761e23 100755
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -45,7 +45,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-06-13T16:39:11.598304
+// Generated at 2022-06-13T17:28:53.960037
import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
// NOTE: these lines are scanned by docker/dev_common.sh. Please update the regex as needed. -->
@@ -366,9 +366,9 @@ def ecr_push(full_name) {
)
sh(
script: """
- set -x
- docker tag ${full_name} \$AWS_ECR_REPO/${full_name}
- docker push \$AWS_ECR_REPO/${full_name}
+ set -eux
+ docker tag ${full_name} ${ecr_name}
+ docker push ${ecr_name}
""",
label: 'Upload image to ECR'
)
@@ -436,7 +436,7 @@ def build_image(image_name) {
script: "docker/sanitize-docker-image-name.sh ${env.BRANCH_NAME}-${hash}-${env.BUILD_NUMBER}",
label: "Sanitize image name",
returnStdout: true
- )
+ ).trim()
def full_name = "${image_name}:${image_rev}"
sh(
script: "${docker_build} ${image_name} --spec ${full_name}",
diff --git a/ci/jenkins/DockerBuild.groovy.j2 b/ci/jenkins/DockerBuild.groovy.j2
index 80ee66a6ae..7a77f15a98 100644
--- a/ci/jenkins/DockerBuild.groovy.j2
+++ b/ci/jenkins/DockerBuild.groovy.j2
@@ -20,9 +20,9 @@ def ecr_push(full_name) {
)
sh(
script: """
- set -x
- docker tag ${full_name} \$AWS_ECR_REPO/${full_name}
- docker push \$AWS_ECR_REPO/${full_name}
+ set -eux
+ docker tag ${full_name} ${ecr_name}
+ docker push ${ecr_name}
""",
label: 'Upload image to ECR'
)
@@ -90,7 +90,7 @@ def build_image(image_name) {
script: "docker/sanitize-docker-image-name.sh ${env.BRANCH_NAME}-${hash}-${env.BUILD_NUMBER}",
label: "Sanitize image name",
returnStdout: true
- )
+ ).trim()
def full_name = "${image_name}:${image_rev}"
sh(
script: "${docker_build} ${image_name} --spec ${full_name}",