Skip to content

Commit baafb4d

Browse files
authored
test: update default CNPG release to v1.29 (#174)
Update the default CNPG release to v1.29. Allow overriding the deafult CNPG release when running `task e2e:setup-env` and `task e2e:test:full`. Properly propagate the `CNPG_RELEASE` variable in the `smoke-test` job. Closes #173 Signed-off-by: Niccolò Fei <niccolo.fei@enterprisedb.com>
1 parent 875a1f3 commit baafb4d

2 files changed

Lines changed: 11 additions & 4 deletions

File tree

.github/workflows/bake_targets.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ jobs:
119119
fail-fast: false
120120
matrix:
121121
image: ${{fromJson(needs.testbuild.outputs.images)}}
122-
cnpg: ["main", "1.27", "1.28"]
122+
cnpg: ["main", "1.28", "1.29"]
123123
steps:
124124
- name: Checkout Code
125125
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
@@ -137,8 +137,10 @@ jobs:
137137
curl -L https://dl.dagger.io/dagger/install.sh | BIN_DIR=$HOME/.local/bin sh
138138
139139
- name: Set up environment
140+
env:
141+
CNPG_RELEASE: ${{ matrix.cnpg }}
140142
run: |
141-
task e2e:setup-env
143+
task e2e:setup-env CNPG_RELEASE=$CNPG_RELEASE
142144
143145
- name: Generate Chainsaw testing values
144146
env:

Taskfile.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ vars:
2121
KIND_NODE_VERSION: v1.35.1@sha256:05d7bcdefbda08b4e038f644c4df690cdac3fba8b06f8289f30e10026720a1ab
2222
K8S_VERSION: '{{ regexReplaceAll "^v([0-9.]+).*" .KIND_NODE_VERSION "$1" }}'
2323
KIND_CLUSTER_NAME: pg-extensions-{{ .K8S_VERSION }}
24+
# renovate: datasource=github-tags depName=cloudnative-pg/cloudnative-pg versioning=semver extractVersion=^v(?<version>\d+\.\d+)\.\d+$
25+
CNPG_RELEASE_DEFAULT: 1.29
2426

2527
tasks:
2628
default:
@@ -278,8 +280,7 @@ tasks:
278280
REGISTRY_USERNAME: '{{ .REGISTRY_USERNAME }}'
279281
internal: true
280282
vars:
281-
# renovate: datasource=github-tags depName=cloudnative-pg/cloudnative-pg versioning=semver extractVersion=^v(?<version>\d+\.\d+)\.\d+$
282-
CNPG_RELEASE: 1.28
283+
CNPG_RELEASE: '{{ .CNPG_RELEASE | default .CNPG_RELEASE_DEFAULT }}'
283284
# renovate: datasource=docker depName=alpine/kubectl versioning=docker
284285
KUBECTL_VERSION: 1.35.3@sha256:ebf9d81d06441b3183fdc6e2dbc9f5d0db4d0464808b5bcd3c9021f54f6e65db
285286
DOCKER_SOCKET:
@@ -347,13 +348,15 @@ tasks:
347348
vars:
348349
REGISTRY_HOST: '{{ .REGISTRY_HOST | default "" }}'
349350
REGISTRY_USERNAME: '{{ .REGISTRY_USERNAME | default "" }}'
351+
CNPG_RELEASE: '{{ .CNPG_RELEASE | default .CNPG_RELEASE_DEFAULT }}'
350352
deps:
351353
- e2e:start-container-registry
352354
- e2e:start-dagger-engine
353355
- task: e2e:install-cnpg
354356
vars:
355357
REGISTRY_HOST: '{{ .REGISTRY_HOST }}'
356358
REGISTRY_USERNAME: '{{ .REGISTRY_USERNAME }}'
359+
CNPG_RELEASE: '{{ .CNPG_RELEASE }}'
357360
cmds:
358361
- echo -e "{{.GREEN}}--- E2E environment setup complete ---{{.NC}}"
359362

@@ -421,11 +424,13 @@ tasks:
421424
DISTRO: '{{ .DISTRO | default "trixie" }}'
422425
REGISTRY_HOST: '{{ .REGISTRY_HOST | default "" }}'
423426
REGISTRY_USERNAME: '{{ .REGISTRY_USERNAME | default "" }}'
427+
CNPG_RELEASE: '{{ .CNPG_RELEASE | default .CNPG_RELEASE_DEFAULT }}'
424428
cmds:
425429
- task: e2e:setup-env
426430
vars:
427431
REGISTRY_HOST: '{{ .REGISTRY_HOST }}'
428432
REGISTRY_USERNAME: '{{ .REGISTRY_USERNAME }}'
433+
CNPG_RELEASE: '{{ .CNPG_RELEASE }}'
429434
- task: bake
430435
vars:
431436
PUSH: "true"

0 commit comments

Comments
 (0)