Merge pull request #3413 from git-harry/RE-2031/queens/0

Replace RE_JOB_NAME with RE_JOB_PROJECT_NAME
rcbops · Nov 21, 2018 · 02cd821 · 02cd821
2 parents a034358 + b4c9aa3
commit 02cd821
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/gating/check/run_system_tests.sh b/gating/check/run_system_tests.sh
@@ -26,7 +26,7 @@ SYS_TEST_BRANCH="${RE_JOB_BRANCH:-master}"
 
 # Switch system test branch to `dev` or `maas` on the experimental-asc job.
 # This job is specifically for running system tests under development.
-if [[ ${RE_JOB_NAME} == experimental-asc* ]]; then
+if [[ ${RE_JOB_PROJECT_NAME} == experimental-asc* ]]; then
     if [[ ${RE_JOB_ACTION} == "system_staging" ]]; then
         SYS_TEST_BRANCH=dev
     fi

diff --git a/gating/gating_vars.sh b/gating/gating_vars.sh
@@ -9,3 +9,4 @@ export RE_JOB_TRIGGER="${RE_JOB_TRIGGER:-USER}"
 export RE_HOOK_ARTIFACT_DIR="${RE_HOOK_ARTIFACT_DIR:-/tmp/artifacts}"
 export RE_HOOK_RESULT_DIR="${RE_HOOK_RESULT_DIR:-/tmp/results}"
 export RE_JOB_NAME="${RE_JOB_NAME:-${RE_JOB_TRIGGER}_rpc-openstack-master-${RE_JOB_IMAGE}_no_artifacts-${RE_JOB_SCENARIO}-${RE_JOB_ACTION}}"
+export RE_JOB_PROJECT_NAME="${RE_JOB_PROJECT_NAME:-}"