Skip to content

[release-4.20] USHIFT-7058: Use small OLM catalog for test stability #6774

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

Open
pmtk wants to merge 1 commit into
base: release-4.20
Choose a base branch
from
+14 −12
Open

[release-4.20] USHIFT-7058: Use small OLM catalog for test stability #6774

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions test/assets/olm/catalog-source.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
apiVersion: operators.coreos.com/v1alpha1
kind: CatalogSource
metadata:
name: redhat-operators
name: hello-microshift-catalog
namespace: openshift-marketplace
spec:
sourceType: grpc
image: registry.redhat.io/redhat/redhat-operator-index:v4.16
displayName: Red Hat Operators
publisher: Red Hat
image: quay.io/microshift/hello-microshift-catalog:latest
displayName: Hello MicroShift Catalog
publisher: MicroShift CI
grpcPodConfig:
securityContextConfig: restricted
updateStrategy:
Expand Down
8 changes: 5 additions & 3 deletions test/assets/olm/subscription.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
apiVersion: operators.coreos.com/v1alpha1
kind: Subscription
metadata:
name: amq-broker
name: hello-microshift-operator
namespace: openshift-operators
spec:
name: amq-broker-rhel8
source: redhat-operators
channel: alpha
name: hello-microshift-operator
source: hello-microshift-catalog
sourceNamespace: openshift-marketplace
installPlanApproval: Automatic
10 changes: 5 additions & 5 deletions test/suites/optional/olm.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ Suite Teardown Teardown
*** Variables ***
${CATALOG_SOURCE} ./assets/olm/catalog-source.yaml
${SUBSCRIPTION} ./assets/olm/subscription.yaml
${SUBSCRIPTION_NAME} amq-broker
${SUBSCRIPTION_NAME} hello-microshift-operator
${MARKETPLACE_NAMESPACE} openshift-marketplace
${OPERATORS_NAMESPACE} openshift-operators


*** Test Cases ***
Deploy AmqBroker From Red Hat Operators catalog
[Documentation] Deploy AMQ Broker from Red Hat Operators catalog.
Deploy Hello MicroShift Operator From Catalog
[Documentation] Deploy hello-microshift operator from a self-contained catalog.
[Setup] Setup Test

${csv}= Get CSV Name From Subscription ${OPERATORS_NAMESPACE} ${SUBSCRIPTION_NAME}
Expand Down Expand Up @@ -68,10 +68,10 @@ OLM Should Be Ready
Named Deployment Should Be Available olm-operator openshift-operator-lifecycle-manager

Create CatalogSource
[Documentation] Create CatalogSource resource with Red Hat Community Catalog Index.
[Documentation] Create CatalogSource resource with the hello-microshift catalog.
Oc Create -f ${CATALOG_SOURCE}
Wait Until Keyword Succeeds 5m 10s
... CatalogSource Should Be Ready ${MARKETPLACE_NAMESPACE} redhat-operators
... CatalogSource Should Be Ready ${MARKETPLACE_NAMESPACE} hello-microshift-catalog

CatalogSource Should Be Ready
[Documentation] Checks if CatalogSource is ready.
Expand Down