Skip to content

Commit 878dec1

Browse files
kaovilaiclaudehappy-otter
committed
feat: migrate OADP CI from deprecated OO_INDEX to OO_BUNDLE (FBC)
Migrate all oadp-operator variant CI configs from deprecated index image path to operator-sdk bundle workflow. Also removes EOL oadp-1.0 variant configs and enables TechPreview for OCP 4.22+ testing. Changes per config: - operator.bundles: add as: oadp-operator-bundle + skip_building_index - base_images: add cli-operator-sdk (not in OCP release payload) - dependencies: OO_INDEX: ci-index -> OO_BUNDLE: oadp-operator-bundle - workflow: optional-operators-ci-aws -> optional-operators-ci-operator-sdk-aws - env: replace OO_CHANNEL/OO_PACKAGE/OO_TARGET_NAMESPACES with OO_INSTALL_MODE: OwnNamespace TechPreviewNoUpgrade (OCP 4.22+ configs only): - Enables NewOLMOwnSingleNamespace gate for OLMv1 OwnNamespace support - Enables VolumeGroupSnapshot-based backup/restore testing Unblocks: openshift/oadp-operator#2160 Generated with [Claude Code](https://claude.ai/code) via [Happy](https://happy.engineering) Co-Authored-By: Claude <noreply@anthropic.com> Co-Authored-By: Happy <yesreply@happy.engineering> Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com>
1 parent d2db14c commit 878dec1

22 files changed

Lines changed: 365 additions & 1144 deletions

ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0__4.12.yaml

Lines changed: 0 additions & 95 deletions
This file was deleted.

ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0__4.14.yaml

Lines changed: 0 additions & 95 deletions
This file was deleted.

ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3__4.12.yaml

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
base_images:
2+
cli-operator-sdk:
3+
name: cli-operator-sdk
4+
namespace: ocp
5+
tag: v1.39.2
16
build_root:
27
image_stream_tag:
38
name: builder
@@ -11,7 +16,9 @@ images:
1116
to: test-oadp-operator-1.3
1217
operator:
1318
bundles:
14-
- dockerfile_path: build/Dockerfile.bundle
19+
- as: oadp-operator-bundle
20+
dockerfile_path: build/Dockerfile.bundle
21+
skip_building_index: true
1522
substitutions:
1623
- pullspec: quay.io/konveyor/oadp-operator:oadp-1.3
1724
with: oadp-operator-1.3
@@ -34,12 +41,10 @@ tests:
3441
steps:
3542
cluster_profile: openshift-org-aws
3643
dependencies:
37-
OO_INDEX: ci-index
44+
OO_BUNDLE: oadp-operator-bundle
3845
env:
39-
OO_CHANNEL: stable-1.3
46+
OO_INSTALL_MODE: OwnNamespace
4047
OO_INSTALL_NAMESPACE: openshift-adp
41-
OO_PACKAGE: oadp-operator
42-
OO_TARGET_NAMESPACES: '!install'
4348
test:
4449
- as: e2e
4550
cli: latest
@@ -53,7 +58,7 @@ tests:
5358
requests:
5459
cpu: 1000m
5560
memory: 512Mi
56-
workflow: optional-operators-ci-aws
61+
workflow: optional-operators-ci-operator-sdk-aws
5762
- as: e2e-test-aws-periodic
5863
cron: 0 4 * * *
5964
reporter_config:
@@ -68,12 +73,10 @@ tests:
6873
steps:
6974
cluster_profile: openshift-org-aws
7075
dependencies:
71-
OO_INDEX: ci-index
76+
OO_BUNDLE: oadp-operator-bundle
7277
env:
73-
OO_CHANNEL: stable-1.3
78+
OO_INSTALL_MODE: OwnNamespace
7479
OO_INSTALL_NAMESPACE: openshift-adp
75-
OO_PACKAGE: oadp-operator
76-
OO_TARGET_NAMESPACES: '!install'
7780
test:
7881
- as: e2e
7982
cli: latest
@@ -87,7 +90,7 @@ tests:
8790
requests:
8891
cpu: 1000m
8992
memory: 512Mi
90-
workflow: optional-operators-ci-aws
93+
workflow: optional-operators-ci-operator-sdk-aws
9194
zz_generated_metadata:
9295
branch: oadp-1.3
9396
org: openshift

ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3__4.13.yaml

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
base_images:
2+
cli-operator-sdk:
3+
name: cli-operator-sdk
4+
namespace: ocp
5+
tag: v1.39.2
16
build_root:
27
image_stream_tag:
38
name: builder
@@ -11,7 +16,9 @@ images:
1116
to: test-oadp-operator-1.3
1217
operator:
1318
bundles:
14-
- dockerfile_path: build/Dockerfile.bundle
19+
- as: oadp-operator-bundle
20+
dockerfile_path: build/Dockerfile.bundle
21+
skip_building_index: true
1522
substitutions:
1623
- pullspec: quay.io/konveyor/oadp-operator:oadp-1.3
1724
with: oadp-operator-1.3
@@ -34,12 +41,10 @@ tests:
3441
steps:
3542
cluster_profile: openshift-org-aws
3643
dependencies:
37-
OO_INDEX: ci-index
44+
OO_BUNDLE: oadp-operator-bundle
3845
env:
39-
OO_CHANNEL: stable-1.3
46+
OO_INSTALL_MODE: OwnNamespace
4047
OO_INSTALL_NAMESPACE: openshift-adp
41-
OO_PACKAGE: oadp-operator
42-
OO_TARGET_NAMESPACES: '!install'
4348
test:
4449
- as: e2e
4550
cli: latest
@@ -53,7 +58,7 @@ tests:
5358
requests:
5459
cpu: 1000m
5560
memory: 512Mi
56-
workflow: optional-operators-ci-aws
61+
workflow: optional-operators-ci-operator-sdk-aws
5762
- as: e2e-test-aws-periodic
5863
cron: 7 15 * * 0
5964
reporter_config:
@@ -68,12 +73,10 @@ tests:
6873
steps:
6974
cluster_profile: openshift-org-aws
7075
dependencies:
71-
OO_INDEX: ci-index
76+
OO_BUNDLE: oadp-operator-bundle
7277
env:
73-
OO_CHANNEL: stable-1.3
78+
OO_INSTALL_MODE: OwnNamespace
7479
OO_INSTALL_NAMESPACE: openshift-adp
75-
OO_PACKAGE: oadp-operator
76-
OO_TARGET_NAMESPACES: '!install'
7780
test:
7881
- as: e2e
7982
cli: latest
@@ -87,7 +90,7 @@ tests:
8790
requests:
8891
cpu: 1000m
8992
memory: 512Mi
90-
workflow: optional-operators-ci-aws
93+
workflow: optional-operators-ci-operator-sdk-aws
9194
zz_generated_metadata:
9295
branch: oadp-1.3
9396
org: openshift

ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3__4.14.yaml

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
base_images:
2+
cli-operator-sdk:
3+
name: cli-operator-sdk
4+
namespace: ocp
5+
tag: v1.39.2
16
build_root:
27
image_stream_tag:
38
name: builder
@@ -11,7 +16,9 @@ images:
1116
to: test-oadp-operator-1.3
1217
operator:
1318
bundles:
14-
- dockerfile_path: build/Dockerfile.bundle
19+
- as: oadp-operator-bundle
20+
dockerfile_path: build/Dockerfile.bundle
21+
skip_building_index: true
1522
substitutions:
1623
- pullspec: quay.io/konveyor/oadp-operator:oadp-1.3
1724
with: oadp-operator-1.3
@@ -34,12 +41,10 @@ tests:
3441
steps:
3542
cluster_profile: openshift-org-aws
3643
dependencies:
37-
OO_INDEX: ci-index
44+
OO_BUNDLE: oadp-operator-bundle
3845
env:
39-
OO_CHANNEL: stable-1.3
46+
OO_INSTALL_MODE: OwnNamespace
4047
OO_INSTALL_NAMESPACE: openshift-adp
41-
OO_PACKAGE: oadp-operator
42-
OO_TARGET_NAMESPACES: '!install'
4348
test:
4449
- as: e2e
4550
cli: latest
@@ -53,7 +58,7 @@ tests:
5358
requests:
5459
cpu: 1000m
5560
memory: 512Mi
56-
workflow: optional-operators-ci-aws
61+
workflow: optional-operators-ci-operator-sdk-aws
5762
- as: e2e-test-aws-periodic
5863
cron: 0 4 * * *
5964
reporter_config:
@@ -68,12 +73,10 @@ tests:
6873
steps:
6974
cluster_profile: openshift-org-aws
7075
dependencies:
71-
OO_INDEX: ci-index
76+
OO_BUNDLE: oadp-operator-bundle
7277
env:
73-
OO_CHANNEL: stable-1.3
78+
OO_INSTALL_MODE: OwnNamespace
7479
OO_INSTALL_NAMESPACE: openshift-adp
75-
OO_PACKAGE: oadp-operator
76-
OO_TARGET_NAMESPACES: '!install'
7780
test:
7881
- as: e2e
7982
cli: latest
@@ -87,7 +90,7 @@ tests:
8790
requests:
8891
cpu: 1000m
8992
memory: 512Mi
90-
workflow: optional-operators-ci-aws
93+
workflow: optional-operators-ci-operator-sdk-aws
9194
zz_generated_metadata:
9295
branch: oadp-1.3
9396
org: openshift

0 commit comments

Comments
 (0)