CI concurrency and timeout configs

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

Hide file tree

Showing 2 changed files with 12 additions and 3 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,17 @@ 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
+  NUM_NODES: 4
   ETL_TEST_THREADS: 4
-  ETL_JOB_TIMEOUT: 20
+  ETL_JOB_TIMEOUT: 10
+  EXA_CLUSTER_SETUP_TIMEOUT: 5
 
 jobs:
   format:
@@ -122,6 +127,7 @@ jobs:
         uses: ./.github/actions/free-space
 
       - name: Create Exasol cluster
+        timeout-minutes: ${{ fromJSON(env.EXA_CLUSTER_SETUP_TIMEOUT) }}
         id: exa-cluster
         uses: ./.github/actions/exa-cluster
         with:
@@ -159,6 +165,7 @@ jobs:
         uses: ./.github/actions/free-space
 
       - name: Create Exasol cluster
+        timeout-minutes: ${{ fromJSON(env.EXA_CLUSTER_SETUP_TIMEOUT) }}
         id: exa-cluster
         uses: ./.github/actions/exa-cluster
         with:
@@ -196,6 +203,7 @@ jobs:
         uses: ./.github/actions/free-space
 
       - name: Create Exasol cluster
+        timeout-minutes: ${{ fromJSON(env.EXA_CLUSTER_SETUP_TIMEOUT) }}
         id: exa-cluster
         uses: ./.github/actions/exa-cluster
         with:
@@ -239,6 +247,7 @@ jobs:
         uses: ./.github/actions/free-space
 
       - name: Create Exasol cluster
+        timeout-minutes: ${{ fromJSON(env.EXA_CLUSTER_SETUP_TIMEOUT) }}
         id: exa-cluster
         uses: ./.github/actions/exa-cluster
         with:
@@ -272,6 +281,7 @@ jobs:
         uses: ./.github/actions/free-space
 
       - name: Create Exasol cluster
+        timeout-minutes: ${{ fromJSON(env.EXA_CLUSTER_SETUP_TIMEOUT) }}
         id: exa-cluster
         uses: ./.github/actions/exa-cluster
         with:
-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 @@