Skip to content

Commit 9df0ed7

Browse files
gaolgaol
committed
Set the default subscribe catalogsource to the default redhat-operators for lvms-operator, metallb-operator, local-storage-operator
1 parent 137647a commit 9df0ed7

6 files changed

+19
-19
lines changed

‎ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.16__amd64-nightly.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1848,7 +1848,7 @@ tests:
18481848
env:
18491849
LVM_OPERATOR_SUB_CHANNEL: stable-4.16
18501850
MCE_VERSION: "2.6"
1851-
ODF_OPERATOR_SUB_CHANNEL: stable-4.15
1851+
ODF_OPERATOR_SUB_CHANNEL: stable-4.16
18521852
TEST_FILTERS: ~ChkUpgrade&;~DisconnectedOnly&;~NonPreRelease&;~HyperShiftMGMT&;~MicroShiftOnly&;~NonHyperShiftHOST&;~Serial&;~Disruptive&
18531853
TEST_TIMEOUT: "30"
18541854
test:
@@ -1863,7 +1863,7 @@ tests:
18631863
env:
18641864
LVM_OPERATOR_SUB_CHANNEL: stable-4.16
18651865
MCE_VERSION: "2.6"
1866-
ODF_OPERATOR_SUB_CHANNEL: stable-4.15
1866+
ODF_OPERATOR_SUB_CHANNEL: stable-4.16
18671867
TEST_FILTERS: ~ChkUpgrade&;~DisconnectedOnly&;~NonPreRelease&;~HyperShiftMGMT&;~MicroShiftOnly&;~NonHyperShiftHOST&;Serial;Disruptive
18681868
TEST_TIMEOUT: "30"
18691869
test:
@@ -1878,7 +1878,7 @@ tests:
18781878
env:
18791879
LVM_OPERATOR_SUB_CHANNEL: stable-4.16
18801880
MCE_VERSION: "2.6"
1881-
ODF_OPERATOR_SUB_CHANNEL: stable-4.15
1881+
ODF_OPERATOR_SUB_CHANNEL: stable-4.16
18821882
test:
18831883
- chain: openshift-e2e-test-hypershift-qe-mgmt
18841884
workflow: cucushift-installer-rehearse-baremetalds-ipi-ovn-ipv4-kubevirt-hypershift-mce
@@ -1892,7 +1892,7 @@ tests:
18921892
ATTACH_DEFAULT_NETWORK: "true"
18931893
LVM_OPERATOR_SUB_CHANNEL: stable-4.16
18941894
MCE_VERSION: "2.6"
1895-
ODF_OPERATOR_SUB_CHANNEL: stable-4.15
1895+
ODF_OPERATOR_SUB_CHANNEL: stable-4.16
18961896
TEST_FILTERS: ~ChkUpgrade&;~DisconnectedOnly&;~NonPreRelease&;~HyperShiftMGMT&;~MicroShiftOnly&;~NonHyperShiftHOST&;~Serial&;~Disruptive&
18971897
TEST_TIMEOUT: "30"
18981898
test:
@@ -1908,7 +1908,7 @@ tests:
19081908
ATTACH_DEFAULT_NETWORK: "true"
19091909
LVM_OPERATOR_SUB_CHANNEL: stable-4.16
19101910
MCE_VERSION: "2.6"
1911-
ODF_OPERATOR_SUB_CHANNEL: stable-4.15
1911+
ODF_OPERATOR_SUB_CHANNEL: stable-4.16
19121912
test:
19131913
- chain: openshift-e2e-test-hypershift-qe-mgmt
19141914
workflow: cucushift-installer-rehearse-baremetalds-ipi-ovn-ipv4-kubevirt-hypershift-mce

‎ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.18__amd64-nightly.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3487,7 +3487,7 @@ tests:
34873487
env:
34883488
LVM_OPERATOR_SUB_CHANNEL: stable-4.18
34893489
MCE_VERSION: "2.8"
3490-
ODF_OPERATOR_SUB_CHANNEL: stable-4.17
3490+
ODF_OPERATOR_SUB_CHANNEL: stable-4.18
34913491
TEST_FILTERS: ~ChkUpgrade&;~DisconnectedOnly&;~NonPreRelease&;~HyperShiftMGMT&;~MicroShiftOnly&;~NonHyperShiftHOST&;Serial;Disruptive
34923492
TEST_TIMEOUT: "30"
34933493
test:
@@ -3502,7 +3502,7 @@ tests:
35023502
env:
35033503
LVM_OPERATOR_SUB_CHANNEL: stable-4.18
35043504
MCE_VERSION: "2.8"
3505-
ODF_OPERATOR_SUB_CHANNEL: stable-4.17
3505+
ODF_OPERATOR_SUB_CHANNEL: stable-4.18
35063506
TEST_FILTERS: ~ChkUpgrade&;~DisconnectedOnly&;~NonPreRelease&;~HyperShiftMGMT&;~MicroShiftOnly&;~NonHyperShiftHOST&;~Serial&;~Disruptive&
35073507
TEST_TIMEOUT: "30"
35083508
test:
@@ -3517,7 +3517,7 @@ tests:
35173517
env:
35183518
LVM_OPERATOR_SUB_CHANNEL: stable-4.18
35193519
MCE_VERSION: "2.8"
3520-
ODF_OPERATOR_SUB_CHANNEL: stable-4.17
3520+
ODF_OPERATOR_SUB_CHANNEL: stable-4.18
35213521
test:
35223522
- chain: openshift-e2e-test-hypershift-qe-mgmt
35233523
workflow: cucushift-installer-rehearse-baremetalds-ipi-ovn-ipv4-kubevirt-hypershift-mce

‎ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.19__amd64-nightly.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3794,7 +3794,7 @@ tests:
37943794
env:
37953795
LVM_OPERATOR_SUB_CHANNEL: stable-4.19
37963796
MCE_VERSION: "2.9"
3797-
ODF_OPERATOR_SUB_CHANNEL: stable-4.18
3797+
ODF_OPERATOR_SUB_CHANNEL: stable-4.19
37983798
TEST_FILTERS: ~ChkUpgrade&;~DisconnectedOnly&;~NonPreRelease&;~HyperShiftMGMT&;~MicroShiftOnly&;~NonHyperShiftHOST&;Serial;Disruptive
37993799
TEST_TIMEOUT: "30"
38003800
test:
@@ -3809,7 +3809,7 @@ tests:
38093809
env:
38103810
LVM_OPERATOR_SUB_CHANNEL: stable-4.19
38113811
MCE_VERSION: "2.9"
3812-
ODF_OPERATOR_SUB_CHANNEL: stable-4.18
3812+
ODF_OPERATOR_SUB_CHANNEL: stable-4.19
38133813
TEST_FILTERS: ~ChkUpgrade&;~DisconnectedOnly&;~NonPreRelease&;~HyperShiftMGMT&;~MicroShiftOnly&;~NonHyperShiftHOST&;~Serial&;~Disruptive&
38143814
TEST_TIMEOUT: "30"
38153815
test:
@@ -3824,7 +3824,7 @@ tests:
38243824
env:
38253825
LVM_OPERATOR_SUB_CHANNEL: stable-4.19
38263826
MCE_VERSION: "2.9"
3827-
ODF_OPERATOR_SUB_CHANNEL: stable-4.18
3827+
ODF_OPERATOR_SUB_CHANNEL: stable-4.19
38283828
test:
38293829
- chain: openshift-e2e-test-hypershift-qe-mgmt
38303830
workflow: cucushift-installer-rehearse-baremetalds-ipi-ovn-ipv4-kubevirt-hypershift-mce

‎ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.20__amd64-nightly.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2547,7 +2547,7 @@ tests:
25472547
env:
25482548
LVM_OPERATOR_SUB_CHANNEL: stable-4.20
25492549
MCE_VERSION: "2.10"
2550-
ODF_OPERATOR_SUB_CHANNEL: stable-4.19
2550+
ODF_OPERATOR_SUB_CHANNEL: stable-4.20
25512551
test:
25522552
- chain: openshift-e2e-test-hypershift-qe-mgmt
25532553
workflow: cucushift-installer-rehearse-baremetalds-ipi-ovn-ipv4-kubevirt-hypershift-mce
@@ -2562,7 +2562,7 @@ tests:
25622562
env:
25632563
LVM_OPERATOR_SUB_CHANNEL: stable-4.20
25642564
MCE_VERSION: "2.10"
2565-
ODF_OPERATOR_SUB_CHANNEL: stable-4.19
2565+
ODF_OPERATOR_SUB_CHANNEL: stable-4.20
25662566
TEST_FILTERS: ~ChkUpgrade&;~DisconnectedOnly&;~NonPreRelease&;~HyperShiftMGMT&;~MicroShiftOnly&;~NonHyperShiftHOST&;~Serial&;~Disruptive&
25672567
TEST_TIMEOUT: "30"
25682568
test:

‎ci-operator/step-registry/cucushift/installer/rehearse/baremetalds/ipi/ovn/ipv4/kubevirt/hypershift/mce/cucushift-installer-rehearse-baremetalds-ipi-ovn-ipv4-kubevirt-hypershift-mce-workflow.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ workflow:
99
- ref: send-results-to-reportportal
1010
env:
1111
HYPERSHIFT_NAMESPACE: "local-cluster"
12-
METALLB_OPERATOR_SUB_SOURCE: qe-app-registry
13-
LOCAL_STORAGE_OPERATOR_SUB_SOURCE: qe-app-registry
14-
LVM_OPERATOR_SUB_SOURCE: qe-app-registry
12+
METALLB_OPERATOR_SUB_SOURCE: "redhat-operators"
13+
LOCAL_STORAGE_OPERATOR_SUB_SOURCE: "redhat-operators"
14+
LVM_OPERATOR_SUB_SOURCE: "redhat-operators"
1515
LVM_SUB_TARGET_NAMESPACES: openshift-lvm-storage
1616
LVM_OPERATOR_SUB_INSTALL_NAMESPACE: openshift-lvm-storage
1717
ETCD_STORAGE_CLASS: lvms-vg1

‎ci-operator/step-registry/cucushift/installer/rehearse/baremetalds/ipi/ovn/ipv4/kubevirt/hypershift/mce/guest/cucushift-installer-rehearse-baremetalds-ipi-ovn-ipv4-kubevirt-hypershift-mce-guest-workflow.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ workflow:
1111
- ref: send-results-to-reportportal
1212
env:
1313
HYPERSHIFT_NAMESPACE: "local-cluster"
14-
METALLB_OPERATOR_SUB_SOURCE: qe-app-registry
15-
LOCAL_STORAGE_OPERATOR_SUB_SOURCE: qe-app-registry
16-
LVM_OPERATOR_SUB_SOURCE: qe-app-registry
14+
METALLB_OPERATOR_SUB_SOURCE: "redhat-operators"
15+
LOCAL_STORAGE_OPERATOR_SUB_SOURCE: "redhat-operators"
16+
LVM_OPERATOR_SUB_SOURCE: "redhat-operators"
1717
LVM_SUB_TARGET_NAMESPACES: openshift-lvm-storage
1818
LVM_OPERATOR_SUB_INSTALL_NAMESPACE: openshift-lvm-storage
1919
ETCD_STORAGE_CLASS: lvms-vg1

0 commit comments

Comments
 (0)