From 51a194a8120ff59079f87691db5c003d8c9ab699 Mon Sep 17 00:00:00 2001 From: "Kwiatosz, Krzysztof" Date: Mon, 9 Sep 2024 12:51:37 +0200 Subject: [PATCH] adjust example folder --- .github/workflows/{pull-e2e-test.yml => push-e2e-test.yml} | 6 +++--- variables.tf | 7 ------- 2 files changed, 3 insertions(+), 10 deletions(-) rename .github/workflows/{pull-e2e-test.yml => push-e2e-test.yml} (79%) diff --git a/.github/workflows/pull-e2e-test.yml b/.github/workflows/push-e2e-test.yml similarity index 79% rename from .github/workflows/pull-e2e-test.yml rename to .github/workflows/push-e2e-test.yml index 987dcbd..c6e9757 100644 --- a/.github/workflows/pull-e2e-test.yml +++ b/.github/workflows/push-e2e-test.yml @@ -12,14 +12,14 @@ jobs: id: vars run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT - name: Create kyma runtime on btp - working-directory: examples/kyma-on-btp-basic + working-directory: examples/kyma-on-btp-new-sa run: | terraform init terraform apply -auto-approve terraform destroy -auto-approve env: - TF_VAR_BTP_SUBACCOUNT: tf-kyma-module-test-${{ steps.vars.outputs.sha_short }}-${{ github.run_attempt }} - TF_VAR_BTP_SA_REGION: ${{ secrets.sa_region }} + TF_VAR_BTP_NEW_SUBACCOUNT_NAME: tf-kyma-module-test-${{ steps.vars.outputs.sha_short }}-${{ github.run_attempt }} + TF_VAR_BTP_NEW_SUBACCOUNT_REGION: ${{ secrets.sa_region }} TF_VAR_BTP_GLOBAL_ACCOUNT: ${{ secrets.global_account }} TF_VAR_BTP_BOT_USER: ${{ secrets.username }} TF_VAR_BTP_BOT_PASSWORD: ${{ secrets.password }} diff --git a/variables.tf b/variables.tf index ff5104f..e3dd9de 100644 --- a/variables.tf +++ b/variables.tf @@ -7,13 +7,6 @@ variable "BTP_KYMA_PLAN" { default = "gcp" } -#Deprecated -# variable "BTP_SUBACCOUNT" { -# type = string -# description = "Subaccount name" -# default = null -# } - variable "BTP_USE_SUBACCOUNT_ID" { type = string description = "Subaccount name"