Fix/cloudplatform#380 (#280)

* Workaround/fix for dfds/cloudplatform#380 and hashicorp/terraform-provider-aws#20404 * Re-enable QA destroy steps Co-authored-by: abstrask <[email protected]> Co-authored-by: Rasmus Rask <[email protected]>
dfds · Aug 12, 2021 · c3a770f · c3a770f
1 parent 2411f93
commit c3a770f
Showing 1 changed file with 28 additions and 28 deletions.
diff --git a/azure-pipelines.yaml b/azure-pipelines.yaml
@@ -84,33 +84,33 @@ stages:
           - bash: ./src/qa-test-eks.sh apply-shared _global/s3-bucket-velero
             displayName: "Provision Velero S3 bucket"
 
-      # - job: destroy_eks_1_20
-      #   displayName: Destroy EKS 1.20
-      #   container: prime
-      #   dependsOn:
-      #     - init_shared_velero
-      #   condition: ne(variables['NO_DESTROY'], 'true')
-      #   steps:
-      #     - bash: ./src/qa-test-eks.sh destroy-cluster eu-west-1 qa20
-      #       displayName: "Terraform Destroy (post)"
+      - job: destroy_eks_1_20
+        displayName: Destroy EKS 1.20
+        container: prime
+        dependsOn:
+          - init_shared_velero
+        condition: ne(variables['NO_DESTROY'], 'true')
+        steps:
+          - bash: ./src/qa-test-eks.sh destroy-cluster eu-west-1 qa20
+            displayName: "Terraform Destroy (post)"
 
-      # - job: destroy_eks_1_21
-      #   displayName: Destroy EKS 1.21
-      #   container: prime
-      #   dependsOn:
-      #     - init_shared_velero
-      #   condition: ne(variables['NO_DESTROY'], 'true')
-      #   steps:
-      #     - bash: ./src/qa-test-eks.sh destroy-cluster eu-west-1 qa21
-      #       displayName: "Terraform Destroy (post)"
+      - job: destroy_eks_1_21
+        displayName: Destroy EKS 1.21
+        container: prime
+        dependsOn:
+          - init_shared_velero
+        condition: ne(variables['NO_DESTROY'], 'true')
+        steps:
+          - bash: ./src/qa-test-eks.sh destroy-cluster eu-west-1 qa21
+            displayName: "Terraform Destroy (post)"
 
-      # - job: destroy_shared
-      #   displayName: Destroy EKS shared resources
-      #   container: prime
-      #   dependsOn:
-      #     - destroy_eks_1_20
-      #     - destroy_eks_1_21
-      #   condition: ne(variables['NO_DESTROY'], 'true')
-      #   steps:
-      #     - bash: ./src/qa-test-eks.sh destroy-shared eu-west-1 _global
-      #       displayName: "Destroy shared all resources"
+      - job: destroy_shared
+        displayName: Destroy EKS shared resources
+        container: prime
+        dependsOn:
+          - destroy_eks_1_20
+          - destroy_eks_1_21
+        condition: ne(variables['NO_DESTROY'], 'true')
+        steps:
+          - bash: ./src/qa-test-eks.sh destroy-shared eu-west-1 _global
+            displayName: "Destroy shared all resources"