Skip to content

Commit e6c6bda

Browse files
committed
ScmManager Setup
1 parent 77c1e8c commit e6c6bda

File tree

4 files changed

+7
-4
lines changed

4 files changed

+7
-4
lines changed

src/main/groovy/com/cloudogu/gitops/git/providers/scmmanager/ScmManager.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class ScmManager implements GitProvider {
3838
}
3939

4040
void init() {
41-
//Setup for ScmManager
41+
// --- Init Setup ---
4242
if (this.scmmConfig.internal) {
4343
this.scmManagerSetup = new ScmManagerSetup(this)
4444
this.scmManagerSetup.setupHelm()

src/main/groovy/com/cloudogu/gitops/git/providers/scmmanager/ScmManagerSetup.groovy

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class ScmManagerSetup {
4343
}
4444

4545
void configure() {
46-
installScmmPlugins()
46+
installScmmPlugins(this.scmManager.config.scm.scmManager.skipPlugins)
4747
setSetupConfigs()
4848
configureJenkinsPlugin()
4949
addDefaultUsers()
@@ -78,6 +78,10 @@ class ScmManagerSetup {
7878

7979
def installScmmPlugins(Boolean restart = true) {
8080

81+
if(this.scmManager.config.scm.scmManager.skipPlugins) {
82+
return
83+
}
84+
8185
if (System.getenv('SKIP_PLUGINS')?.toLowerCase() == 'true') {
8286
log.info("Skipping SCM plugin installation due to SKIP_PLUGINS=true")
8387
return

src/main/groovy/com/cloudogu/gitops/git/providers/scmmanager/api/PluginApi.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ interface PluginApi {
1414

1515
@PUT("v2/config/jenkins/")
1616
@Headers("Content-Type: application/json")
17-
Call<Void> configureJenkinsPlugin(@Body Map<String, String> config)
17+
Call<Void> configureJenkinsPlugin(@Body Map<String, Object> config)
1818
}

src/test/groovy/com/cloudogu/gitops/git/providers/scmmanager/ScmManagerSetupTest.groovy

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ class ScmManagerSetupTest {
8585
ScmManagerSetup scmManagerSetup = new ScmManagerSetup(scmManager)
8686
scmManagerSetup.installScmmPlugins()
8787
verify(pluginApi,atLeast(10)).install(any(),any())
88-
8988
}
9089

9190
}

0 commit comments

Comments
 (0)