@@ -36,6 +36,7 @@ def call(Map parm = [:]) {
3636    def  buildCheck =  parm. buildCheckId
3737    def  extraPlugins =  parm. extraPlugins ?:  []
3838    def  extraModules =  parm. extraModules ?:  []
39+     def  extraGhRepos =  parm. extraGhRepos ?:  []
3940    def  gerritReviewBaseUrl =  " https://gerrit.googlesource.com/a" 
4041    def  gerritReviewHostname =  " gerrit.googlesource.com" 
4142    def  gjfVersion =  parm. gjfVersion ?:  ' 1.24.0' 
@@ -54,10 +55,11 @@ def call(Map parm = [:]) {
5455            stage(' Checkout' 
5556                steps {
5657                    checkout scm
58+                     def  scmUrl =  sh(returnStdout : true , script : ' git config remote.origin.url' . trim()
59+                     def  githubBaseUrl =  s. substring(0 , scmUrl. lastIndexOf(" /" 
5760
5861                    withCredentials([usernamePassword(usernameVariable : " GS_GIT_USER" passwordVariable : " GS_GIT_PASS" credentialsId : env. GERRIT_CREDENTIALS_ID )]) {
5962                        script {
60-                             def  scmUrl =  sh(returnStdout : true , script : ' git config remote.origin.url' . trim()
6163                            def  pluginScmHostname =  new  java.net.URI (scmUrl). getHost()
6264
6365                            sh ' echo "machine ' +  pluginScmHostname +  '  login $GS_GIT_USER password $GS_GIT_PASS">> ~/.netrc' 
@@ -72,6 +74,7 @@ def call(Map parm = [:]) {
7274                        script {
7375                            extraPlugins. each { plugin  ->  sh " git clone -b ${ GERRIT_BRANCH} ${ gerritReviewBaseUrl} ${ plugin} " 
7476                            extraModules. each { module  ->  sh " git clone -b ${ GERRIT_BRANCH} ${ gerritReviewBaseUrl} ${ module} " 
77+                             extraGhRepos. each { repo  ->  sh " git clone -b ${ GERRIT_BRANCH} ${ githubBaseUrl} ${ repo} " 
7578                        }
7679                    }
7780                }
@@ -114,7 +117,7 @@ def call(Map parm = [:]) {
114117                        sh " if [ -f ../${ pluginName} ${ pluginName} " 
115118                        sh " if [ -f ../${ pluginName} ${ pluginName} " 
116119                        script {
117-                             (extraPlugins +  extraModules). each { plugin  ->  sh " cd plugins && ln -s ../../${ plugin} " 
120+                             (extraPlugins +  extraModules  +  extraGhRepos ). each { plugin  ->  sh " cd plugins && ln -s ../../${ plugin} " 
118121                        }
119122                        sh " ${ bazeliskCmd} ${ bazeliskOptions} ${ pluginName} " 
120123                        sh " ${ bazeliskCmd} ${ bazeliskOptions} " +  ' $DOCKER_HOST' +  "  plugins/${ pluginName} " 
0 commit comments