From 0b5034b40fc695b42adf19fbe84ce7b55c47a515 Mon Sep 17 00:00:00 2001 From: Michael Kriese Date: Fri, 16 Aug 2024 09:15:28 +0200 Subject: [PATCH] test: fix tests --- .forgejo/workflows/build.yml | 4 ++-- ci/default-values.yml | 10 ++++++++++ ci/default.yml | 1 - ci/dev-values.yml | 2 -- ci/single-values.yml | 4 ++++ ci/{v7-test.yml => v7-test-values.yml} | 2 -- ci/{v8-test.yml => v8-test-values.yml} | 2 -- ci/{v9-test.yml => v9-test-values.yml} | 2 -- tools/ct.yml | 4 +++- 9 files changed, 19 insertions(+), 12 deletions(-) create mode 100644 ci/default-values.yml delete mode 100644 ci/default.yml rename ci/{v7-test.yml => v7-test-values.yml} (93%) rename ci/{v8-test.yml => v8-test-values.yml} (93%) rename ci/{v9-test.yml => v9-test-values.yml} (93%) diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml index 057737d..2980f5e 100644 --- a/.forgejo/workflows/build.yml +++ b/.forgejo/workflows/build.yml @@ -121,10 +121,10 @@ jobs: - name: install chart uses: https://github.com/nick-fields/retry@7152eba30c6575329ac0576536151aca5a72780e # v3.0.0 with: - timeout_minutes: 15 + timeout_minutes: 30 max_attempts: 3 retry_on: error - retry_wait_seconds: 60 + retry_wait_seconds: 120 polling_interval_seconds: 5 command: ct install --config tools/ct.yml --charts . diff --git a/ci/default-values.yml b/ci/default-values.yml new file mode 100644 index 0000000..be63037 --- /dev/null +++ b/ci/default-values.yml @@ -0,0 +1,10 @@ +# default values with some modifications +postgresql-ha: + # for better ci experience + postgresql: + startupProbe: + enabled: true +redis: + redis: + startupProbe: + enabled: true diff --git a/ci/default.yml b/ci/default.yml deleted file mode 100644 index d6c93d3..0000000 --- a/ci/default.yml +++ /dev/null @@ -1 +0,0 @@ -# default values diff --git a/ci/dev-values.yml b/ci/dev-values.yml index 2747d7c..e1fecd7 100644 --- a/ci/dev-values.yml +++ b/ci/dev-values.yml @@ -4,8 +4,6 @@ image: redis-cluster: enabled: false -postgresql: - enabled: false postgresql-ha: enabled: false diff --git a/ci/single-values.yml b/ci/single-values.yml index 46ea966..994fd71 100644 --- a/ci/single-values.yml +++ b/ci/single-values.yml @@ -2,6 +2,10 @@ redis-cluster: enabled: false postgresql: enabled: true + # for better ci experience + postgresql: + startupProbe: + enabled: true postgresql-ha: enabled: false diff --git a/ci/v7-test.yml b/ci/v7-test-values.yml similarity index 93% rename from ci/v7-test.yml rename to ci/v7-test-values.yml index 0157123..a908c5a 100644 --- a/ci/v7-test.yml +++ b/ci/v7-test-values.yml @@ -5,8 +5,6 @@ image: redis-cluster: enabled: false -postgresql: - enabled: false postgresql-ha: enabled: false diff --git a/ci/v8-test.yml b/ci/v8-test-values.yml similarity index 93% rename from ci/v8-test.yml rename to ci/v8-test-values.yml index b46321e..9bd5659 100644 --- a/ci/v8-test.yml +++ b/ci/v8-test-values.yml @@ -5,8 +5,6 @@ image: redis-cluster: enabled: false -postgresql: - enabled: false postgresql-ha: enabled: false diff --git a/ci/v9-test.yml b/ci/v9-test-values.yml similarity index 93% rename from ci/v9-test.yml rename to ci/v9-test-values.yml index 33843cb..73eb57f 100644 --- a/ci/v9-test.yml +++ b/ci/v9-test-values.yml @@ -5,8 +5,6 @@ image: redis-cluster: enabled: false -postgresql: - enabled: false postgresql-ha: enabled: false diff --git a/tools/ct.yml b/tools/ct.yml index 0f81989..871bc2d 100644 --- a/tools/ct.yml +++ b/tools/ct.yml @@ -1,6 +1,8 @@ -helm-extra-args: --timeout 3m +# https://github.com/helm/chart-testing/blob/main/doc/ct_install.md +helm-extra-args: --timeout 5m check-version-increment: false debug: true target-branch: main lint-conf: .yamllint validate-maintainers: false # does not work with gitea +github-groups: true