Skip to content
This repository was archived by the owner on Jun 26, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions .github/workflows/pr-checks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ jobs:
acceptance:
name: Acceptance Tests with Kubernetes and using OLM
runs-on: ubuntu-20.04
timeout-minutes: 90

env:
EXTRA_BEHAVE_ARGS: "--tags=~@knative --tags=~@openshift --tags=~@examples --tags=~@supported-operator --tags=~@optional-annotations --tags=~@workload-resource-mapping --tags=~@disable-github-actions"
Expand Down Expand Up @@ -230,6 +231,7 @@ jobs:
env:
EXTRA_BEHAVE_ARGS: "--tags=@supported-operator --tags=~@disable-github-actions"
TEST_RUN: Supported_Operators_Acceptance_tests_Kubernetes_with_OLM
DELETE_NAMESPACE: never

steps:
- name: Checkout Git Repository
Expand Down Expand Up @@ -386,6 +388,7 @@ jobs:
acceptance_without_olm:
name: Acceptance tests running on Kubernetes without using OLM
runs-on: ubuntu-20.04
timeout-minutes: 90

env:
EXTRA_BEHAVE_ARGS: "--tags=~@knative --tags=~@openshift --tags=~@olm --tags=~@disable-github-actions"
Expand Down
4 changes: 2 additions & 2 deletions samples/apps/spring-petclinic/pgcluster-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ kind: PostgresCluster
metadata:
name: hippo
spec:
image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-14.4-0
image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-14.5-1
postgresVersion: 14
instances:
- name: instance1
Expand All @@ -17,7 +17,7 @@ spec:
storage: 1Gi
backups:
pgbackrest:
image: registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi8-2.38-0
image: registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi8-2.40-1
repos:
- name: repo1
volume:
Expand Down
1 change: 1 addition & 0 deletions test/acceptance/features/gettingStartedGuide.feature
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ Feature: Getting Started Guide
@disable.arch.ppc64le
@disable.arch.s390x
@disable.arch.arm64
@disable-openshift-4.12
Scenario: Connecting PetClinic application to an Operator-backed PostgreSQL database
Given Crunchy Data Postgres operator is running
* PetClinic sample application is installed
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ def __init__(self, name="cloud-native-postgresql"):
name=name,
pod_name_pattern="postgresql-operator-controller-manager.*",
operator_catalog_source_name="operatorhubio-catalog",
operator_catalog_channel="stable",
operator_catalog_channel="stable-v1.17",
operator_catalog_image="quay.io/operatorhubio/catalog:latest",
package_name=name)

Expand Down
2 changes: 1 addition & 1 deletion test/acceptance/features/steps/crunchypostgresoperator.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ def __init__(self, name="pgo"):
else:
package_name = "postgresql"
catalog_source_name = "operatorhubio-catalog"
csv = "postgresoperator.v5.1.2"
csv = "postgresoperator.v5.2.0"
channel = "v5"

super().__init__(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ Feature: Support a number of existing operator-backed services out of the box
"""

@external-feedback
@disable-openshift-4.12
Scenario: Bind test application to Postgres provisioned by Crunchy Data Postgres operator
Given Crunchy Data Postgres operator is running
* Generic test application is running
Expand All @@ -103,7 +104,7 @@ Feature: Support a number of existing operator-backed services out of the box
metadata:
name: hippo
spec:
image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-14.4-0
image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-14.5-1
postgresVersion: 14
instances:
- name: instance1
Expand All @@ -115,7 +116,7 @@ Feature: Support a number of existing operator-backed services out of the box
storage: 1Gi
backups:
pgbackrest:
image: registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi8-2.38-0
image: registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi8-2.40-1
repos:
- name: repo1
volume:
Expand Down Expand Up @@ -251,6 +252,7 @@ Feature: Support a number of existing operator-backed services out of the box
And File "/bindings/$scenario_id/password" exists in application pod
And Application can connect to the projected MySQL database

@disable-openshift-4.12
Scenario: Bind test application to Mysql provisioned by Percona Mysql operator
Given Percona Mysql operator is running
* Generic test application is running
Expand Down