Skip to content

Commit 5b04934

Browse files
trevorboxTrevor Box
andauthored
Add KUBECTL_WAIT_TIMEOUT for controlling integration and helmchart-test targets (#229)
* testing KUBECTL_WAIT_TIMEOUT * 20m vault KUBECTL_WAIT_TIMEOUT --------- Co-authored-by: Trevor Box <tbox@local>
1 parent 8d7499a commit 5b04934

3 files changed

Lines changed: 15 additions & 4 deletions

File tree

.github/workflows/pr-operator.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,11 @@ on:
3939
default: "${{ github.repository }}"
4040
required: false
4141
type: string
42+
KUBECTL_WAIT_TIMEOUT:
43+
description: "kubectl wait timeout used for integration and helmchart-test targets in the Makefile (e.g. 5m)"
44+
default: "5m"
45+
required: false
46+
type: string
4247
env:
4348
DEFAULT_BUNDLE_VERSION: "0.0.1"
4449
DEFAULT_BUNDLE_CHANNEL: "alpha"
@@ -569,7 +574,7 @@ jobs:
569574
- name: Run integration tests
570575
shell: bash
571576
if: ${{ inputs.RUN_INTEGRATION_TESTS }}
572-
run: make integration
577+
run: make integration KUBECTL_WAIT_TIMEOUT=${{ inputs.KUBECTL_WAIT_TIMEOUT }}
573578

574579
test-helmchart:
575580
runs-on: ubuntu-latest
@@ -622,7 +627,7 @@ jobs:
622627
623628
- name: Test Helm Chart Deployment
624629
shell: bash
625-
run: make helmchart-test OPERATOR_NAME=${{ env.REPOSITORY_NAME }}
630+
run: make helmchart-test OPERATOR_NAME=${{ env.REPOSITORY_NAME }} KUBECTL_WAIT_TIMEOUT=${{ inputs.KUBECTL_WAIT_TIMEOUT }}
626631

627632
recombine-dist:
628633
runs-on: ubuntu-latest

.github/workflows/release-operator.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,11 @@ on:
4848
default: false
4949
required: false
5050
type: boolean
51+
KUBECTL_WAIT_TIMEOUT:
52+
description: "kubectl wait timeout used for integration and helmchart-test targets in the Makefile (e.g. 5m)"
53+
default: "5m"
54+
required: false
55+
type: string
5156
secrets:
5257
COMMUNITY_OPERATOR_PAT:
5358
description: "Github PAT Token for Community Operator Fork Git Operations"
@@ -1103,7 +1108,7 @@ jobs:
11031108
- name: Run integration tests
11041109
shell: bash
11051110
if: ${{ inputs.RUN_INTEGRATION_TESTS }}
1106-
run: make integration
1111+
run: make integration KUBECTL_WAIT_TIMEOUT=${{ inputs.KUBECTL_WAIT_TIMEOUT }}
11071112

11081113
test-helmchart:
11091114
runs-on: ubuntu-latest
@@ -1154,4 +1159,4 @@ jobs:
11541159
11551160
- name: Test Helm Chart Deployment
11561161
shell: bash
1157-
run: make helmchart-test
1162+
run: make helmchart-test KUBECTL_WAIT_TIMEOUT=${{ inputs.KUBECTL_WAIT_TIMEOUT }}

.github/workflows/test-vault-config-operator.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,4 @@ jobs:
2222
GO_VERSION: ~1.22
2323
OPERATOR_SDK_VERSION: v1.31.0
2424
CHECKOUT_CODE: "redhat-cop/vault-config-operator"
25+
KUBECTL_WAIT_TIMEOUT: 20m

0 commit comments

Comments
 (0)