Skip to content
Merged
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
4 changes: 3 additions & 1 deletion src/dev/ci_setup/git_setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ function checkout_sibling {

cloneBranch="$PR_TARGET_BRANCH"
if clone_target_is_valid ; then
export TEST_ES_FROM=snapshot
return 0
fi

Expand All @@ -81,6 +80,9 @@ function checkout_sibling {

function checkout_clone_target {
pick_clone_target
if [[ $cloneBranch = "master" && $cloneAuthor = "elastic" ]]; then
export TEST_ES_FROM=snapshot
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need to checkout the es branch if we are running from a snapshot? Might be good time savings.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah i was hoping to do that, we reference a dotfile in the repo for setting up the correct java version. i'll see if there's someone else we can find it

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, that's right - that's fine for now.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This also is only for master - I am fine with that for now. We can always add 6.x to the list.

fi

echo " -> checking out '${cloneBranch}' branch from ${cloneAuthor}/${project}..."
git clone -b "$cloneBranch" "git@github.com:${cloneAuthor}/${project}.git" "$targetDir" --depth=1
Expand Down