Skip to content
Snippets Groups Projects
Commit 592ab1eb authored by Michael Youngstrom's avatar Michael Youngstrom
Browse files

Fix quality and python private jobs

parent 1fa2570a
No related branches found
No related tags found
No related merge requests found
...@@ -18,7 +18,8 @@ mongo --quiet --eval 'db.getMongo().getDBNames().forEach(function(i){db.getSibli ...@@ -18,7 +18,8 @@ mongo --quiet --eval 'db.getMongo().getDBNames().forEach(function(i){db.getSibli
# branch to a target branch; depending on how the GitHub plugin refspec # branch to a target branch; depending on how the GitHub plugin refspec
# is configured, this may not already be fetched. # is configured, this may not already be fetched.
if [ ! -z ${TARGET_BRANCH+x} ]; then if [ ! -z ${TARGET_BRANCH+x} ]; then
git fetch origin $TARGET_BRANCH:refs/remotes/origin/$TARGET_BRANCH TARGET_BRANCH_WITHOUT_ORIGIN=$(echo "${TARGET_BRANCH}" | sed 's:^origin/::')
git fetch origin $TARGET_BRANCH_WITHOUT_ORIGIN:refs/remotes/origin/$TARGET_BRANCH_WITHOUT_ORIGIN
fi fi
# Reset the jenkins worker's virtualenv back to the # Reset the jenkins worker's virtualenv back to the
......
...@@ -60,8 +60,16 @@ done ...@@ -60,8 +60,16 @@ done
current_branch_hash=`git rev-parse HEAD` current_branch_hash=`git rev-parse HEAD`
if [ -z "${MAIN_COMMIT+x}" ]; then if [ -z "${MAIN_COMMIT+x}" ]; then
# if commit is not set, get hash of current branch if [ -z ${TARGET_BRANCH+x} ]; then
MAIN_COMMIT="origin/master" # if commit is not set and no target branch, get hash of current branch
MAIN_COMMIT="origin/master"
else
if [[ $TARGET_BRANCH == origin/* ]]; then
MAIN_COMMIT=$TARGET_BRANCH
else
MAIN_COMMIT=origin/$TARGET_BRANCH
fi
fi
fi fi
merge_base_command="git merge-base $current_branch_hash $MAIN_COMMIT" merge_base_command="git merge-base $current_branch_hash $MAIN_COMMIT"
......
...@@ -45,6 +45,7 @@ passenv = ...@@ -45,6 +45,7 @@ passenv =
SELENIUM_PORT SELENIUM_PORT
SHARD SHARD
SKIP_NPM_INSTALL SKIP_NPM_INSTALL
TARGET_BRANCH
TEST_SUITE TEST_SUITE
XDIST_CONTAINER_SECURITY_GROUP XDIST_CONTAINER_SECURITY_GROUP
XDIST_CONTAINER_SUBNET XDIST_CONTAINER_SUBNET
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment