Action var tests off (nebari-dev#2632)

MetroStar · Aug 26, 2024 · fb3cb04 · fb3cb04
1 parent 47780cb
commit fb3cb04
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 91 deletions.
diff --git a/.github/workflows/test_aws_integration.yaml b/.github/workflows/test_aws_integration.yaml
@@ -33,31 +33,11 @@ env:
   NEBARI_GH_BRANCH: ${{ github.event.inputs.branch || 'develop' }}
   NEBARI_IMAGE_TAG: ${{ github.event.inputs.image-tag || 'main' }}
   TF_LOG: ${{ github.event.inputs.tf-log-level || 'info' }}∏
-  NO_PROVIDER_CREDENTIALS_aws: false
 
 jobs:
-  # Used to skip cloud provider checks due to "jobs" not supporting {{ env }} variables contexts.
-  check-for-credentials_aws:
-    runs-on: ubuntu-latest
-    permissions:
-      id-token: write
-      contents: read
-    outputs:
-      provider_credentials_aws: ${{ steps.flag-check.outputs.provider_credentials_aws }}
-    steps:
-      - name: Check if user wants to run AWS integration based on credentials
-        id: flag-check
-        run: |
-          if [ "${{ env.NO_PROVIDER_CREDENTIALS_aws }}" == "true" ]; then
-            echo "::set-output name=provider_credentials_aws::0"
-          else
-            echo "::set-output name=provider_credentials_aws::1"
-          fi
-
   test-aws-integration:
     runs-on: ubuntu-latest
-    needs: check-for-credentials_aws
-    if: ${{ needs.check-for-credentials.outputs.provider_credentials_aws == '1' }}
+    if: ${{ vars.SKIP_AWS_INTEGRATION_TEST != 'true' }}
     permissions:
       id-token: write
       contents: read

diff --git a/.github/workflows/test_azure_integration.yaml b/.github/workflows/test_azure_integration.yaml
@@ -31,34 +31,11 @@ env:
   NEBARI_GH_BRANCH: ${{ github.event.inputs.branch || 'develop' }}
   NEBARI_IMAGE_TAG: ${{ github.event.inputs.image-tag || 'main' }}
   TF_LOG: ${{ github.event.inputs.tf-log-level || 'info' }}
-  NO_PROVIDER_CREDENTIALS_azure: false
 
 jobs:
-  # Used to skip cloud provider checks due to "jobs" not supporting {{ env }} variables contexts
-  check-for-credentials:
-    runs-on: ubuntu-latest
-    permissions:
-      id-token: write
-      contents: read
-
-    outputs:
-      provider_credentials_azure: ${{ steps.flag-check.outputs.provider_credentials_azure }}
-
-    steps:
-
-      - name: Check if user wants to run Azure integration based on credentials
-        id: flag-check
-        run: |
-          if [ "${{ env.NO_PROVIDER_CREDENTIALS_azure }}" == "true" ]; then
-            echo "::set-output name=provider_credentials_azure::0"
-          else
-            echo "::set-output name=provider_credentials_azure::1"
-          fi
-
   test-azure-integration:
     runs-on: ubuntu-latest
-    needs: check-for-credentials
-    if: ${{ needs.check-for-credentials.outputs.provider_credentials_azure == '1' }}
+    if: ${{ vars.SKIP_AZURE_INTEGRATION_TEST != 'true' }}
     permissions:
       id-token: write
       contents: read
@@ -110,6 +87,3 @@ jobs:
           NEBARI_SECRET__default_images__dask_worker: "quay.io/nebari/nebari-dask-worker:${{ env.NEBARI_IMAGE_TAG }}"
           ARM_CLIENT_ID: ${{ env.ARM_CLIENT_ID }}
           ARM_TENANT_ID: ${{ env.ARM_TENANT_ID }}
-          ARM_SUBSCRIPTION_ID: ${{ env.ARM_SUBSCRIPTION_ID }}
-          ARM_USE_OIDC: "true"
-          CLOUDFLARE_TOKEN: ${{ env.CLOUDFLARE_TOKEN }}
diff --git a/.github/workflows/test_do_integration.yaml b/.github/workflows/test_do_integration.yaml
@@ -31,33 +31,12 @@ env:
   NEBARI_GH_BRANCH: ${{ github.event.inputs.branch || 'develop' }}
   NEBARI_IMAGE_TAG: ${{ github.event.inputs.image-tag || 'main' }}
   TF_LOG: ${{ github.event.inputs.tf-log-level || 'info' }}
-  NO_PROVIDER_CREDENTIALS_do: false
 
 
 jobs:
-  # Used to skip cloud provider checks due to "jobs" not supporting {{ env }} variables contexts
-  check-for-credentials:
-    runs-on: ubuntu-latest
-    permissions:
-      id-token: write
-      contents: read
-    outputs:
-      provider_credentials_do: ${{ steps.flag-check.outputs.provider_credentials_do }}
-    steps:
-      - name: Check if user wants to run Digital Ocean integration based on credentials
-        id: flag-check
-        run: |
-          if [ "${{ env.NO_PROVIDER_CREDENTIALS_do }}" == "true" ]; then
-            echo "::set-output name=provider_credentials_do::0"
-          else
-            echo "::set-output name=provider_credentials_do::1"
-          fi
-
-
   test-do-integration:
     runs-on: ubuntu-latest
-    needs: check-for-credentials
-    if: ${{ needs.check-for-credentials.outputs.provider_credentials_do == '1' }}
+    if: ${{ vars.SKIP_DO_INTEGRATION_TEST != 'true' }}
     permissions:
       id-token: write
       contents: read

diff --git a/.github/workflows/test_gcp_integration.yaml b/.github/workflows/test_gcp_integration.yaml
@@ -31,31 +31,11 @@ env:
   NEBARI_GH_BRANCH: ${{ github.event.inputs.branch || 'develop' }}
   NEBARI_IMAGE_TAG: ${{ github.event.inputs.image-tag || 'main' }}
   TF_LOG: ${{ github.event.inputs.tf-log-level || 'info' }}
-  NO_PROVIDER_CREDENTIALS_gcp: false
 
 jobs:
-  # Used to skip cloud provider checks due to "jobs" not supporting {{ env }} variables contexts
-  check-for-credentials:
-    runs-on: ubuntu-latest
-    permissions:
-      id-token: write
-      contents: read
-    outputs:
-      provider_credentials_gcp: ${{ steps.flag-check.outputs.provider_credentials_gcp }}
-    steps:
-      - name: Check if user wants to run GCP integration based on credentials
-        id: flag-check
-        run: |
-          if [ "${{ env.NO_PROVIDER_CREDENTIALS_gcp }}" == "true" ]; then
-            echo "::set-output name=provider_credentials_gcp::0"
-          else
-            echo "::set-output name=provider_credentials_gcp::1"
-          fi
-
   test-gcp-integration:
     runs-on: ubuntu-latest
-    needs: check-for-credentials
-    if: ${{ needs.check-for-credentials.outputs.provider_credentials_gcp == '1' }}
+    if: ${{ vars.SKIP_GCP_INTEGRATION_TEST != 'true' }}
     permissions:
       id-token: write
       contents: read