Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pr_testing/_helper_functions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ function get_cached_GH_JSON (){
# TODO retry if curl fails do to external glitch
>&2 echo "Downloading PR ${PR}"
for i in 0 1 2 3 4 ; do
${CMSBOT_PYTHON_CMD} -c "import github_utils,json;data=github_utils.get_pr('${REPO}', '${PR_NR}');print(json.dumps(data))" > ${GH_JSON_PATH} || continue
PYTHONPATH=${PR_TESTING_DIR}/..${PYTHONPATH:+:$PYTHONPATH} ${CMSBOT_PYTHON_CMD} -c "import github_utils,json;data=github_utils.get_pr('${REPO}', '${PR_NR}');print(json.dumps(data))" > ${GH_JSON_PATH} || continue
echo ${GH_JSON_PATH}
break
done
Expand Down
1 change: 0 additions & 1 deletion pr_testing/merge_cms-bot_pr.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
# Constants
SCRIPTPATH="$( cd "$(dirname "$0")" ; pwd -P )" # Absolute path to script
CMS_BOT_DIR=$(dirname ${SCRIPTPATH}) # To get CMS_BOT dir path
export PYTHONPATH=$CMS_BOT_DIR:$PYTHONPATH
PR_TESTING_DIR=${CMS_BOT_DIR}/pr_testing
source ${PR_TESTING_DIR}/_helper_functions.sh # general helper functions

Expand Down