Skip to content

Commit bdbd011

Browse files
committed
removed validation for scmm and jenkins
1 parent fddf78c commit bdbd011

File tree

2 files changed

+1
-13
lines changed

2 files changed

+1
-13
lines changed

src/main/groovy/com/cloudogu/gitops/config/ApplicationConfigurator.groovy

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ package com.cloudogu.gitops.config
44
import com.cloudogu.gitops.utils.FileSystemUtils
55
import groovy.util.logging.Slf4j
66

7-
import static com.cloudogu.gitops.config.Config.ContentRepoType
8-
import static com.cloudogu.gitops.config.Config.ContentSchema.ContentRepositorySchema
9-
107
@Slf4j
118
class ApplicationConfigurator {
129

src/main/groovy/com/cloudogu/gitops/config/CommonFeatureConfig.groovy

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,9 @@ class CommonFeatureConfig extends Feature {
1515
* Throws RuntimeException which meaningful message, if invalid.
1616
*/
1717
void validateConfig(Config configToSet) {
18-
validateScmmAndJenkinsAreBothSet(configToSet)
1918
validateMirrorReposHelmChartFolderSet(configToSet)
2019
}
2120

22-
private void validateScmmAndJenkinsAreBothSet(Config configToSet) {
23-
if (configToSet.jenkins.active &&
24-
(configToSet.scmm.url && !configToSet.jenkins.url ||
25-
!configToSet.scmm.url && configToSet.jenkins.url)) {
26-
throw new RuntimeException('When setting jenkins URL, scmm URL must also be set and the other way round')
27-
}
28-
}
29-
3021
private void validateMirrorReposHelmChartFolderSet(Config configToSet) {
3122
if (configToSet.application.mirrorRepos && !configToSet.application.localHelmChartFolder) {
3223
// This should only happen when run outside the image, i.e. during development
@@ -40,4 +31,4 @@ class CommonFeatureConfig extends Feature {
4031
boolean isEnabled() {
4132
return false
4233
}
43-
}
34+
}

0 commit comments

Comments
 (0)