From 68f51e692b79e799112dd709da8aa0ce854f7f23 Mon Sep 17 00:00:00 2001 From: driazati <9407960+driazati@users.noreply.github.com> Date: Mon, 14 Nov 2022 16:21:35 -0700 Subject: [PATCH] [ci] Fix Jenkins quoting (#13380) Merging #13368 caused CI to pass but run more than it needed to due to some failures in determination. This fixes the interpolation to use `"` which should correctly pass through the variables Co-authored-by: driazati --- Jenkinsfile | 6 +++--- ci/jenkins/Prepare.groovy.j2 | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 171e200df379..079fb0688952 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-10-19T13:44:32.119961 +// Generated at 2022-11-14T12:32:18.663464 import org.jenkinsci.plugins.pipeline.modeldefinition.Utils // NOTE: these lines are scanned by docker/dev_common.sh. Please update the regex as needed. --> @@ -376,14 +376,14 @@ def prepare() { is_docs_only_build = sh ( returnStatus: true, - script: './${jenkins_scripts_root}/git_change_docs.sh', + script: "./${jenkins_scripts_root}/git_change_docs.sh", label: 'Check for docs only changes', ) skip_ci = should_skip_ci(env.CHANGE_ID) skip_slow_tests = should_skip_slow_tests(env.CHANGE_ID) rebuild_docker_images = sh ( returnStatus: true, - script: './${jenkins_scripts_root}/git_change_docker.sh', + script: "./${jenkins_scripts_root}/git_change_docker.sh", label: 'Check for any docker changes', ) diff --git a/ci/jenkins/Prepare.groovy.j2 b/ci/jenkins/Prepare.groovy.j2 index 8bc57f466225..4fd5e66e2f14 100644 --- a/ci/jenkins/Prepare.groovy.j2 +++ b/ci/jenkins/Prepare.groovy.j2 @@ -205,14 +205,14 @@ def prepare() { is_docs_only_build = sh ( returnStatus: true, - script: './${jenkins_scripts_root}/git_change_docs.sh', + script: "./${jenkins_scripts_root}/git_change_docs.sh", label: 'Check for docs only changes', ) skip_ci = should_skip_ci(env.CHANGE_ID) skip_slow_tests = should_skip_slow_tests(env.CHANGE_ID) rebuild_docker_images = sh ( returnStatus: true, - script: './${jenkins_scripts_root}/git_change_docker.sh', + script: "./${jenkins_scripts_root}/git_change_docker.sh", label: 'Check for any docker changes', )