Re-enable teardown, add more tests

erikbra · Apr 18, 2024 · a319678 · a319678
1 parent 358bd57
commit a319678
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -373,7 +373,7 @@ jobs:
         -MaxCpuCount 2
 
       env:
-        LogLevel: Information
+        LogLevel: Critical
         GrateExecutablePath: ${{ github.workspace }}/executables/${{ matrix.os.arch }}/${{ matrix.os.executable }}
         TZ: UTC
 
@@ -451,8 +451,8 @@ jobs:
     environment: integration-tests
     runs-on: ubuntu-latest
     needs: integration-test
-    #if: always()
-    if: false
+    if: always()
+    #if: false
     env:
       tf_actions_working_dir: "${{ github.workspace }}/test-infra/terraform/test-environment"
       ARM_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}

diff --git a/test-infra/terraform/test-environment/variables.tf b/test-infra/terraform/test-environment/variables.tf
@@ -11,10 +11,10 @@ locals {
 
   # Cannot get these to work yet, for some reason... need to look into it
    oracle_images = [
-    #"gvenzl/oracle-free:latest-faststart",
-    #"gvenzl/oracle-xe:latest-faststart",
-    #"gvenzl/oracle-xe:18-faststart",
-    #"gvenzl/oracle-xe:11-faststart"
+    "gvenzl/oracle-free:latest-faststart",
+    "gvenzl/oracle-xe:latest-faststart",
+    "gvenzl/oracle-xe:18-faststart",
+    "gvenzl/oracle-xe:11-faststart"
    ]
 
    postgresql_images = [
@@ -28,7 +28,7 @@ locals {
    sqlserver_images = [
     #"mcr.microsoft.com/mssql/server:2022-preview-ubuntu-22.04",
     "mcr.microsoft.com/mssql/server:2022-latest",
-    # "mcr.microsoft.com/mssql/server:2019-latest",
-    # "mcr.microsoft.com/mssql/server:2017-latest"
+    "mcr.microsoft.com/mssql/server:2019-latest",
+    "mcr.microsoft.com/mssql/server:2017-latest"
    ]
 }