diff --git a/VERSION b/VERSION index ab679818..2bf1ca5f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.1.6 \ No newline at end of file +1.1.7 diff --git a/templates/pipelines/common-app-ci.yaml b/templates/pipelines/common-app-ci.yaml index 42375ae0..4485c356 100644 --- a/templates/pipelines/common-app-ci.yaml +++ b/templates/pipelines/common-app-ci.yaml @@ -595,6 +595,13 @@ stages: ${{ else }}: dependsOn: WaitForFluxRelease environment: ${{ deploymentEnv.name }} + variables: + - ${{ if ne(parameters.appDeployConfig.variableGroups, '') }}: + - ${{ each varGroup in parameters.appDeployConfig.variableGroups }}: + - ${{ if contains(varGroup, deploymentEnv.name) }}: + - group: '${{ varGroup }}' + - ${{ elseif contains(varGroup, '') }}: + - group: ${{ replace(varGroup, '', deploymentEnv.name) }} strategy: runOnce: deploy: @@ -611,4 +618,4 @@ stages: envName: ${{ deploymentEnv.name }} serviceName: ${{ parameters.serviceName }} appBuildConfig: ${{ parameters.appBuildConfig }} - appTestConfig: ${{ parameters.appTestConfig }} \ No newline at end of file + appTestConfig: ${{ parameters.appTestConfig }} diff --git a/templates/steps/post-deployment-tests.yaml b/templates/steps/post-deployment-tests.yaml index 1c12c56f..48f3b3d9 100644 --- a/templates/steps/post-deployment-tests.yaml +++ b/templates/steps/post-deployment-tests.yaml @@ -32,7 +32,7 @@ steps: url: ${{ parameters.url }} appBuildConfig: ${{ parameters.appBuildConfig }} artifactNameSuffix: ${{ parameters.envName }}-$(rundatestring) - continueOnError: ${{ parameters.continueOnError }} + continueOnError: ${{ parameters.continueOnError }} - ${{ if and(contains(parameters.testEnvs.integrationTests, parameters.envName),contains(parameters.appTestConfig.postDeployTest.testsToRun,'integration')) }}: - template: /templates/steps/tests/integration-test.yaml parameters: @@ -92,4 +92,4 @@ steps: typeOfTest: 'PostDeploy' url: ${{ parameters.url }} artifactNameSuffix: ${{ parameters.envName }}-$(rundatestring) - continueOnError: ${{ parameters.continueOnError }} \ No newline at end of file + continueOnError: ${{ parameters.continueOnError }} diff --git a/templates/steps/tests/contract-test.yaml b/templates/steps/tests/contract-test.yaml index 4fab329f..2540e6e3 100644 --- a/templates/steps/tests/contract-test.yaml +++ b/templates/steps/tests/contract-test.yaml @@ -6,7 +6,7 @@ parameters: - name: testOutputDir type: string - name: typeOfTest - type: string + type: string default: 'PreDeploy' - name: url type: string @@ -19,8 +19,9 @@ parameters: default: $(build.buildid) - name: continueOnError type: boolean - default: false -steps: + default: false + +steps: - pwsh: | if(Test-Path -Path "${{ parameters.testDir }}/docker-compose.contract.test.yaml"){ Write-Output "##vso[task.setvariable variable=docker_compose_contract_test_yaml]true" @@ -75,4 +76,4 @@ steps: docker-compose -f docker-compose.yaml -f docker-compose.contract.test.yaml -p "${{ parameters.service }}-test" down displayName: DockerDown continueOnError: true - condition: eq(variables.docker_compose_contract_test_yaml, 'true') \ No newline at end of file + condition: eq(variables.docker_compose_contract_test_yaml, 'true')