github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 17:28:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

Revert "[ci/stats] fix git metadata collection (#66840)"

Browse source 
This reverts commit 9eaf0c050a.
This commit is contained in:
spalger 2020-05-19 08:16:56 -07:00
parent 82bc3d73bd
commit 49213bd20d
2 changed files with 22 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

31
vars/getCheckoutInfo.groovy
View file

@ -1,31 +0,0 @@
def call() {
def repoInfo = [
branch: env.ghprbSourceBranch ?: params.branch_specifier ?: null,
targetBranch: env.ghprbTargetBranch,
]
repoInfo.commit = sh(
script: "git rev-parse HEAD",
label: "determining checked out sha",
returnStdout: true
).trim()
if (repoInfo.targetBranch) {
sh(
script: "git fetch origin ${repoInfo.targetBranch}",
label: "fetch latest from '${repoInfo.targetBranch}' at origin"
)
repoInfo.mergeBase = sh(
script: "git merge-base HEAD FETCH_HEAD",
label: "determining merge point with '${repoInfo.targetBranch}' at origin",
returnStdout: true
).trim()
}
print "repoInfo: ${repoInfo}"
return repoInfo
}
return this

35
vars/workers.groovy
View file

@ -51,24 +51,33 @@ def base(Map params, Closure closure) {
}
}
def checkoutInfo = [:]
def scmVars = [:]
if (config.scm) {
// Try to clone from Github up to 8 times, waiting 15 secs between attempts
retryWithDelay(8, 15) {
checkout scm
}
scmVars = checkout scm
dir("kibana") {
checkoutInfo = getCheckoutInfo()
}
def mergeBase
if (env.ghprbTargetBranch) {
sh(
script: "cd kibana && git fetch origin ${env.ghprbTargetBranch}",
label: "update reference to target branch 'origin/${env.ghprbTargetBranch}'"
)
mergeBase = sh(
script: "cd kibana && git merge-base HEAD FETCH_HEAD",
label: "determining merge point with target branch 'origin/${env.ghprbTargetBranch}'",
returnStdout: true
).trim()
}
ciStats.reportGitInfo(
checkoutInfo.branch,
checkoutInfo.commit,
checkoutInfo.targetBranch,
checkoutInfo.mergeBase
)
ciStats.reportGitInfo(
env.ghprbSourceBranch ?: scmVars.GIT_LOCAL_BRANCH ?: scmVars.GIT_BRANCH,
scmVars.GIT_COMMIT,
env.ghprbTargetBranch,
mergeBase
)
}
}
withEnv([
@ -78,7 +87,7 @@ def base(Map params, Closure closure) {
"PR_TARGET_BRANCH=${env.ghprbTargetBranch ?: ''}",
"PR_AUTHOR=${env.ghprbPullAuthorLogin ?: ''}",
"TEST_BROWSER_HEADLESS=1",
"GIT_BRANCH=${checkoutInfo.branch ?: ''}",
"GIT_BRANCH=${scmVars.GIT_BRANCH ?: ''}",
]) {
withCredentials([
string(credentialsId: 'vault-addr', variable: 'VAULT_ADDR'),