- helm-with-dependencies not existing anymore

- extract hardcoded references for example-apps in unit test

Author: mdroll

examples/example-apps-via-content-loader/argocd/petclinic-helm/Jenkinsfile.ftl

@@ -20,8 +20,8 @@ String getCesBuildLibRepo() { configRepositoryPRBaseUrl+"/repo/3rd-party-depende
 String getCesBuildLibVersion() { '2.5.0' }
 String getGitOpsBuildLibRepo() { configRepositoryPRBaseUrl+"/repo/3rd-party-dependencies/gitops-build-lib" }
 String getGitOpsBuildLibVersion() { '0.8.0'}
-String getHelmChartRepository() { configRepositoryPRBaseUrl+"/repo/3rd-party-dependencies/spring-boot-helm-chart-with-dependency" }
-String getHelmChartVersion() { "1.0.0" }
+String getHelmChartRepository() { configRepositoryPRBaseUrl+"/repo/3rd-party-dependencies/spring-boot-helm-chart" }
+String getHelmChartVersion() { "0.4.0" }
 String getMainBranch() { 'main' }
 
 cesBuildLib = library(identifier: "ces-build-lib@${cesBuildLibVersion}",

src/test/groovy/com/cloudogu/gitops/features/JenkinsTest.groovy

@@ -213,20 +213,6 @@ me:x:1000:''')
 
         verify(userManager).createUser('metrics-usr', 'metrics-pw')
         verify(userManager).grantPermission('metrics-usr', UserManager.Permissions.METRICS_VIEW)
-
-        verify(jobManger).createCredential('my-prefix-example-apps', 'scmm-user',
-                'my-prefix-gitops', 'scmm-pw', 'credentials for accessing scm-manager')
-
-        verify(jobManger).startJob('my-prefix-example-apps')
-        verify(jobManger).createJob('my-prefix-example-apps', 'http://scmm/scm',
-                "my-prefix-argocd", 'scmm-user')
-
-        verify(jobManger).createCredential('my-prefix-example-apps', 'registry-user',
-                'reg-usr', 'reg-pw', 'credentials for accessing the docker-registry for writing images built on jenkins')
-        verify(jobManger, never()).createCredential(eq('my-prefix-example-apps'), eq('registry-proxy-user'),
-                anyString(), anyString(), anyString())
-        verify(jobManger, never()).createCredential(eq('my-prefix-example-apps'), eq('registry-proxy-user'),
-                anyString(), anyString(), anyString())
     }
 
     @Test
@@ -279,36 +265,6 @@ me:x:1000:''')
         createJenkins().install()
         assertThat(config.jenkins.url).endsWith('192.168.16.2:42')
     }
-    
-    @Test
-    void 'Handles two registries'() {
-        config.registry.twoRegistries = true
-        config.content.examples = true
-        config.application.namePrefix = 'my-prefix-'
-        config.application.namePrefixForEnvVars = 'MY_PREFIX_'
-        
-        config.registry.url = 'reg-url'
-        config.registry.path = 'reg-path'
-        config.registry.username = 'reg-usr'
-        config.registry.password = 'reg-pw'
-        config.registry.proxyUrl = 'reg-proxy-url'
-        config.registry.proxyUsername = 'reg-proxy-usr'
-        config.registry.proxyPassword = 'reg-proxy-pw'
-
-        createJenkins().install()
-
-        verify(globalPropertyManager).setGlobalProperty('MY_PREFIX_REGISTRY_PROXY_URL', 'reg-proxy-url')
-
-        verify(globalPropertyManager).setGlobalProperty(eq('MY_PREFIX_REGISTRY_URL'), anyString())
-        verify(globalPropertyManager).setGlobalProperty(eq('MY_PREFIX_REGISTRY_PATH'), anyString())
-
-        verify(jobManger).createCredential('my-prefix-example-apps', 'registry-user',
-                'reg-usr', 'reg-pw',
-                'credentials for accessing the docker-registry for writing images built on jenkins')
-        verify(jobManger).createCredential('my-prefix-example-apps', 'registry-proxy-user',
-                'reg-proxy-usr', 'reg-proxy-pw',
-                'credentials for accessing the docker-registry that contains 3rd party or base images')
-    }
 
     @Test
     void 'Does not create create job credentials when argo cd is deactivated'() {