getProjectTriggering job error solved (#1544)

* getProjectTriggering job error solved * testing generate_files.yml error
kiegroup · Dec 9, 2020 · 5fb56cc · 5fb56cc
1 parent b4f7b59
commit 5fb56cc
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 11 deletions.
diff --git a/.ci/compilation.stages b/.ci/compilation.stages
@@ -8,8 +8,7 @@ def call(def propertiesFolderPath) {
             def file = readFile REPOSITORY_LIST_FILE
             def projectCollection = file.readLines()
             projectCollection.removeAll(['kie-jpmml-integration','kie-docs'])
-            def gitURL = env.ghprbAuthorRepoGitUrl ?: env.GIT_URL
-            def project = util.getProjectGroupName(util.getProject(gitURL))[1]
+            def project = util.getProjectTriggeringJob()[1]
             compile.build(projectCollection, project, "${SETTINGS_XML_ID}", "${PROPERTIES_FILE_PATH}")
         }
     }

diff --git a/.ci/fullDownstream.stages b/.ci/fullDownstream.stages
@@ -7,8 +7,7 @@ def call(def propertiesFolderPath) {
             println "Reading file ${REPOSITORY_LIST_FILE}"
             def file = readFile REPOSITORY_LIST_FILE
             def projectCollection = file.readLines()
-            def gitURL = env.ghprbAuthorRepoGitUrl ?: env.GIT_URL
-            def project = util.getProjectGroupName(util.getProject(gitURL))[1]
+            def project = util.getProjectTriggeringJob()[1]
             projectCollection.removeAll(['droolsjbpm-tools', 'kie-docs'])
             compile.build(projectCollection, project, "${SETTINGS_XML_ID}", "${PROPERTIES_FILE_PATH}")
         }

diff --git a/.ci/pullrequest.stages b/.ci/pullrequest.stages
@@ -7,8 +7,7 @@ def call(def propertiesFolderPath) {
             println "Reading file ${REPOSITORY_LIST_FILE}"
             def file = readFile REPOSITORY_LIST_FILE
             def projectCollection = file.readLines()
-            def gitURL = env.ghprbAuthorRepoGitUrl ?: env.GIT_URL
-            def project = util.getProjectGroupName(util.getProject(gitURL))[1]
+            def project = util.getProjectTriggeringJob()[1]
             if (project != "kie-docs") {
                 pullrequest.build(projectCollection, project, "${SETTINGS_XML_ID}", "${PROPERTIES_FILE_PATH}", "")
             } else {

diff --git a/.ci/upstream.stages b/.ci/upstream.stages
@@ -7,8 +7,7 @@ def call(def propertiesFolderPath) {
             def file = readFile REPOSITORY_LIST_FILE
             def projectCollection = file.readLines()
             projectCollection.removeAll(['kie-jpmml-integration'])
-            def gitURL = env.ghprbAuthorRepoGitUrl ?: env.GIT_URL
-            def project = util.getProjectGroupName(util.getProject(gitURL))[1]
+            def project = util.getProjectTriggeringJob()[1]
 
             treebuild.upstreamBuild(projectCollection, project, "${SETTINGS_XML_ID}", 'clean install -DskipTests -Dgwt.compiler.skip=true -Dgwt.skipCompilation=true -Denforcer.skip=true -Dcheckstyle.skip=true -Dspotbugs.skip=true -Drevapi.skip=true')
         }

diff --git a/.github/workflows/generate_files.yml b/.github/workflows/generate_files.yml
@@ -66,4 +66,4 @@ jobs:
       - name: Check outputs
         run: |
           echo "Pull Request Number - ${{ steps.cpr.outputs.pull-request-number }}"
-          echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}"
+          echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}"
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -70,7 +70,6 @@ pipeline {
             steps {
                 script {
                     if(isPR()) {
-                        def gitURL = env.ghprbAuthorRepoGitUrl ?: env.GIT_URL
                         def project = util.getProjectTriggeringJob()[1]
                         if(["optaplanner", "drools", "appformer", "jbpm", "drools-wb", "kie-soup", "droolsjbpm-integration", "kie-wb-common", "openshift-drools-hacep", "optaweb-employee-rostering", "optaweb-vehicle-routing"].contains(project))
                         {

diff --git a/Jenkinsfile.buildchain b/Jenkinsfile.buildchain
@@ -62,7 +62,6 @@ pipeline {
             steps {
                 script {
                     if(isPR()) {
-                        def gitURL = env.ghprbAuthorRepoGitUrl ?: env.GIT_URL
                         def project = util.getProjectTriggeringJob()[1]
                         if(["optaplanner", "drools", "appformer", "jbpm", "drools-wb", "kie-soup", "droolsjbpm-integration", "kie-wb-common", "openshift-drools-hacep", "optaweb-employee-rostering", "optaweb-vehicle-routing"].contains(project))
                         {