From 67a442bc80de63bbb4aa8b7fb17768f27dfbe410 Mon Sep 17 00:00:00 2001
From: Jose Luis Rivero <jrivero@osrfoundation.org>
Date: Tue, 26 Nov 2024 17:22:06 +0100
Subject: [PATCH] Fixes and changes for consistency

Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
---
 jenkins-scripts/dsl/_configs_/OSRFCredentials.groovy | 4 ++--
 jenkins-scripts/dsl/_configs_/OSRFReleasepy.groovy   | 2 +-
 jenkins-scripts/dsl/ignition_collection.dsl          | 2 +-
 jenkins-scripts/dsl/test.dsl                         | 8 ++++----
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/jenkins-scripts/dsl/_configs_/OSRFCredentials.groovy b/jenkins-scripts/dsl/_configs_/OSRFCredentials.groovy
index 943ab345c..961344aed 100644
--- a/jenkins-scripts/dsl/_configs_/OSRFCredentials.groovy
+++ b/jenkins-scripts/dsl/_configs_/OSRFCredentials.groovy
@@ -13,8 +13,8 @@ class OSRFCredentials
         credentialsBinding {
           crendentials_list.each { credential_keyword ->
             if (credential_keyword == 'OSRFBUILD_GITHUB_TOKEN') {
-                usernamePassword('OSRFBUILD_USER',
-                                 'OSRFBUILD_TOKEN',
+                usernamePassword('OSRFBUILD_GITHUB_USER',
+                                 'OSRFBUILD_GITHUB_TOKEN',
                                  'github-osrfbuild-apitoken')
             } else if (credential_keyword == 'OSRFBUILD_JENKINS_TOKEN') {
                 usernamePassword('OSRFBUILD_JENKINS_USER',
diff --git a/jenkins-scripts/dsl/_configs_/OSRFReleasepy.groovy b/jenkins-scripts/dsl/_configs_/OSRFReleasepy.groovy
index 203dade3c..081099d5d 100644
--- a/jenkins-scripts/dsl/_configs_/OSRFReleasepy.groovy
+++ b/jenkins-scripts/dsl/_configs_/OSRFReleasepy.groovy
@@ -72,7 +72,7 @@ class OSRFReleasepy
 
             echo "releasing \${n} (from branch \${src_branch})"
               python3 ./scripts/release.py \${dry_run_str} "\${PACKAGE}" "\${VERSION}" \${extra_osrf_repo} \
-                      --auth "\${OSRFBUILD_USER}:\${OSRFBUILD_TOKEN}"' \
+                      --auth "\${OSRFBUILD_JENKINS_USER}:\${OSRFBUILD_JENKINS_TOKEN}" \
                       --source-tarball-uri \${SOURCE_TARBALL_URI} \
                       --release-repo-branch \${RELEASE_REPO_BRANCH} \
                       --upload-to-repo \${UPLOAD_TO_REPO}
diff --git a/jenkins-scripts/dsl/ignition_collection.dsl b/jenkins-scripts/dsl/ignition_collection.dsl
index fabdbfb2a..dff60bc90 100644
--- a/jenkins-scripts/dsl/ignition_collection.dsl
+++ b/jenkins-scripts/dsl/ignition_collection.dsl
@@ -240,7 +240,7 @@ nightly_scheduler_job.with
 
               echo "releasing \${n} (from branch \${src_branch})"
               python3 ./scripts/release.py \${dry_run_str} "\${n}" nightly \
-                      --auth "\${OSRFBUILD_USER}:\${OSRFBUILD_TOKEN}"' \
+                      --auth "\${OSRFBUILD_JENKINS_USER}:\${OSRFBUILD_JENKINS_TOKEN}" \
                       --release-repo-branch main \
                       --nightly-src-branch \${src_branch} \
                       --upload-to-repo nightly
diff --git a/jenkins-scripts/dsl/test.dsl b/jenkins-scripts/dsl/test.dsl
index deecda1c2..7d6e7a546 100644
--- a/jenkins-scripts/dsl/test.dsl
+++ b/jenkins-scripts/dsl/test.dsl
@@ -153,12 +153,12 @@ test_credentials_token_job.with
           echo " + Testing OSRFBUILD_GITHUB_TOKEN ability to push into the fork osrfbuild/homebrew-simulation"
           echo "   (out of the test is the ability to create pull requests into osrf/homebrew-simulation)"
           rm -fr homebrew-simulation
-          git clone https://github.com/\${OSRFBUILD_USER}/homebrew-simulation.git
+          git clone https://github.com/\${OSRFBUILD_GITHUB_USER}/homebrew-simulation.git
           cd homebrew-simulation
-          git config user.name \${OSRFBUILD_USER} --replace-all
-          git config user.email "\${OSRFBUILD_USER}@openrobotics.org" --replace-all
+          git config user.name \${OSRFBUILD_GITHUB_USER} --replace-all
+          git config user.email "\${OSRFBUILD_GITHUB_USER}@openrobotics.org" --replace-all
           set +x
-          git config url."https://osrfbuild:\${OSRFBUILD_TOKEN}@github.com/osrfbuild/homebrew-simulation.git".InsteadOf https://github.com/osrfbuild/homebrew-simulation.git
+          git config url."https://osrfbuild:\${OSRFBUILD_GITHUB_TOKEN}@github.com/osrfbuild/homebrew-simulation.git".InsteadOf https://github.com/osrfbuild/homebrew-simulation.git
           set -x
           GIT_TERMINAL_PROMPT=0 git push -u origin master --dry-run
           """.stripIndent())