diff --git a/Jenkinsfile b/Jenkinsfile index 5b5bd38c3..6fb948d75 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -261,6 +261,7 @@ void runTest(Integer TEST_ID) { fi export KUBECONFIG=/tmp/$CLUSTER_NAME-$clusterSuffix export PATH="\${KREW_ROOT:-\$HOME/.krew}/bin:\$PATH" + export PG_DISTRIBUTION=community set -o pipefail kubectl kuttl test --config e2e-tests/kuttl.yaml --test "^${testName}\$" |& tee e2e-tests/logs/${testName}.log """ diff --git a/e2e-tests/tests/builtin-extensions/06-enable-pgstatmonitor.yaml b/e2e-tests/tests/builtin-extensions/06-enable-pgstatmonitor.yaml index e73f0b8e2..ea81aba38 100644 --- a/e2e-tests/tests/builtin-extensions/06-enable-pgstatmonitor.yaml +++ b/e2e-tests/tests/builtin-extensions/06-enable-pgstatmonitor.yaml @@ -1,19 +1,35 @@ -apiVersion: pgv2.percona.com/v2 -kind: PerconaPGCluster -metadata: - name: builtin-extensions -spec: - patroni: - dynamicConfiguration: - postgresql: - parameters: - pgaudit.log: 'ddl,write,role' - pgaudit.log_level: 'warning' - logging_collector: 'off' - extensions: - builtin: - pg_stat_monitor: true - pg_stat_statements: false # you can't enable both pg_stat_statements and pg_stat_monitor - pg_audit: true - pgvector: true - pg_repack: true +apiVersion: kuttl.dev/v1beta1 +kind: TestStep +commands: + - script: |- + set -o errexit + set -o xtrace + + # community images do not ship pg_stat_monitor; keep the patch so the + # cluster generation still increments and 06-assert.yaml passes. + PG_STAT_MONITOR="true" + if [[ "${PG_DISTRIBUTION}" == "community" ]]; then + PG_STAT_MONITOR="false" + fi + + kubectl apply -n "${NAMESPACE}" -f - <