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

Fix percy target branch for PRs #43160

Merged
merged 11 commits into from
Aug 14, 2019
Merged

Fix percy target branch for PRs #43160

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d90a993
Fix percy target branch for PRs
Aug 12, 2019
9ae4376
Add debug logging
Aug 12, 2019
5606b0e
Try diff branch name
Aug 13, 2019
8e94572
Use PR_TARGET_BRANCH instead
Aug 13, 2019
19fe23b
Merge branch 'master' of github.com:elastic/kibana into liza-fix/perc…
Aug 13, 2019
3046147
renable visReg jobs
Aug 13, 2019
26d483a
parse target branch from `branch_specifier`
Aug 13, 2019
fa57271
rename debugging print out
Aug 13, 2019
31dd2bd
set `PERCY_BRANCH` and `PERCY_TARGET_BRANCH`
Aug 13, 2019
9015e48
log PERCY_TARGET_BRANCH
Aug 13, 2019
8d6023a
cleanup error messages
Aug 13, 2019
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
5 changes: 5 additions & 0 deletions src/dev/ci_setup/get_percy_env.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,10 @@ const shortCommit = commit.slice(0, 8);

const isPr = process.env.JOB_NAME.includes('elastic+kibana+pull-request');

const { stdout: branch } = execa.sync('git', ['rev-parse', '--abbrev-ref', 'HEAD']);
Copy link
Contributor

Choose a reason for hiding this comment

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

Any reason for this not to be what is tracked in the package.json? https://github.com/elastic/kibana/blob/master/package.json#L15

Copy link
Contributor

Choose a reason for hiding this comment

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

I want to keep it separate so that feature branches can deviate from the base snapshots.


const prBranch = 'origin/${process.env.ghprbTargetBranch}';

console.log(`export PERCY_PARALLEL_TOTAL=2;`);
console.log(`export PERCY_PARALLEL_NONCE="${shortCommit}/${isPr ? 'PR' : pkg.branch}/${process.env.BUILD_ID}";`);
console.log(`export PERCY_TARGET_BRANCH="${isPr ? prBranch : branch}";`);
1 change: 1 addition & 0 deletions src/dev/ci_setup/setup_percy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ export PUPPETEER_EXECUTABLE_PATH
eval "$(node ./src/dev/ci_setup/get_percy_env)"
echo " -- PERCY_PARALLEL_NONCE='$PERCY_PARALLEL_NONCE'"
echo " -- PERCY_PARALLEL_TOTAL='$PERCY_PARALLEL_TOTAL'"
echo " -- PERCY_TARGET_BRANCH='$PERCY_TARGET_BRANCH'"