Skip to content

ci: added default values in case repo variables are not present #1938

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Prashansa-K merged 4 commits into from
Mar 20, 2026
Merged

ci: added default values in case repo variables are not present #1938

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4134c38
ci: added default values in case repo variables are not present
Prashansa-K Mar 16, 2026
1261ff4
Merge branch 'main' into ci/default-timeout-val
Prashansa-K Mar 20, 2026
93ee36a
fix: added timeout to tests to override 10m default timeout in go
Prashansa-K Mar 20, 2026
9bfde5a
ci: added minute unit to go timeout for tests
Prashansa-K Mar 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ on:

jobs:
analyze:
timeout-minutes: ${{ fromJSON(vars.GHA_DEFAULT_TIMEOUT) }}
timeout-minutes: ${{ fromJSON(vars.GHA_DEFAULT_TIMEOUT || '10') }}
name: Analyze
runs-on: ubuntu-latest
permissions:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration-enterprise.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:

jobs:
integration:
timeout-minutes: ${{ fromJSON(vars.DECK_WORKFLOW_GW_TIMEOUT) }}
timeout-minutes: ${{ fromJSON(vars.DECK_WORKFLOW_GW_TIMEOUT || '10') }}
strategy:
matrix:
kong_image:
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/integration-konnect.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on: [pull_request]

jobs:
integration:
timeout-minutes: ${{ fromJSON(vars.DECK_WORKFLOW_KONNECT_TIMEOUT) }}
timeout-minutes: ${{ fromJSON(vars.DECK_WORKFLOW_KONNECT_TIMEOUT || '10') }}
env:
KONG_ANONYMOUS_REPORTS: "off"
DECK_KONNECT_EMAIL : ${{ secrets.DECK_KONNECT_EMAIL }}
Expand All @@ -33,4 +33,5 @@ jobs:
with:
go-version-file: go.mod
- name: Run integration tests
run: make test-integration
# DECK_WORKFLOW_KONNECT_TIMEOUT is a plain number of minutes (used for timeout-minutes above), append 'm' for go test -timeout.
run: make test-integration TEST_TIMEOUT=${{ vars.DECK_WORKFLOW_KONNECT_TIMEOUT || '20' }}m
2 changes: 1 addition & 1 deletion .github/workflows/integration.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:

jobs:
integration:
timeout-minutes: ${{ fromJSON(vars.DECK_WORKFLOW_GW_TIMEOUT) }}
timeout-minutes: ${{ fromJSON(vars.DECK_WORKFLOW_GW_TIMEOUT || '10') }}
strategy:
matrix:
kong_image:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

jobs:
goreleaser:
timeout-minutes: ${{ fromJSON(vars.DECK_WORKFLOW_RELEASE_TIMEOUT) }}
timeout-minutes: ${{ fromJSON(vars.DECK_WORKFLOW_RELEASE_TIMEOUT || '20') }}
runs-on: ubuntu-latest
permissions:
contents: write
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:

jobs:
test:
timeout-minutes: ${{ fromJSON(vars.DECK_WORKFLOW_GW_TIMEOUT) }}
timeout-minutes: ${{ fromJSON(vars.DECK_WORKFLOW_GW_TIMEOUT || '10') }}
runs-on: ubuntu-latest
steps:
- name: Harden Runner
Expand Down
3 changes: 3 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
.DEFAULT_GOAL := test-all

CLI_DOCS_PATH=docs/cli-docs/
# TEST_TIMEOUT must be a Go duration string (e.g. 20m, 30m, 1h). Do not pass a bare number.
TEST_TIMEOUT ?= 20m
.PHONY: test-all
test-all: lint test

Expand Down Expand Up @@ -39,6 +41,7 @@ setup-kong-ee:
test-integration:
go test -v -count=1 -tags=integration \
-race \
-timeout $(TEST_TIMEOUT) \
$(GOTESTFLAGS) \
./tests/integration/...

Expand Down
Loading