Skip to content

Commit a4c5a51

Browse files
committed
Simplify FIO bundle testing
FIO bundle tests are currently broken because the bundle fails to install: install failed: deployment file-integrity-operator not ready before timeout: deployment "file-integrity-operator" exceeded its progress deadline This commit overhauls the bundle test setup to follow the documented procedures for testing bundles in the OpenShift CI documentation: https://docs.ci.openshift.org/docs/how-tos/testing-operator-sdk-operators/#simple-operator-installation
1 parent cb020cf commit a4c5a51

File tree

1 file changed

+22
-10
lines changed

1 file changed

+22
-10
lines changed

ci-operator/config/openshift/file-integrity-operator/openshift-file-integrity-operator-master.yaml

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ base_images:
77
name: release
88
namespace: openshift
99
tag: rhel-9-release-golang-1.22-openshift-4.17
10+
operator-sdk:
11+
name: "4.18"
12+
namespace: origin
13+
tag: operator-sdk
1014
rosa-aws-cli:
1115
name: rosa-aws-cli
1216
namespace: ci
@@ -31,6 +35,8 @@ operator:
3135
substitutions:
3236
- pullspec: quay.io/file-integrity-operator/file-integrity-operator:1.3.0
3337
with: pipeline:file-integrity-operator
38+
- pullspec: quay.io/file-integrity-operator/file-integrity-operator:latest
39+
with: pipeline:file-integrity-operator
3440
promotion:
3541
to:
3642
- name: "4.18"
@@ -107,26 +113,32 @@ tests:
107113
- as: e2e-bundle-aws
108114
steps:
109115
cluster_profile: aws
110-
dependencies:
111-
OO_INDEX: ci-index-file-integrity-operator-bundle
112-
env:
113-
OO_CHANNEL: alpha
114-
OO_INSTALL_NAMESPACE: file-integrity
115-
OO_PACKAGE: file-integrity-operator
116-
OO_TARGET_NAMESPACES: '!install'
117116
test:
117+
- as: install
118+
cli: latest
119+
commands: |
120+
oc create namespace openshift-file-integrity
121+
operator-sdk run bundle -n openshift-file-integrity "$OO_BUNDLE"
122+
oc wait --for condition=Available -n openshift-file-integrity deployment file-integrity-operator
123+
dependencies:
124+
- env: OO_BUNDLE
125+
name: file-integrity-operator-bundle
126+
from: operator-sdk
127+
resources:
128+
requests:
129+
cpu: 100m
118130
- as: test-bundle
119131
cli: latest
120-
commands: TEST_BUNDLE_INSTALL=1 TEST_WATCH_NAMESPACE=file-integrity TEST_OPERATOR_NAMESPACE=file-integrity
121-
make e2e
132+
commands: TEST_BUNDLE_INSTALL=1 TEST_WATCH_NAMESPACE=openshift-file-integrity
133+
TEST_OPERATOR_NAMESPACE=openshift-file-integrity make e2e
122134
dependencies:
123135
- env: IMAGE_FROM_CI
124136
name: file-integrity-operator
125137
from: src
126138
resources:
127139
requests:
128140
cpu: 100m
129-
workflow: optional-operators-ci-aws
141+
workflow: ipi-aws
130142
- as: e2e-bundle-aws-upgrade
131143
steps:
132144
cluster_profile: aws

0 commit comments

Comments
 (0)