Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[ci] use es snapshots on non pull requests #22834

Merged
merged 3 commits into from
Sep 10, 2018
Merged

[ci] use es snapshots on non pull requests #22834

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e40e79c
[ci] use es snapshots on non pull requests
jbudz Sep 7, 2018
23f2389
remove extra export
jbudz Sep 7, 2018
f3633f5
always clone
jbudz Sep 7, 2018
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
View file
Open in desktop
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
Contributor

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
Member 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
Contributor

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
Contributor

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