diff --git a/.github/workflows/pr-operator.yml b/.github/workflows/pr-operator.yml index d43ce1d..7919977 100644 --- a/.github/workflows/pr-operator.yml +++ b/.github/workflows/pr-operator.yml @@ -39,6 +39,11 @@ on: default: "${{ github.repository }}" required: false type: string + KUBECTL_WAIT_TIMEOUT: + description: "kubectl wait timeout used for integration and helmchart-test targets in the Makefile (e.g. 5m)" + default: "5m" + required: false + type: string env: DEFAULT_BUNDLE_VERSION: "0.0.1" DEFAULT_BUNDLE_CHANNEL: "alpha" @@ -569,7 +574,7 @@ jobs: - name: Run integration tests shell: bash if: ${{ inputs.RUN_INTEGRATION_TESTS }} - run: make integration + run: make integration KUBECTL_WAIT_TIMEOUT=${{ inputs.KUBECTL_WAIT_TIMEOUT }} test-helmchart: runs-on: ubuntu-latest @@ -622,7 +627,7 @@ jobs: - name: Test Helm Chart Deployment shell: bash - run: make helmchart-test OPERATOR_NAME=${{ env.REPOSITORY_NAME }} + run: make helmchart-test OPERATOR_NAME=${{ env.REPOSITORY_NAME }} KUBECTL_WAIT_TIMEOUT=${{ inputs.KUBECTL_WAIT_TIMEOUT }} recombine-dist: runs-on: ubuntu-latest diff --git a/.github/workflows/release-operator.yml b/.github/workflows/release-operator.yml index 882049d..4a9820d 100644 --- a/.github/workflows/release-operator.yml +++ b/.github/workflows/release-operator.yml @@ -48,6 +48,11 @@ on: default: false required: false type: boolean + KUBECTL_WAIT_TIMEOUT: + description: "kubectl wait timeout used for integration and helmchart-test targets in the Makefile (e.g. 5m)" + default: "5m" + required: false + type: string secrets: COMMUNITY_OPERATOR_PAT: description: "Github PAT Token for Community Operator Fork Git Operations" @@ -1103,7 +1108,7 @@ jobs: - name: Run integration tests shell: bash if: ${{ inputs.RUN_INTEGRATION_TESTS }} - run: make integration + run: make integration KUBECTL_WAIT_TIMEOUT=${{ inputs.KUBECTL_WAIT_TIMEOUT }} test-helmchart: runs-on: ubuntu-latest @@ -1154,4 +1159,4 @@ jobs: - name: Test Helm Chart Deployment shell: bash - run: make helmchart-test + run: make helmchart-test KUBECTL_WAIT_TIMEOUT=${{ inputs.KUBECTL_WAIT_TIMEOUT }} diff --git a/.github/workflows/test-vault-config-operator.yaml b/.github/workflows/test-vault-config-operator.yaml index ecc8e04..6d4a2c6 100644 --- a/.github/workflows/test-vault-config-operator.yaml +++ b/.github/workflows/test-vault-config-operator.yaml @@ -22,3 +22,4 @@ jobs: GO_VERSION: ~1.22 OPERATOR_SDK_VERSION: v1.31.0 CHECKOUT_CODE: "redhat-cop/vault-config-operator" + KUBECTL_WAIT_TIMEOUT: 20m