Back to defaults

erikbra · Apr 21, 2024 · 0ea4ad8 · 0ea4ad8
1 parent 0e0e038
commit 0ea4ad8
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 14 deletions.
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -301,16 +301,16 @@ jobs:
           - name: windows-latest
             arch: win-x64
             executable: grate.exe
-          # - name: ubuntu-latest
-          #   arch: linux-x64
-          #   executable: grate
-          # - name: macos-latest
-          #   arch: osx-x64
-          #   executable: grate
-            # macos-14 is M1 (arm64)
-          # - name: macos-14
-          #   arch: osx-arm64
-          #   executable: grate
+          - name: ubuntu-latest
+            arch: linux-x64
+            executable: grate
+          - name: macos-latest
+            arch: osx-x64
+            executable: grate
+          # macos-14 is M1 (arm64)
+          - name: macos-14
+            arch: osx-arm64
+            executable: grate
         database: ${{ fromJson(needs.setup-test-environment.outputs.dbs) }}
 
     runs-on: ${{ matrix.os.name }}
@@ -363,6 +363,7 @@ jobs:
 
     - name: Test lib
       shell: pwsh
+      timeout-minutes: 12
       run: |
         $env:GrateTestConfig__AdminConnectionString="$([System.Text.Encoding]::UTF8.GetString([System.Convert]::FromBase64String( "${{ matrix.database.connectionstring }}" )) )";
 
@@ -375,6 +376,8 @@ jobs:
         TZ: UTC
 
     - name: Test CmdLine
+      timeout-minutes: 6
+      if: ${{ !cancelled() }}
       shell: pwsh
       run: |
         $env:GrateTestConfig__AdminConnectionString="$([System.Text.Encoding]::UTF8.GetString([System.Convert]::FromBase64String( "${{ matrix.database.connectionstring }}" )) )";
@@ -398,6 +401,11 @@ jobs:
           /tmp/test-results/${{ matrix.os.arch }}/CommandLine.${{ matrix.database.cleaned_name }}.xml
         retention-days: 1
 
+    - name: Fail build if not successful
+      id: fail-if-failed
+      run: exit 1
+      if: ${{ failure() }}
+
   report:
     runs-on: ubuntu-latest
     name: Create test report
@@ -462,8 +470,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 }}
@@ -505,3 +513,15 @@ jobs:
         #run: terraform apply -destroy -auto-approve
         run: terraform destroy -auto-approve
 
+  fail-if-failed:
+    name: Fail build on failure
+    needs:
+      - integration-test
+      - teardown-test-environment
+    runs-on: ubuntu-latest
+    steps:
+      - name: Fail build if not successful
+        id: fail-if-failed
+        run: exit 1
+        if: ${{ failure() }}
+
diff --git a/test-infra/terraform/test-environment/aca-oracle.tf b/test-infra/terraform/test-environment/aca-oracle.tf
@@ -23,8 +23,8 @@ resource "azurerm_container_app" "oracle" {
     container {
       name          = "oracle"
       image         = local.oracle_images[count.index]
-      cpu           = 1.00
-      memory        = "2Gi"
+      cpu           = 2.00
+      memory        = "4Gi"
 
       # ref the Docker image documentation: https://github.com/gvenzl/oci-oracle-xe
       env {