diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index 7b11802d..de1a8957 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -22,7 +22,6 @@ env: VENOM_VAR_directory: /home/runner/testout/azure VENOM_VAR_gitRepo: git@github.com:pluralsh/plural-cli-e2e.git VENOM_VAR_gitRepoPrivateKeyPath: /home/runner/.ssh/id_rsa -# E2E_GCP_SA_KEY_FILE: /home/runner/google_sa.json jobs: plural-up-gcp: name: plural up / GCP @@ -44,8 +43,6 @@ jobs: chmod 600 ${{ env.VENOM_VAR_gitRepoPrivateKeyPath }} eval "$(ssh-agent -s)" ssh-add ${{ env.VENOM_VAR_gitRepoPrivateKeyPath }} -# - name: Decode and save Google service account to a file/env var -# run: (base64 -d <<< ${{ secrets.E2E_GCP_SA_KEY }}) > ${{ env.E2E_GCP_SA_KEY_FILE }} - name: GCloud Auth uses: google-github-actions/auth@v2 with: @@ -79,8 +76,6 @@ jobs: env: VENOM_VAR_provider: gcp VENOM_VAR_region: us-central1 - VENOM_VAR_gcpEmail: ${{ secrets.E2E_GCP_EMAIL }} - # VENOM_VAR_gcpSAKeyFile: ${{ secrets.E2E_GCP_SA_KEY_FILE }} VENOM_VAR_gcpOrgID: ${{ secrets.E2E_GCP_ORG_ID }} VENOM_VAR_gcpBillingID: ${{ secrets.E2E_GCP_BILLING_ID }} VENOM_VAR_project: e2e-${{ env.TIMESTAMP }} @@ -88,6 +83,8 @@ jobs: VENOM_VAR_username: ${{ secrets.E2E_GCP_SA_USERNAME }} VENOM_VAR_email: ${{ secrets.E2E_GCP_SA_EMAIL }} VENOM_VAR_token: ${{ secrets.E2E_GCP_SA_TOKEN }} + TF_VAR_network: plural-e2e-network-${{ env.TIMESTAMP }} + TF_VAR_subnetwork: plural-e2e-subnet-${{ env.TIMESTAMP }} run: venom run -vv --html-report --format=json --output-dir ${{ env.TESTOUT_PATH }} test/plural # - name: Post a slack message on finish # uses: slackapi/slack-github-action@v2.0.0 diff --git a/Makefile b/Makefile index 5ca1eaab..19c22384 100644 --- a/Makefile +++ b/Makefile @@ -209,7 +209,6 @@ e2e: --ensure-venom VENOM_VAR_azureSubscriptionId=${PLRL_CLI_E2E_AZURE_SUBSCRIPTION_ID} \ VENOM_VAR_azureTenantId=${PLRL_CLI_E2E_AZURE_TENANT_ID} \ VENOM_VAR_azureStorageAccount=${PLRL_CLI_E2E_AZURE_STORAGE_ACCOUNT}${TIMESTAMP} \ - VENOM_VAR_gcpEmail=${PLRL_CLI_E2E_GCLOUD_EMAIL} \ VENOM_VAR_gcpOrgID=${PLRL_CLI_E2E_GCLOUD_ORG_ID} \ VENOM_VAR_gcpBillingID=${PLRL_CLI_E2E_GCLOUD_BILLING_ID} \ PLURAL_LOGIN_AFFIRM_CURRENT_USER=true \