Skip to content

Commit 644e1ac

Browse files
marekzanmarekzan
committed
bugfixes
Signed-off-by: Marek Markiewka <marek.markiewka@cloudogu.com>
1 parent 3720c26 commit 644e1ac

5 files changed

Lines changed: 13 additions & 16 deletions

File tree

‎src/com/cloudogu/gitopsbuildlib/deployment/plain/Plain.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class Plain extends Deployment{
1919

2020
private updateImage(String stage) {
2121
gitopsConfig.deployments.plain.updateImages.each {
22-
def deploymentFilePath = "${stage}/${gitopsConfig.application}/${gitopsConfig.deployments.sourcePath}/${it['filename']}"
22+
def deploymentFilePath = "${stage}/${gitopsConfig.application}/${it['filename']}"
2323
def data = script.readYaml file: deploymentFilePath
2424
def containers = data.spec.template.spec.containers
2525
def containerName = it['containerName']

‎test/com/cloudogu/gitopsbuildlib/deployment/DeploymentTest.groovy‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@ class DeploymentTest {
5656
@Test
5757
void 'creating folders for plain deployment'() {
5858
deploymentUnderTest.createFoldersAndCopyK8sResources('staging',)
59-
assertThat(scriptMock.actualEchoArgs[0]).isEqualTo('Copying k8s payload from application repo to gitOps Repo: \'k8s/staging/*\' to \'staging/app/extraResources/\'')
60-
assertThat(scriptMock.actualShArgs[0]).isEqualTo('mkdir -p staging/app/extraResources/')
59+
assertThat(scriptMock.actualEchoArgs[0]).isEqualTo('Copying k8s payload from application repo to gitOps Repo: \'k8s/staging/*\' to \'staging/app/\'')
60+
assertThat(scriptMock.actualShArgs[0]).isEqualTo('mkdir -p staging/app/')
6161
assertThat(scriptMock.actualShArgs[1]).isEqualTo('mkdir -p .config/')
62-
assertThat(scriptMock.actualShArgs[2]).isEqualTo('cp -r workspace/k8s/staging/* staging/app/extraResources/ || true')
62+
assertThat(scriptMock.actualShArgs[2]).isEqualTo('cp -r workspace/k8s/staging/* staging/app/ || true')
6363
assertThat(scriptMock.actualShArgs[3]).isEqualTo('cp workspace/*.yamllint.yaml .config/ || true')
6464
}
6565

‎test/com/cloudogu/gitopsbuildlib/deployment/HelmTest.groovy‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -105,14 +105,13 @@ spec:
105105
assertThat(dockerMock.actualImages[0]).contains('ghcr.io/cloudogu/helm:')
106106
assertThat(scriptMock.actualShArgs[0]).isEqualTo('helm repo add chartRepo repoUrl')
107107
assertThat(scriptMock.actualShArgs[1]).isEqualTo('helm repo update')
108-
assertThat(scriptMock.actualShArgs[2]).isEqualTo('helm pull chartRepo/chartName --version=1.0 --untar --untardir=workspace/chart')
109-
assertThat(scriptMock.actualShArgs[3]).isEqualTo('[returnStdout:true, script:helm values workspace/chart/chartName -f workspace/k8s/values-staging.yaml -f workspace/k8s/values-shared.yaml ]')
108+
assertThat(scriptMock.actualShArgs[2]).isEqualTo('helm pull chartRepo/chartName --version=1.0 --untar --untardir=chart')
109+
assertThat(scriptMock.actualShArgs[3]).isEqualTo('[returnStdout:true, script:helm values chart/chartName -f workspace/k8s/values-staging.yaml -f workspace/k8s/values-shared.yaml ]')
110110
assertThat(scriptMock.actualShArgs[4]).isEqualTo('rm staging/testapp/mergedValues.yaml')
111-
assertThat(scriptMock.actualShArgs[5]).isEqualTo('rm -rf workspace/chart || true')
112111
assertThat(scriptMock.actualWriteFileArgs[0]).isEqualTo('[file:staging/testapp/mergedValues.yaml, ' +
113112
'text:[helm repo add chartRepo repoUrl, helm repo update, ' +
114-
'helm pull chartRepo/chartName --version=1.0 --untar --untardir=workspace/chart, ' +
115-
'[returnStdout:true, script:helm values workspace/chart/chartName -f workspace/k8s/values-staging.yaml -f workspace/k8s/values-shared.yaml ]]]')
113+
'helm pull chartRepo/chartName --version=1.0 --untar --untardir=chart, ' +
114+
'[returnStdout:true, script:helm values chart/chartName -f workspace/k8s/values-staging.yaml -f workspace/k8s/values-shared.yaml ]]]')
116115
assertThat(scriptMock.actualWriteFileArgs[1]).isEqualTo('''[file:staging/testapp/applicationRelease.yaml, text:apiVersion: helm.fluxcd.io/v1
117116
kind: HelmRelease
118117
metadata:

‎test/com/cloudogu/gitopsbuildlib/deployment/helm/helmrelease/ArgoCDReleaseTest.groovy‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class ArgoCDReleaseTest {
2323
'namespace',
2424
'this/is/a/valuesfile')
2525

26-
assertThat(scriptMock.actualShArgs[0]).isEqualTo('[returnStdout:true, script:helm template app chart/path -f this/is/a/valusfile]')
26+
assertThat(scriptMock.actualShArgs[0]).isEqualTo('[returnStdout:true, script:helm template app chart/path -f this/is/a/valuesfile]')
2727
}
2828

2929
@Test
@@ -38,7 +38,7 @@ class ArgoCDReleaseTest {
3838
'namespace',
3939
'this/is/a/valuesfile')
4040

41-
assertThat(scriptMock.actualShArgs[0]).isEqualTo('[returnStdout:true, script:helm template app chart/ -f this/is/a/valusfile]')
41+
assertThat(scriptMock.actualShArgs[0]).isEqualTo('[returnStdout:true, script:helm template app chart/ -f this/is/a/valuesfile]')
4242
}
4343

4444
@Test
@@ -53,8 +53,6 @@ class ArgoCDReleaseTest {
5353
'namespace',
5454
'this/is/a/valuesfile')
5555

56-
assertThat(scriptMock.actualShArgs[0]).isEqualTo('helm dep update .')
57-
assertThat(scriptMock.actualShArgs[1]).isEqualTo('[returnStdout:true, script:helm template app . -f workspace/.configRepoTempDir/this/is/a/valuesfile]')
58-
assertThat(scriptMock.actualDir[0]).isEqualTo('workspace/chart/chartName')
56+
assertThat(scriptMock.actualShArgs[0]).isEqualTo('[returnStdout:true, script:helm template app chart/chartName -f this/is/a/valuesfile]')
5957
}
6058
}

‎test/com/cloudogu/gitopsbuildlib/deployment/helm/repotype/HelmRepoTest.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class HelmRepoTest {
2222

2323
assertThat(scriptMock.actualShArgs[0]).isEqualTo('helm repo add chartRepo url')
2424
assertThat(scriptMock.actualShArgs[1]).isEqualTo('helm repo update')
25-
assertThat(scriptMock.actualShArgs[2]).isEqualTo('helm pull chartRepo/chartName --version=1.0 --untar --untardir=workspace/chart')
26-
assertThat(scriptMock.actualShArgs[3]).isEqualTo('[returnStdout:true, script:helm values workspace/chart/chartName -f file1 -f file2 ]')
25+
assertThat(scriptMock.actualShArgs[2]).isEqualTo('helm pull chartRepo/chartName --version=1.0 --untar --untardir=chart')
26+
assertThat(scriptMock.actualShArgs[3]).isEqualTo('[returnStdout:true, script:helm values chart/chartName -f file1 -f file2 ]')
2727
}
2828
}

0 commit comments

Comments
 (0)