IND-1931 Reverting workflow changes.

hashicorp · Jan 22, 2025 · bd88471 · bd88471
1 parent 901073e
commit bd88471
Showing 1 changed file with 78 additions and 78 deletions.
diff --git a/.github/workflows/acceptance.yml b/.github/workflows/acceptance.yml
@@ -63,110 +63,110 @@ jobs:
           path: ${{ env.TEST_RESULTS }}
           name: tests-linux
 
-  # alicloud-provider:
-  #   # don't run on fork PRs
-  #   if: github.repository_owner == 'hashicorp'
-  #   runs-on: ubuntu-latest
-  #   needs:
-  #     - go-test
-  #   env:
-  #     ALICLOUD_ACCESS_KEY: ${{ secrets.ALICLOUD_ACCESS_KEY }}
-  #     ALICLOUD_SECRET_KEY: ${{ secrets.ALICLOUD_SECRET_KEY }}
-  #     # XXX
-  #     # ALICLOUD_REGION: xxx
-  #   steps:
-  #     - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
-  #     - uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
-  #       with:
-  #         go-version: 'stable'
-  #     - uses: autero1/action-gotestsum@7263b9d73912eec65f46337689e59fac865c425f # v2.0.0
-  #       with:
-  #         gotestsum_version: 1.9.0
-
-  #     - uses: './.github/actions/acctest'
-  #       with:
-  #         provider-test-infra-dir: aliyun
-  #         provider-go-test-dir: aliyun
-
-  aws-provider:
+  alicloud-provider:
     # don't run on fork PRs
     if: github.repository_owner == 'hashicorp'
     runs-on: ubuntu-latest
     needs:
       - go-test
     env:
-      AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-      AWS_REGION: ${{ vars.AWS_REGION }}
-      AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+      ALICLOUD_ACCESS_KEY: ${{ secrets.ALICLOUD_ACCESS_KEY }}
+      ALICLOUD_SECRET_KEY: ${{ secrets.ALICLOUD_SECRET_KEY }}
+      # XXX
+      # ALICLOUD_REGION: xxx
     steps:
-      - uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
-      - uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9 # v4.0.0
+      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+      - uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
         with:
           go-version: 'stable'
-      - uses: autero1/action-gotestsum@2e48af62f5248bd3b014f598cd1aa69a01dd36e3 # v1.0.0
+      - uses: autero1/action-gotestsum@7263b9d73912eec65f46337689e59fac865c425f # v2.0.0
         with:
           gotestsum_version: 1.9.0
 
-      - uses: "./.github/actions/acctest"
+      - uses: './.github/actions/acctest'
         with:
-          provider-test-infra-dir: aws
-          provider-go-test-dir: aws
-          aws-region: ${{ vars.AWS_REGION }}
-          aws-role-arn: ${{ secrets.SERVICE_GO_DISCOVER_TESTS_ROLE_ARN }}
+          provider-test-infra-dir: aliyun
+          provider-go-test-dir: aliyun
 
-  # azure-vmss-provider:
+  # aws-provider:
   #   # don't run on fork PRs
   #   if: github.repository_owner == 'hashicorp'
   #   runs-on: ubuntu-latest
   #   needs:
   #     - go-test
   #   env:
-  #     ARM_CLIENT_ID: ${{ secrets.ARM_CLIENT_ID }}
-  #     ARM_CLIENT_SECRET: ${{ secrets.ARM_CLIENT_SECRET }}
-  #     ARM_ENVIRONMENT: ${{ vars.ARM_ENVIRONMENT }}
-  #     ARM_SUBSCRIPTION_ID: ${{ secrets.ARM_SUBSCRIPTION_ID }}
-  #     ARM_TENANT_ID: ${{ secrets.ARM_TENANT_ID }}
+  #     AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+  #     AWS_REGION: ${{ vars.AWS_REGION }}
+  #     AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
   #   steps:
-  #     - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
-  #     - uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
+  #     - uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
+  #     - uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9 # v4.0.0
   #       with:
   #         go-version: 'stable'
-  #     - uses: autero1/action-gotestsum@7263b9d73912eec65f46337689e59fac865c425f # v2.0.0
+  #     - uses: autero1/action-gotestsum@2e48af62f5248bd3b014f598cd1aa69a01dd36e3 # v1.0.0
   #       with:
   #         gotestsum_version: 1.9.0
 
   #     - uses: "./.github/actions/acctest"
   #       with:
-  #         provider-test-infra-dir: azure-vmss
-  #         provider-go-test-dir: azure
-  #         provider-go-test-tags: TestVmScaleSetAddrs
+  #         provider-test-infra-dir: aws
+  #         provider-go-test-dir: aws
+  #         aws-region: ${{ vars.AWS_REGION }}
+  #         aws-role-arn: ${{ secrets.SERVICE_GO_DISCOVER_TESTS_ROLE_ARN }}
 
-  # azurerm-provider:
-  #   # don't run on fork PRs
-  #   if: github.repository_owner == 'hashicorp'
-  #   runs-on: ubuntu-latest
-  #   needs:
-  #     - go-test
-  #   env:
-  #     ARM_CLIENT_ID: ${{ secrets.ARM_CLIENT_ID }}
-  #     ARM_CLIENT_SECRET: ${{ secrets.ARM_CLIENT_SECRET }}
-  #     ARM_ENVIRONMENT: ${{ vars.ARM_ENVIRONMENT }}
-  #     ARM_SUBSCRIPTION_ID: ${{ secrets.ARM_SUBSCRIPTION_ID }}
-  #     ARM_TENANT_ID: ${{ secrets.ARM_TENANT_ID }}
-  #   steps:
-  #     - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
-  #     - uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
-  #       with:
-  #         go-version: 'stable'
-  #     - uses: autero1/action-gotestsum@7263b9d73912eec65f46337689e59fac865c425f # v2.0.0
-  #       with:
-  #         gotestsum_version: 1.9.0
+  azure-vmss-provider:
+    # don't run on fork PRs
+    if: github.repository_owner == 'hashicorp'
+    runs-on: ubuntu-latest
+    needs:
+      - go-test
+    env:
+      ARM_CLIENT_ID: ${{ secrets.ARM_CLIENT_ID }}
+      ARM_CLIENT_SECRET: ${{ secrets.ARM_CLIENT_SECRET }}
+      ARM_ENVIRONMENT: ${{ vars.ARM_ENVIRONMENT }}
+      ARM_SUBSCRIPTION_ID: ${{ secrets.ARM_SUBSCRIPTION_ID }}
+      ARM_TENANT_ID: ${{ secrets.ARM_TENANT_ID }}
+    steps:
+      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+      - uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
+        with:
+          go-version: 'stable'
+      - uses: autero1/action-gotestsum@7263b9d73912eec65f46337689e59fac865c425f # v2.0.0
+        with:
+          gotestsum_version: 1.9.0
 
-  #     - uses: "./.github/actions/acctest"
-  #       with:
-  #         provider-test-infra-dir: azurerm
-  #         provider-go-test-dir: azure
-  #         provider-go-test-tags: TestTagAddrs
+      - uses: "./.github/actions/acctest"
+        with:
+          provider-test-infra-dir: azure-vmss
+          provider-go-test-dir: azure
+          provider-go-test-tags: TestVmScaleSetAddrs
+
+  azurerm-provider:
+    # don't run on fork PRs
+    if: github.repository_owner == 'hashicorp'
+    runs-on: ubuntu-latest
+    needs:
+      - go-test
+    env:
+      ARM_CLIENT_ID: ${{ secrets.ARM_CLIENT_ID }}
+      ARM_CLIENT_SECRET: ${{ secrets.ARM_CLIENT_SECRET }}
+      ARM_ENVIRONMENT: ${{ vars.ARM_ENVIRONMENT }}
+      ARM_SUBSCRIPTION_ID: ${{ secrets.ARM_SUBSCRIPTION_ID }}
+      ARM_TENANT_ID: ${{ secrets.ARM_TENANT_ID }}
+    steps:
+      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+      - uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
+        with:
+          go-version: 'stable'
+      - uses: autero1/action-gotestsum@7263b9d73912eec65f46337689e59fac865c425f # v2.0.0
+        with:
+          gotestsum_version: 1.9.0
+
+      - uses: "./.github/actions/acctest"
+        with:
+          provider-test-infra-dir: azurerm
+          provider-go-test-dir: azure
+          provider-go-test-tags: TestTagAddrs
 
   # digitalocean-provider:
   #   # don't run on fork PRs
@@ -322,10 +322,10 @@ jobs:
     needs:
     - lint
     - go-test
-    # - alicloud-provider
-    - aws-provider
-    # - azure-vmss-provider
-    # - azurerm-provider
+    - alicloud-provider
+    # - aws-provider
+    - azure-vmss-provider
+    - azurerm-provider
     # - digitalocean-provider
     # - gce-provider
     # - k8s-provider