Skip to content
This repository has been archived by the owner on Feb 9, 2022. It is now read-only.

[backports/ci/1.2] backport ci updates #534

Merged
merged 3 commits into from
May 10, 2019

Conversation

sameersbn
Copy link
Contributor

No description provided.

Sameer Naik added 3 commits May 10, 2019 07:55
@sameersbn sameersbn requested review from anguslees and falfaro May 10, 2019 02:30
@sameersbn sameersbn added the ci Specific to CI/CD label May 10, 2019
@@ -16,6 +16,64 @@ def parentZoneResourceGroup = 'jenkins-bkpr-rg'
// Force using our pod
def label = env.BUILD_TAG.replaceAll(/[^a-zA-Z0-9-]/, '-').toLowerCase()

def scmCheckout() {
def repo_url = env.GITHUB_REPO_GIT_URL
def sha = env.GITHUB_PR_HEAD_SHA ? env.GITHUB_PR_HEAD_SHA : env.GITHUB_BRANCH_HEAD_SHA
Copy link
Contributor

Choose a reason for hiding this comment

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

Fwiw, groovy has an "elvis operator", for exactly this "fallback default" situation (should be equivalent to your long version):

Suggested change
def sha = env.GITHUB_PR_HEAD_SHA ? env.GITHUB_PR_HEAD_SHA : env.GITHUB_BRANCH_HEAD_SHA
def sha = env.GITHUB_PR_HEAD_SHA ?: env.GITHUB_BRANCH_HEAD_SHA

Copy link
Contributor Author

Choose a reason for hiding this comment

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

nice! will update

@sameersbn
Copy link
Contributor Author

bors r+

bors bot added a commit that referenced this pull request May 10, 2019
534: [backports/ci/1.2] backport ci updates r=sameersbn a=sameersbn



Co-authored-by: Sameer Naik <sameer@bitnami.com>
@bors
Copy link
Contributor

bors bot commented May 10, 2019

Build succeeded

@bors bors bot merged commit 7a9f6ac into vmware-archive:release-1.2 May 10, 2019
@sameersbn sameersbn deleted the ci-backports-1.2-20190510 branch May 10, 2019 08:51
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
ci Specific to CI/CD
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants