Enable all DBs, change name of test report

erikbra · Apr 19, 2024 · e74d4db · e74d4db
1 parent ee90498
commit e74d4db
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -297,19 +297,19 @@ jobs:
       #max-parallel: 4
       matrix:
         os:
-          # - name: windows-latest
-          #   arch: win-x64
-          #   executable: grate.exe
+          - 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: 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 }}
@@ -369,7 +369,7 @@ jobs:
         # -MaxCpuCount 2
 
         dotnet test integration-tests/${{ matrix.os.arch }}/${{ matrix.database.type }}.dll `
-        --logger:"xunit;LogFilePath=/tmp/test-results/${{ matrix.os.arch }}/${{ matrix.database.type }}.xml" -- `
+        --logger:"xunit;LogFilePath=/tmp/test-results/${{ matrix.os.arch }}/${{ matrix.database.name }}.xml" -- `
         -MaxCpuCount 2
 
       env:
@@ -381,10 +381,10 @@ jobs:
       if: always()
       uses: actions/upload-artifact@v4
       with:
-        name: "${{ matrix.os.arch }} ${{ matrix.database.type }} XML test results"
+        name: "${{ matrix.os.arch }} ${{ matrix.database.name }} XML test results"
         path: |
           /tmp/test-results/${{ matrix.os.arch }}/${{ matrix.database.type }}.xml
-          /tmp/test-results/${{ matrix.os.arch }}/CommandLine.${{ matrix.database.type }}.xml
+          /tmp/test-results/${{ matrix.os.arch }}/CommandLine.${{ matrix.database.name }}.xml
         retention-days: 1
 
   report:
@@ -436,14 +436,14 @@ jobs:
 
           test -d $REPORT_DIR || mkdir $REPORT_DIR
           echo "Running smink"
-          /tmp/smink/smink "${XML_DIR}/*.xml" "${REPORT_DIR}/test-report.html" --title "grate unit tests"
+          /tmp/smink/smink "${XML_DIR}/*.xml" "${REPORT_DIR}/grate-tests.html" --title "grate integration tests $(date +'%F %T %z')"
 
       - name: Upload HTML test report
         uses: actions/upload-artifact@v4
         with:
           name: HTML test report
           path: |
-            /tmp/test-results/test-report.html
+            /tmp/test-results/grate-tests.html
           retention-days: 10
 
   teardown-test-environment:

diff --git a/test-infra/terraform/test-environment/outputs.tf b/test-infra/terraform/test-environment/outputs.tf
@@ -14,15 +14,15 @@ output "dbs" {
         for mariadb in azurerm_container_app.mariadb : { 
           name = mariadb.template[0].container[0].image
           type = "MariaDB"
-          connectionstring= "Server=${mariadb.latest_revision_fqdn};Port=${mariadb.ingress[0].exposed_port};Database=mysql;Uid=root;Pwd='${random_password.mariadb_admin.result}';Max Pool Size=10;"
+          connectionstring= "Server=${mariadb.latest_revision_fqdn};Port=${mariadb.ingress[0].exposed_port};Database=mysql;Uid=root;Pwd='${random_password.mariadb_admin.result}';Pooling=false;"
         }
       ],
 
       [
         for oracle in azurerm_container_app.oracle : { 
           name = "${replace(replace(oracle.template[0].container[0].image, "gvenzl/", ""), "-faststart", "")}"
           type = "Oracle"
-          connectionstring= "Data Source=${oracle.latest_revision_fqdn}:${oracle.ingress[0].exposed_port}/FREEPDB1;User ID=system;Password='${random_password.oracle_admin.result}';Pooling=False"
+          connectionstring= "Data Source=${oracle.latest_revision_fqdn}:${oracle.ingress[0].exposed_port}/FREEPDB1;User ID=system;Password='${random_password.oracle_admin.result}';Pooling=false"
         }
       ],