Skip to content

Commit 3c11702

Browse files
committed
Use credential binding plugin to wrap use of GitHub token
1 parent 4d7bf8e commit 3c11702

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

Jenkinsfile

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ pipeline {
1717
booleanParam(name: "DEBUG", defaultValue: false, description: "")
1818
}
1919
environment {
20+
GITHUB_CREDENTIAL_ID = "brave-builds-github-token-for-pr-builder"
2021
REFERRAL_API_KEY = credentials("REFERRAL_API_KEY")
2122
BRAVE_SERVICES_KEY = credentials("brave-services-key")
2223
BRAVE_INFURA_PROJECT_ID = credentials("brave-infura-project-id")
@@ -28,8 +29,10 @@ pipeline {
2829
stages {
2930
stage("env") {
3031
steps {
31-
script {
32-
setEnv()
32+
withCredentials([usernamePassword(credentialsId: "${GITHUB_CREDENTIAL_ID}", usernameVariable: "PR_BUILDER_USER", passwordVariable: "PR_BUILDER_TOKEN")]) {
33+
script {
34+
setEnv()
35+
}
3336
}
3437
}
3538
}
@@ -817,7 +820,6 @@ def setEnv() {
817820
LINT_BRANCH = "TEMP_LINT_BRANCH_" + env.BUILD_NUMBER
818821
BRAVE_GITHUB_TOKEN = "brave-browser-releases-github"
819822
GITHUB_API = "https://api.github.com/repos/brave"
820-
GITHUB_CREDENTIAL_ID = "brave-builds-github-token-for-pr-builder"
821823
SKIP = false
822824
SKIP_ANDROID = false
823825
SKIP_IOS = false
@@ -829,8 +831,8 @@ def setEnv() {
829831
if (env.CHANGE_BRANCH) {
830832
BRANCH = env.CHANGE_BRANCH
831833
BASE_BRANCH = env.CHANGE_TARGET
832-
def bbPrNumber = readJSON(text: httpRequest(customHeaders: [[name: "Authorization", value: "token ${GITHUB_CREDENTIAL_ID}"]], url: GITHUB_API + "/brave-browser/pulls?head=brave:" + BRANCH, quiet: !DEBUG).content)[0].number
833-
def bbPrDetails = readJSON(text: httpRequest(customHeaders: [[name: "Authorization", value: "token ${GITHUB_CREDENTIAL_ID}"]], url: GITHUB_API + "/brave-browser/pulls/" + bbPrNumber, quiet: !DEBUG).content)
834+
def bbPrNumber = readJSON(text: httpRequest(customHeaders: [[name: "Authorization", value: "token ${PR_BUILDER_TOKEN}"]], url: GITHUB_API + "/brave-browser/pulls?head=brave:" + BRANCH, quiet: !DEBUG).content)[0].number
835+
def bbPrDetails = readJSON(text: httpRequest(customHeaders: [[name: "Authorization", value: "token ${PR_BUILDER_TOKEN}"]], url: GITHUB_API + "/brave-browser/pulls/" + bbPrNumber, quiet: !DEBUG).content)
834836
SKIP = bbPrDetails.mergeable_state.equals("draft") || bbPrDetails.labels.count { label -> label.name.equalsIgnoreCase("CI/skip") }.equals(1)
835837
SKIP_ANDROID = bbPrDetails.labels.count { label -> label.name.equalsIgnoreCase("CI/skip-android") }.equals(1)
836838
SKIP_IOS = bbPrDetails.labels.count { label -> label.name.equalsIgnoreCase("CI/skip-ios") }.equals(1)
@@ -843,12 +845,12 @@ def setEnv() {
843845
env.BRANCH_PRODUCTIVITY_DESCRIPTION = bbPrDetails.title
844846
env.BRANCH_PRODUCTIVITY_USER = env.SLACK_USERNAME ?: bbPrDetails.user.login
845847
}
846-
BRANCH_EXISTS_IN_BC = httpRequest(customHeaders: [[name: "Authorization", value: "token ${GITHUB_CREDENTIAL_ID}"]], url: GITHUB_API + "/brave-core/branches/" + BRANCH, validResponseCodes: "100:499", quiet: !DEBUG).status.equals(200)
848+
BRANCH_EXISTS_IN_BC = httpRequest(customHeaders: [[name: "Authorization", value: "token ${PR_BUILDER_TOKEN}"]], url: GITHUB_API + "/brave-core/branches/" + BRANCH, validResponseCodes: "100:499", quiet: !DEBUG).status.equals(200)
847849
if (BRANCH_EXISTS_IN_BC) {
848-
def bcPrDetails = readJSON(text: httpRequest(customHeaders: [[name: "Authorization", value: "token ${GITHUB_CREDENTIAL_ID}"]], url: GITHUB_API + "/brave-core/pulls?head=brave:" + BRANCH, quiet: !DEBUG).content)[0]
850+
def bcPrDetails = readJSON(text: httpRequest(customHeaders: [[name: "Authorization", value: "token ${PR_BUILDER_TOKEN}"]], url: GITHUB_API + "/brave-core/pulls?head=brave:" + BRANCH, quiet: !DEBUG).content)[0]
849851
if (bcPrDetails) {
850852
env.BC_PR_NUMBER = bcPrDetails.number
851-
bcPrDetails = readJSON(text: httpRequest(customHeaders: [[name: "Authorization", value: "token ${GITHUB_CREDENTIAL_ID}"]], url: GITHUB_API + "/brave-core/pulls/" + env.BC_PR_NUMBER, quiet: !DEBUG).content)
853+
bcPrDetails = readJSON(text: httpRequest(customHeaders: [[name: "Authorization", value: "token ${PR_BUILDER_TOKEN}"]], url: GITHUB_API + "/brave-core/pulls/" + env.BC_PR_NUMBER, quiet: !DEBUG).content)
852854
BASE_BRANCH = bcPrDetails.base.ref
853855
SKIP = bcPrDetails.mergeable_state.equals("draft") || bcPrDetails.labels.count { label -> label.name.equalsIgnoreCase("CI/skip") }.equals(1)
854856
SKIP_ANDROID = SKIP_ANDROID || bcPrDetails.labels.count { label -> label.name.equalsIgnoreCase("CI/skip-android") }.equals(1)

0 commit comments

Comments
 (0)