Skip to content

Commit 372e49e

Browse files
committed
CSPL-4201 job timeouts - reduce them on step level and adjust it to observed values
Reduce timeout settings across multiple GitHub Actions workflows for integration and smoke tests from 360/420 minutes to 240 minutes, optimizing resource usage and execution time.
1 parent c618870 commit 372e49e

16 files changed

+15
-34
lines changed

.github/workflows/arm-AL2023-build-test-push-workflow-AL2023.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ jobs:
113113
COSIGN_PASSWORD: ${{ secrets.COSIGN_PASSWORD }}
114114
smoke-tests-arm-al2023:
115115
needs: build-operator-image-arm-al2023
116-
timeout-minutes: 420
117116
strategy:
118117
fail-fast: false
119118
matrix:
@@ -235,7 +234,7 @@ jobs:
235234
cp /snap/bin/kustomize ./bin/kustomize
236235
- name: Run smoke test
237236
id: smoketest
238-
timeout-minutes: 360
237+
timeout-minutes: 240
239238
run: |
240239
make int-test
241240
- name: Collect Test Logs

.github/workflows/arm-AL2023-int-test-workflow.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ on:
1313
jobs:
1414
build-operator-image-arm-al2023:
1515
runs-on: ubuntu-latest
16-
timeout-minutes: 360
1716
env:
1817
SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.ECR_PREFIX }}/${{ github.event.inputs.splunk_image_repository_tag }}
1918
SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator
@@ -56,7 +55,6 @@ jobs:
5655
export IMG=${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA
5756
make docker-buildx PLATFORMS=$PLATFORMS BASE_IMAGE=$BASE_IMAGE BASE_IMAGE_VERSION=$BASE_IMAGE_VERSION IMG=$IMG
5857
int-tests-arm-al2023:
59-
timeout-minutes: 420
6058
strategy:
6159
fail-fast: false
6260
matrix:
@@ -184,7 +182,7 @@ jobs:
184182
mkdir -p ./bin
185183
cp /snap/bin/kustomize ./bin/kustomize
186184
- name: Run Integration test
187-
timeout-minutes: 360
185+
timeout-minutes: 240
188186
run: |
189187
make int-test
190188
- name: Collect Test Logs

.github/workflows/arm-RHEL-build-test-push-workflow.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ on:
1313
jobs:
1414
build-operator-image-arm-rhel:
1515
runs-on: ubuntu-latest
16-
timeout-minutes: 360
1716
env:
1817
SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.ECR_PREFIX }}/${{ github.event.inputs.splunk_image_repository_tag }}
1918
SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator
@@ -56,7 +55,6 @@ jobs:
5655
export IMG=${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA
5756
make docker-buildx PLATFORMS=$PLATFORMS BASE_IMAGE=$BASE_IMAGE BASE_IMAGE_VERSION=$BASE_IMAGE_VERSION IMG=$IMG
5857
int-tests-arm-rhel:
59-
timeout-minutes: 420
6058
strategy:
6159
fail-fast: false
6260
matrix:
@@ -184,7 +182,7 @@ jobs:
184182
mkdir -p ./bin
185183
cp /snap/bin/kustomize ./bin/kustomize
186184
- name: Run Integration test
187-
timeout-minutes: 360
185+
timeout-minutes: 240
188186
run: |
189187
make int-test
190188
- name: Collect Test Logs

.github/workflows/arm-RHEL-int-test-workflow.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ on:
1313
jobs:
1414
build-operator-image-arm-rhel:
1515
runs-on: ubuntu-latest
16-
timeout-minutes: 360
1716
env:
1817
SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.ECR_PREFIX }}/${{ github.event.inputs.splunk_image_repository_tag }}
1918
SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator
@@ -56,7 +55,6 @@ jobs:
5655
export IMG=${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA
5756
make docker-buildx PLATFORMS=$PLATFORMS BASE_IMAGE=$BASE_IMAGE BASE_IMAGE_VERSION=$BASE_IMAGE_VERSION IMG=$IMG
5857
int-tests-arm-rhel:
59-
timeout-minutes: 420
6058
strategy:
6159
fail-fast: false
6260
matrix:
@@ -184,7 +182,7 @@ jobs:
184182
mkdir -p ./bin
185183
cp /snap/bin/kustomize ./bin/kustomize
186184
- name: Run Integration test
187-
timeout-minutes: 360
185+
timeout-minutes: 240
188186
run: |
189187
make int-test
190188
- name: Collect Test Logs

.github/workflows/arm-Ubuntu-build-test-push-workflow.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ jobs:
113113
COSIGN_PASSWORD: ${{ secrets.COSIGN_PASSWORD }}
114114
smoke-tests-arm-ubuntu:
115115
needs: build-operator-image-arm-ubuntu
116-
timeout-minutes: 420
117116
strategy:
118117
fail-fast: false
119118
matrix:
@@ -235,7 +234,7 @@ jobs:
235234
cp /snap/bin/kustomize ./bin/kustomize
236235
- name: Run smoke test
237236
id: smoketest
238-
timeout-minutes: 360
237+
timeout-minutes: 240
239238
run: |
240239
make int-test
241240
- name: Collect Test Logs

.github/workflows/arm-Ubuntu-int-test-workflow.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ on:
1313
jobs:
1414
build-operator-image-arm-ubuntu:
1515
runs-on: ubuntu-latest
16-
timeout-minutes: 360
1716
env:
1817
SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.ECR_PREFIX }}/${{ github.event.inputs.splunk_image_repository_tag }}
1918
SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator
@@ -56,7 +55,6 @@ jobs:
5655
export IMG=${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA
5756
make docker-buildx PLATFORMS=$PLATFORMS BASE_IMAGE=$BASE_IMAGE BASE_IMAGE_VERSION=$BASE_IMAGE_VERSION IMG=$IMG
5857
int-tests-arm-ubuntu:
59-
timeout-minutes: 420
6058
strategy:
6159
fail-fast: false
6260
matrix:
@@ -184,7 +182,7 @@ jobs:
184182
mkdir -p ./bin
185183
cp /snap/bin/kustomize ./bin/kustomize
186184
- name: Run Integration test
187-
timeout-minutes: 360
185+
timeout-minutes: 240
188186
run: |
189187
make int-test
190188
- name: Collect Test Logs

.github/workflows/build-test-push-workflow.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,6 @@ jobs:
165165
sarif_file: 'trivy-results.sarif'
166166
smoke-tests:
167167
needs: vulnerability-scan
168-
timeout-minutes: 420
169168
strategy:
170169
fail-fast: false
171170
matrix:
@@ -290,7 +289,7 @@ jobs:
290289
cp /snap/bin/kustomize ./bin/kustomize
291290
- name: Run smoke test
292291
id: smoketest
293-
timeout-minutes: 360
292+
timeout-minutes: 240
294293
run: |
295294
make int-test
296295
- name: Collect Test Logs

.github/workflows/distroless-build-test-push-workflow.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,6 @@ jobs:
164164
# sarif_file: 'trivy-results.sarif'
165165
smoke-tests:
166166
needs: build-operator-image
167-
timeout-minutes: 420
168167
strategy:
169168
fail-fast: false
170169
matrix:
@@ -289,7 +288,7 @@ jobs:
289288
cp /snap/bin/kustomize ./bin/kustomize
290289
- name: Run smoke test
291290
id: smoketest
292-
timeout-minutes: 360
291+
timeout-minutes: 240
293292
run: |
294293
make int-test
295294
- name: Collect Test Logs

.github/workflows/distroless-int-test-workflow.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ on:
1313
jobs:
1414
build-operator-image-distroless:
1515
runs-on: ubuntu-latest
16-
timeout-minutes: 360
1716
env:
1817
SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.SPLUNK_ENTERPRISE_IMAGE }}
1918
SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator
@@ -56,7 +55,6 @@ jobs:
5655
export IMG=${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA-distroless
5756
make docker-buildx PLATFORMS=$PLATFORMS BASE_IMAGE=$BASE_IMAGE BASE_IMAGE_VERSION=$BASE_IMAGE_VERSION IMG=$IMG
5857
int-tests:
59-
timeout-minutes: 420
6058
strategy:
6159
fail-fast: false
6260
matrix:
@@ -183,7 +181,7 @@ jobs:
183181
mkdir -p ./bin
184182
cp /snap/bin/kustomize ./bin/kustomize
185183
- name: Run Integration test
186-
timeout-minutes: 360
184+
timeout-minutes: 240
187185
run: |
188186
make int-test
189187
- name: Collect Test Logs

.github/workflows/helm-test-workflow.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ jobs:
5353
run: |
5454
make docker-buildx IMG=${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA
5555
int-tests:
56-
timeout-minutes: 420
5756
strategy:
5857
fail-fast: false
5958
runs-on: ubuntu-latest
@@ -196,7 +195,6 @@ jobs:
196195
helm package helm-chart/splunk-operator
197196
mv splunk-operator-*.tgz helm-chart/splunk-enterprise/charts
198197
- name: Run helm test
199-
timeout-minutes: 360
200198
env:
201199
KUTTL_SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_ENTERPRISE_IMAGE }}
202200
KUTTL_SPLUNK_OPERATOR_IMAGE: ${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:${{ env.HELM_GITHUB_SHA }}

0 commit comments

Comments
 (0)