Update aap_install.groovy

chr-stian · Oct 23, 2023 · 532a3e7 · 532a3e7
1 parent 602d3f8
commit 532a3e7
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/.ci/aap_install.groovy b/.ci/aap_install.groovy
@@ -33,11 +33,10 @@ pipeline {
                 steps {
                     script {
 
-                        echo "GitHub Repository: ${env.GITHUB_REPO}"
-                        echo "GitHub Fork: ${env.GITHUB_FORK}"
-                        fork = env.GITHUB_FORK ?: 'ansible'
+                        echo "GitHub Fork: ${env.CHANGE_FORK}"
+                        fork = env.CHANGE_FORK ?: 'ansible'
                         echo "${fork}"
-                        echo "Branch Name: ${env.BRANCH_NAME}"
+                        echo "Branch Name: ${env.CHANGE_BRANCH}"
 
                         // validateInfo = stepsFactory.yoloSteps.validateYoloParameters(params)
 
@@ -61,7 +60,7 @@ pipeline {
                 steps {
                     container('aapqa-ansible') {
                         script {
-                                stepsFactory.commonSteps.checkoutGalaxyNG([galaxyNGBranch: env.BRANCH_NAME,  galaxyNGFork: fork])
+                                stepsFactory.commonSteps.checkoutGalaxyNG([galaxyNGBranch: env.CHANGE_BRANCH,  galaxyNGFork: fork])
                         }
                     }
                 }
@@ -158,7 +157,7 @@ pipeline {
 
                             Map ahubPipParams = [
                                     automationhub_git_url: "https://github.com/${fork}/galaxy_ng",
-                                    automationhub_git_version: "${env.BRANCH_NAME}",
+                                    automationhub_git_version: "${env.CHANGE_BRANCH}",
                                     automationhub_ui_download_url: "https://github.com/ansible/ansible-hub-ui/releases/download/dev/automation-hub-ui-dist.tar.gz",
                             ]
                             if (pulpcore_version != '') {