CI concurrency and timeout updates

bobozaur · Sep 5, 2024 · 0044081 · 0044081
1 parent 763df39
commit 0044081
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/.github/actions/exa-cluster/action.yaml b/.github/actions/exa-cluster/action.yaml
@@ -56,7 +56,6 @@ runs:
       shell: bash
 
     - name: Wait until Exasol cluster is live
-      timeout-minutes: 5
       run: |
         RC=1
 

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -7,12 +7,18 @@ on:
   pull_request:
     branches: ["main"]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 env:
   RUST_TOOLCHAIN: 1.74.0
   EXASOL_VERSION: 7.0.22
   NUM_NODES: 2
   ETL_TEST_THREADS: 4
-  ETL_JOB_TIMEOUT: 20
+
+inputs:
+  JOB_TIMEOUT: 20
 
 jobs:
   format:
@@ -112,6 +118,7 @@ jobs:
 
   connection_tests:
     name: Connection tests
+    timeout-minutes: ${{ fromJSON(inputs.JOB_TIMEOUT) }}
     needs: clippy
     runs-on: ubuntu-20.04
 
@@ -149,6 +156,7 @@ jobs:
 
   tls_connection_tests:
     name: TLS connection tests
+    timeout-minutes: ${{ fromJSON(inputs.JOB_TIMEOUT) }}
     needs: clippy
     runs-on: ubuntu-20.04
 
@@ -186,6 +194,7 @@ jobs:
 
   etl_tests:
     name: ETL tests
+    timeout-minutes: ${{ fromJSON(inputs.JOB_TIMEOUT) }}
     needs: clippy
     runs-on: ubuntu-20.04
 
@@ -212,7 +221,6 @@ jobs:
       - uses: Swatinem/rust-cache@v2
 
       - name: ETL tests
-        timeout-minutes: ${{ fromJSON(env.ETL_JOB_TIMEOUT) }}
         run: cargo test --features migrate,compression,etl -- --ignored --nocapture  --test-threads ${{ env.ETL_TEST_THREADS }}
         env:
           DATABASE_URL: ${{ steps.exa-cluster.outputs.no-tls-url }}
@@ -229,6 +237,7 @@ jobs:
 
   native_tls_etl_tests:
     name: ETL tests with native-tls
+    timeout-minutes: ${{ fromJSON(inputs.JOB_TIMEOUT) }}
     needs: clippy
     runs-on: ubuntu-20.04
 
@@ -255,13 +264,13 @@ jobs:
       - uses: Swatinem/rust-cache@v2
 
       - name: Native-TLS ETL tests
-        timeout-minutes: ${{ fromJSON(env.ETL_JOB_TIMEOUT) }}
         run: cargo test --features migrate,compression,etl_native_tls -- --ignored --nocapture  --test-threads ${{ env.ETL_TEST_THREADS }}
         env:
           DATABASE_URL: ${{ steps.exa-cluster.outputs.tls-url }}
 
   rustls_etl_tests:
     name: ETL tests with rustls
+    timeout-minutes: ${{ fromJSON(inputs.JOB_TIMEOUT) }}
     needs: clippy
     runs-on: ubuntu-20.04
 
@@ -288,7 +297,6 @@ jobs:
       - uses: Swatinem/rust-cache@v2
 
       - name: Rustls ETL tests
-        timeout-minutes: ${{ fromJSON(env.ETL_JOB_TIMEOUT) }}
         run: cargo test --features migrate,compression,etl_rustls -- --ignored --nocapture --test-threads ${{ env.ETL_TEST_THREADS }}
         env:
           DATABASE_URL: ${{ steps.exa-cluster.outputs.tls-url }}
-Original file line number
+Diff line change
@@ Expand Up / @@ -56,7 +56,6 @@ runs: @@
           shell: bash
         - name: Wait until Exasol cluster is live
-          timeout-minutes: 5
           run: |
             RC=1
@@ Expand Down @@