Skip to content

Commit b56f636

Browse files
committed
Rename OSRFBUILD_* to OSRFBUILD_GITHUB_*
Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
1 parent 36f987e commit b56f636

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

jenkins-scripts/dsl/_configs_/OSRFCredentials.groovy

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ class OSRFCredentials
1313
credentialsBinding {
1414
crendentials_list.each { credential_keyword ->
1515
if (credential_keyword == 'OSRFBUILD_GITHUB_TOKEN') {
16-
usernamePassword('OSRFBUILD_USER',
17-
'OSRFBUILD_TOKEN',
16+
usernamePassword('OSRFBUILD_GITHUB_USER',
17+
'OSRFBUILD_GITHUB_TOKEN',
1818
'github-osrfbuild-apitoken')
1919
} else if (credential_keyword == 'OSRFBUILD_JENKINS_TOKEN') {
2020
usernamePassword('OSRFBUILD_JENKINS_USER',

jenkins-scripts/dsl/test.dsl

+4-4
Original file line numberDiff line numberDiff line change
@@ -153,12 +153,12 @@ test_credentials_token_job.with
153153
echo " + Testing OSRFBUILD_GITHUB_TOKEN ability to push into the fork osrfbuild/homebrew-simulation"
154154
echo " (out of the test is the ability to create pull requests into osrf/homebrew-simulation)"
155155
rm -fr homebrew-simulation
156-
git clone https://github.com/\${OSRFBUILD_USER}/homebrew-simulation.git
156+
git clone https://github.com/\${OSRFBUILD_GITHUB_USER}/homebrew-simulation.git
157157
cd homebrew-simulation
158-
git config user.name \${OSRFBUILD_USER} --replace-all
159-
git config user.email "\${OSRFBUILD_USER}@openrobotics.org" --replace-all
158+
git config user.name \${OSRFBUILD_GITHUB_USER} --replace-all
159+
git config user.email "\${OSRFBUILD_GITHUB_USER}@openrobotics.org" --replace-all
160160
set +x
161-
git config url."https://osrfbuild:\${OSRFBUILD_TOKEN}@github.com/osrfbuild/homebrew-simulation.git".InsteadOf https://github.com/osrfbuild/homebrew-simulation.git
161+
git config url."https://osrfbuild:\${OSRFBUILD_GITHUB_TOKEN}@github.com/osrfbuild/homebrew-simulation.git".InsteadOf https://github.com/osrfbuild/homebrew-simulation.git
162162
set -x
163163
GIT_TERMINAL_PROMPT=0 git push -u origin master --dry-run
164164
""".stripIndent())

0 commit comments

Comments
 (0)