Edpc 3516 verify cluster configuration (#1228)

Fix credentials id retrieval.

Author: valituguran

CHANGELOG.md

@@ -8,6 +8,7 @@
 ### Changed
 
 ### Fixed
+* Fix credentials id retrieval ([#1228](https://github.com/opendevstack/ods-jenkins-shared-library/pull/1228))
 * Fix Tailor deployment drifts for D, Q envs ([#1055](https://github.com/opendevstack/ods-jenkins-shared-library/pull/1055))
 
 ## [4.9.0] - 2025-8-06

src/org/ods/orchestration/DeployStage.groovy

@@ -90,12 +90,14 @@ class DeployStage extends Stage {
                     "'${project.buildParams.targetEnvironment}' installable repos? ${installableRepos?.size()}")
 
                 if (installableRepos?.size() > 0) {
+                    String openshiftClusterCredentialsId = project.environmentConfig?.credentialsId
+                        ?: project.environmentConfig?.openshiftClusterCredentialsId
                     util.verifyEnvLoginAndExistence(script,
                         os,
                         project.targetProject,
                         project.data.openshift?.sessionApiUrl,
                         project.data.openshift?.targetApiUrl,
-                        project.environmentConfig?.credentialsId)
+                        openshiftClusterCredentialsId)
                 }
             }
 

test/groovy/org/ods/orchestration/DeployStageSpec.groovy

@@ -141,7 +141,7 @@ class DeployStageSpec extends SpecHelper {
         1 * bitbucketService.getUrl() >> "https://bitbucket"
         1 * util.getInstallableRepos()
         1 * util.verifyEnvLoginAndExistence(*_)
-        0 * script.usernamePassword(['credentialsId':'testCredentials',
+        0 * script.usernamePassword(['credentialsId':'',
                                      'usernameVariable':'EXTERNAL_OCP_API_SA',
                                      'passwordVariable':'EXTERNAL_OCP_API_TOKEN'])
     }
@@ -169,8 +169,8 @@ class DeployStageSpec extends SpecHelper {
         openshiftService.envExists(project.targetProject) >> true
         util.prepareExecutePhaseForReposNamedJob(*_) >> []
         project.data.metadata.environments.prod = [
-            'apiUrl': 'external.api.com',
-            'credentialsId': 'testCredentials'
+            'openshiftClusterApiUrl': 'external.api.com',
+            'openshiftClusterCredentialsId': 'testCredentials'
         ]
         project.setOpenShiftData("test.api.url")