diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 21205677b6..202f594f4f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -349,12 +349,14 @@ jobs: steps: - name: Set matrix environments (Push to master) # if: github.event_name == 'push' && github.ref == 'refs/heads/master' + if: github.event_name == 'push' run: | echo "MATRIX_ENVIRONMENTS={\"environment\":[\"Development\" , \"Staging\",\"Production\"]}" >> $GITHUB_ENV echo "MATRIX_AKS_ENVIRONMENTS={\"environment\":[\"development\"]}" >> $GITHUB_ENV - name: Set matrix environments ( Review) # if: github.event_name == 'pull_request' && github.ref != 'refs/heads/master' + if: github.event_name == 'pull_request' run: | echo "MATRIX_ENVIRONMENTS={\"environment\":[\"Review\"]}" >> $GITHUB_ENV echo "MATRIX_AKS_ENVIRONMENTS={\"environment\":[\"review\"]}" >> $GITHUB_ENV @@ -631,7 +633,7 @@ jobs: owasp: name: 'OWASP Test' runs-on: ubuntu-latest - needs: [ deployments_aks ] + needs: [ deployments ] if: github.event_name == 'push' && github.ref == 'refs/heads/master' steps: - name: Checkout diff --git a/terraform/aks/config/review.tfvars.json b/terraform/aks/config/review.tfvars.json index 1410f1e245..7c9a74cbc6 100644 --- a/terraform/aks/config/review.tfvars.json +++ b/terraform/aks/config/review.tfvars.json @@ -5,9 +5,9 @@ "enable_monitoring": false, "deploy_redis": false, "deploy_postgres": false, - "key_vault_name": "s189t01-gse-dv-app-kv", + "key_vault_name": "s189t01-gse-rv-app-kv", "infra_key_vault_name": "s189t01-gse-rv-inf-kv", - "key_vault_resource_group": "s189t01-gse-dv-rg", + "key_vault_resource_group": "s189t01-gse-rv-rg", "review_db_dbname": "review-db-name", "review_db_hostname": "review-db-host", "review_db_username": "review-db-username",