Skip to content

Commit 594ee3c

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 836c030 commit 594ee3c

16 files changed

+15
-32
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:
@@ -243,7 +242,7 @@ jobs:
243242
cp /snap/bin/kustomize ./bin/kustomize
244243
- name: Run smoke test
245244
id: smoketest
246-
timeout-minutes: 360
245+
timeout-minutes: 240
247246
run: |
248247
make int-test
249248
- 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:
@@ -192,7 +190,7 @@ jobs:
192190
mkdir -p ./bin
193191
cp /snap/bin/kustomize ./bin/kustomize
194192
- name: Run Integration test
195-
timeout-minutes: 360
193+
timeout-minutes: 240
196194
run: |
197195
make int-test
198196
- name: Collect Test Logs

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

Lines changed: 1 addition & 2 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
@@ -192,7 +191,7 @@ jobs:
192191
mkdir -p ./bin
193192
cp /snap/bin/kustomize ./bin/kustomize
194193
- name: Run smoke test
195-
timeout-minutes: 360
194+
timeout-minutes: 240
196195
run: |
197196
make int-test
198197
- 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:
@@ -192,7 +190,7 @@ jobs:
192190
mkdir -p ./bin
193191
cp /snap/bin/kustomize ./bin/kustomize
194192
- name: Run Integration test
195-
timeout-minutes: 360
193+
timeout-minutes: 240
196194
run: |
197195
make int-test
198196
- 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:
@@ -243,7 +242,7 @@ jobs:
243242
cp /snap/bin/kustomize ./bin/kustomize
244243
- name: Run smoke test
245244
id: smoketest
246-
timeout-minutes: 360
245+
timeout-minutes: 240
247246
run: |
248247
make int-test
249248
- 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:
@@ -192,7 +190,7 @@ jobs:
192190
mkdir -p ./bin
193191
cp /snap/bin/kustomize ./bin/kustomize
194192
- name: Run Integration test
195-
timeout-minutes: 360
193+
timeout-minutes: 240
196194
run: |
197195
make int-test
198196
- 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:
@@ -297,7 +296,7 @@ jobs:
297296
cp /snap/bin/kustomize ./bin/kustomize
298297
- name: Run smoke test
299298
id: smoketest
300-
timeout-minutes: 360
299+
timeout-minutes: 240
301300
run: |
302301
make int-test
303302
- 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:
@@ -297,7 +296,7 @@ jobs:
297296
cp /snap/bin/kustomize ./bin/kustomize
298297
- name: Run smoke test
299298
id: smoketest
300-
timeout-minutes: 360
299+
timeout-minutes: 240
301300
run: |
302301
make int-test
303302
- 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:
@@ -191,7 +189,7 @@ jobs:
191189
mkdir -p ./bin
192190
cp /snap/bin/kustomize ./bin/kustomize
193191
- name: Run Integration test
194-
timeout-minutes: 360
192+
timeout-minutes: 240
195193
run: |
196194
make int-test
197195
- name: Collect Test Logs

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,6 @@ jobs:
202202
helm package helm-chart/splunk-operator
203203
mv splunk-operator-*.tgz helm-chart/splunk-enterprise/charts
204204
- name: Run helm test
205-
timeout-minutes: 360
206205
env:
207206
KUTTL_SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_ENTERPRISE_IMAGE }}
208207
KUTTL_SPLUNK_OPERATOR_IMAGE: ${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:${{ env.HELM_GITHUB_SHA }}

0 commit comments

Comments
 (0)