From 5707bd60116cfbdc44029f2d2b1f02555ee1b65f Mon Sep 17 00:00:00 2001 From: Qiaoling Tang <38000637+QiaolingTang@users.noreply.github.com> Date: Wed, 25 Dec 2024 15:59:02 +0800 Subject: [PATCH] update steps to deploy logging operators --- ...__amd64-nightly-openshift-logging-5.6.yaml | 13 +- ...__amd64-nightly-openshift-logging-5.7.yaml | 13 +- ...__amd64-nightly-openshift-logging-5.7.yaml | 13 +- ...__amd64-nightly-openshift-logging-5.8.yaml | 14 +- ...__arm64-nightly-openshift-logging-5.7.yaml | 13 +- ...__amd64-nightly-openshift-logging-5.8.yaml | 14 +- ...__amd64-nightly-openshift-logging-6.0.yaml | 11 +- ...__arm64-nightly-openshift-logging-5.8.yaml | 14 +- ...__multi-nightly-openshift-logging-5.7.yaml | 13 +- ...__amd64-nightly-openshift-logging-5.9.yaml | 30 ++--- ...__multi-nightly-openshift-logging-5.8.yaml | 14 +- ...5__multi-stable-openshift-logging-6.0.yaml | 11 +- ...5__multi-stable-openshift-logging-6.1.yaml | 11 +- ...__amd64-nightly-openshift-logging-5.9.yaml | 15 +-- ...6__amd64-stable-openshift-logging-6.0.yaml | 11 +- ...6__amd64-stable-openshift-logging-6.1.yaml | 11 +- ...7__multi-stable-openshift-logging-6.0.yaml | 11 +- ...7__multi-stable-openshift-logging-6.1.yaml | 11 +- ...__amd64-nightly-openshift-logging-6.1.yaml | 11 +- .../subscribe/cluster-logging-operator/OWNERS | 12 -- ...cribe-cluster-logging-operator-commands.sh | 120 ------------------ ...cluster-logging-operator-ref.metadata.json | 19 --- ...ubscribe-cluster-logging-operator-ref.yaml | 26 ---- .../subscribe/elasticsearch-operator/OWNERS | 12 -- .../elasticsearch-operator/README.md | 44 ------- ...bscribe-elasticsearch-operator-commands.sh | 107 ---------------- ...e-elasticsearch-operator-ref.metadata.json | 19 --- ...-subscribe-elasticsearch-operator-ref.yaml | 26 ---- .../subscribe/loki-operator/OWNERS | 12 -- ...torhub-subscribe-loki-operator-commands.sh | 107 ---------------- ...-subscribe-loki-operator-ref.metadata.json | 19 --- ...eratorhub-subscribe-loki-operator-ref.yaml | 26 ---- 32 files changed, 132 insertions(+), 671 deletions(-) delete mode 100644 ci-operator/step-registry/operatorhub/subscribe/cluster-logging-operator/OWNERS delete mode 100755 ci-operator/step-registry/operatorhub/subscribe/cluster-logging-operator/operatorhub-subscribe-cluster-logging-operator-commands.sh delete mode 100644 ci-operator/step-registry/operatorhub/subscribe/cluster-logging-operator/operatorhub-subscribe-cluster-logging-operator-ref.metadata.json delete mode 100644 ci-operator/step-registry/operatorhub/subscribe/cluster-logging-operator/operatorhub-subscribe-cluster-logging-operator-ref.yaml delete mode 100644 ci-operator/step-registry/operatorhub/subscribe/elasticsearch-operator/OWNERS delete mode 100644 ci-operator/step-registry/operatorhub/subscribe/elasticsearch-operator/README.md delete mode 100755 ci-operator/step-registry/operatorhub/subscribe/elasticsearch-operator/operatorhub-subscribe-elasticsearch-operator-commands.sh delete mode 100644 ci-operator/step-registry/operatorhub/subscribe/elasticsearch-operator/operatorhub-subscribe-elasticsearch-operator-ref.metadata.json delete mode 100644 ci-operator/step-registry/operatorhub/subscribe/elasticsearch-operator/operatorhub-subscribe-elasticsearch-operator-ref.yaml delete mode 100644 ci-operator/step-registry/operatorhub/subscribe/loki-operator/OWNERS delete mode 100755 ci-operator/step-registry/operatorhub/subscribe/loki-operator/operatorhub-subscribe-loki-operator-commands.sh delete mode 100644 ci-operator/step-registry/operatorhub/subscribe/loki-operator/operatorhub-subscribe-loki-operator-ref.metadata.json delete mode 100644 ci-operator/step-registry/operatorhub/subscribe/loki-operator/operatorhub-subscribe-loki-operator-ref.yaml diff --git a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.12__amd64-nightly-openshift-logging-5.6.yaml b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.12__amd64-nightly-openshift-logging-5.6.yaml index ec9abc7693fb..744001c1d1d6 100644 --- a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.12__amd64-nightly-openshift-logging-5.6.yaml +++ b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.12__amd64-nightly-openshift-logging-5.6.yaml @@ -52,14 +52,17 @@ tests: cluster_profile: azure-qe env: BASE_DOMAIN: qe.azure.devcluster.openshift.com - CLO_SUB_CHANNEL: stable-5.6 COMPUTE_NODE_TYPE: Standard_D4s_v3 E2E_RUN_TAGS: '@logging5.6' - EO_SUB_CHANNEL: stable-5.6 FILTERS_ADDITIONAL: "" FIPS_ENABLED: "true" - LO_SUB_CHANNEL: stable-5.6 LOGGING_INDEX_IMAGE: quay.io/openshift-qe-optional-operators/aosqe-index:log5.6 + OPERATORS: | + [ + {"name": "elasticsearch-operator", "source": "qe-app-registry", "channel": "stable-5.6", "install_namespace": "openshift-operators-redhat","target_namespaces": "", "operator_group": "openshift-operators-redhat"}, + {"name": "loki-operator", "source": "qe-app-registry", "channel": "stable-5.6", "install_namespace": "openshift-operators-redhat","target_namespaces": "", "operator_group": "openshift-operators-redhat"}, + {"name": "cluster-logging", "source": "qe-app-registry", "channel": "stable-5.6", "install_namespace": "openshift-logging","target_namespaces": "openshift-logging", "operator_group": "openshift-logging"} + ] TEST_ADDITIONAL: "" TEST_FILTERS: CPaasrunOnly;CPaasrunBoth TEST_IMPORTANCE: "" @@ -69,9 +72,7 @@ tests: TEST_TIMEOUT: "15" test: - ref: enable-qe-catalogsource-logging - - ref: operatorhub-subscribe-elasticsearch-operator - - ref: operatorhub-subscribe-cluster-logging-operator - - ref: operatorhub-subscribe-loki-operator + - ref: install-operators - chain: openshift-e2e-test-logging-qe workflow: cucushift-installer-rehearse-azure-ipi zz_generated_metadata: diff --git a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.12__amd64-nightly-openshift-logging-5.7.yaml b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.12__amd64-nightly-openshift-logging-5.7.yaml index b432ed56578f..267e3186fe85 100644 --- a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.12__amd64-nightly-openshift-logging-5.7.yaml +++ b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.12__amd64-nightly-openshift-logging-5.7.yaml @@ -52,14 +52,17 @@ tests: cluster_profile: azure-qe env: BASE_DOMAIN: qe.azure.devcluster.openshift.com - CLO_SUB_CHANNEL: stable-5.7 COMPUTE_NODE_TYPE: Standard_D4s_v3 E2E_RUN_TAGS: '@logging5.7' - EO_SUB_CHANNEL: stable-5.7 FILTERS_ADDITIONAL: "" FIPS_ENABLED: "true" - LO_SUB_CHANNEL: stable-5.7 LOGGING_INDEX_IMAGE: quay.io/openshift-qe-optional-operators/aosqe-index:log5.7 + OPERATORS: | + [ + {"name": "elasticsearch-operator", "source": "qe-app-registry", "channel": "stable-5.7", "install_namespace": "openshift-operators-redhat","target_namespaces": "", "operator_group": "openshift-operators-redhat"}, + {"name": "loki-operator", "source": "qe-app-registry", "channel": "stable-5.7", "install_namespace": "openshift-operators-redhat","target_namespaces": "", "operator_group": "openshift-operators-redhat"}, + {"name": "cluster-logging", "source": "qe-app-registry", "channel": "stable-5.7", "install_namespace": "openshift-logging","target_namespaces": "openshift-logging", "operator_group": "openshift-logging"} + ] TEST_ADDITIONAL: "" TEST_FILTERS: CPaasrunOnly;CPaasrunBoth;~Disruptive&;~Longduration& TEST_IMPORTANCE: "" @@ -69,9 +72,7 @@ tests: TEST_TIMEOUT: "15" test: - ref: enable-qe-catalogsource-logging - - ref: operatorhub-subscribe-elasticsearch-operator - - ref: operatorhub-subscribe-cluster-logging-operator - - ref: operatorhub-subscribe-loki-operator + - ref: install-operators - chain: openshift-e2e-test-logging-qe workflow: cucushift-installer-rehearse-azure-ipi zz_generated_metadata: diff --git a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.13__amd64-nightly-openshift-logging-5.7.yaml b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.13__amd64-nightly-openshift-logging-5.7.yaml index 682b6e506ce4..d007b1820d6b 100644 --- a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.13__amd64-nightly-openshift-logging-5.7.yaml +++ b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.13__amd64-nightly-openshift-logging-5.7.yaml @@ -51,14 +51,17 @@ tests: steps: cluster_profile: gcp-qe env: - CLO_SUB_CHANNEL: stable-5.7 COMPUTE_NODE_TYPE: e2-standard-4 E2E_RUN_TAGS: '@logging5.7' - EO_SUB_CHANNEL: stable-5.7 FILTERS_ADDITIONAL: "" FORCE_SUCCESS_EXIT: "true" - LO_SUB_CHANNEL: stable-5.7 LOGGING_INDEX_IMAGE: quay.io/openshift-qe-optional-operators/aosqe-index:log5.7 + OPERATORS: | + [ + {"name": "elasticsearch-operator", "source": "qe-app-registry", "channel": "stable-5.7", "install_namespace": "openshift-operators-redhat","target_namespaces": "", "operator_group": "openshift-operators-redhat"}, + {"name": "loki-operator", "source": "qe-app-registry", "channel": "stable-5.7", "install_namespace": "openshift-operators-redhat","target_namespaces": "", "operator_group": "openshift-operators-redhat"}, + {"name": "cluster-logging", "source": "qe-app-registry", "channel": "stable-5.7", "install_namespace": "openshift-logging","target_namespaces": "openshift-logging", "operator_group": "openshift-logging"} + ] TEST_ADDITIONAL: "" TEST_FILTERS: CPaasrunOnly;CPaasrunBoth;~Disruptive&;~Longduration& TEST_IMPORTANCE: "" @@ -68,9 +71,7 @@ tests: TEST_TIMEOUT: "15" test: - ref: enable-qe-catalogsource-logging - - ref: operatorhub-subscribe-elasticsearch-operator - - ref: operatorhub-subscribe-cluster-logging-operator - - ref: operatorhub-subscribe-loki-operator + - ref: install-operators - chain: openshift-e2e-test-logging-qe workflow: cucushift-installer-rehearse-gcp-ipi-proxy-etcd-encryption zz_generated_metadata: diff --git a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.13__amd64-nightly-openshift-logging-5.8.yaml b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.13__amd64-nightly-openshift-logging-5.8.yaml index fe433626c5d2..c9744a3cd8f3 100644 --- a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.13__amd64-nightly-openshift-logging-5.8.yaml +++ b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.13__amd64-nightly-openshift-logging-5.8.yaml @@ -52,15 +52,17 @@ tests: cluster_profile: azure-qe env: BASE_DOMAIN: qe.azure.devcluster.openshift.com - CLO_SUB_CHANNEL: stable-5.8 - CLO_TARGET_NAMESPACES: "" COMPUTE_NODE_TYPE: Standard_D4s_v3 E2E_RUN_TAGS: '@logging5.8' - EO_SUB_CHANNEL: stable-5.8 FILTERS_ADDITIONAL: "" FORCE_SUCCESS_EXIT: "true" - LO_SUB_CHANNEL: stable-5.8 LOGGING_INDEX_IMAGE: quay.io/openshift-qe-optional-operators/aosqe-index:log5.8 + OPERATORS: | + [ + {"name": "elasticsearch-operator", "source": "qe-app-registry", "channel": "stable-5.8", "install_namespace": "openshift-operators-redhat","target_namespaces": "", "operator_group": "openshift-operators-redhat"}, + {"name": "loki-operator", "source": "qe-app-registry", "channel": "stable-5.8", "install_namespace": "openshift-operators-redhat","target_namespaces": "", "operator_group": "openshift-operators-redhat"}, + {"name": "cluster-logging", "source": "qe-app-registry", "channel": "stable-5.8", "install_namespace": "openshift-logging","target_namespaces": "", "operator_group": "openshift-logging"} + ] TEST_ADDITIONAL: "" TEST_FILTERS: CPaasrunOnly;CPaasrunBoth;~Disruptive&;~Longduration& TEST_IMPORTANCE: "" @@ -70,9 +72,7 @@ tests: TEST_TIMEOUT: "15" test: - ref: enable-qe-catalogsource-logging - - ref: operatorhub-subscribe-elasticsearch-operator - - ref: operatorhub-subscribe-cluster-logging-operator - - ref: operatorhub-subscribe-loki-operator + - ref: install-operators - chain: openshift-e2e-test-logging-qe workflow: cucushift-installer-rehearse-azure-ipi-proxy-workers-rhcos-rhel8 zz_generated_metadata: diff --git a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.13__arm64-nightly-openshift-logging-5.7.yaml b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.13__arm64-nightly-openshift-logging-5.7.yaml index 7d3f98145050..a42d9ae0d541 100644 --- a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.13__arm64-nightly-openshift-logging-5.7.yaml +++ b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.13__arm64-nightly-openshift-logging-5.7.yaml @@ -61,23 +61,24 @@ tests: env: BASE_DOMAIN: qe.azure.devcluster.openshift.com BOOTSTRAP_NODE_TYPE: Standard_D4ps_v5 - CLO_SUB_CHANNEL: stable-5.7 COMPUTE_NODE_TYPE: Standard_D8ps_v5 CONTROL_PLANE_NODE_TYPE: Standard_D8ps_v5 - EO_SUB_CHANNEL: stable-5.7 FORCE_SUCCESS_EXIT: "true" - LO_SUB_CHANNEL: stable-5.7 LOGGING_INDEX_IMAGE: quay.io/openshift-qe-optional-operators/aosqe-index:log5.7 OCP_ARCH: arm64 + OPERATORS: | + [ + {"name": "elasticsearch-operator", "source": "qe-app-registry", "channel": "stable-5.7", "install_namespace": "openshift-operators-redhat","target_namespaces": "", "operator_group": "openshift-operators-redhat"}, + {"name": "loki-operator", "source": "qe-app-registry", "channel": "stable-5.7", "install_namespace": "openshift-operators-redhat","target_namespaces": "", "operator_group": "openshift-operators-redhat"}, + {"name": "cluster-logging", "source": "qe-app-registry", "channel": "stable-5.7", "install_namespace": "openshift-logging","target_namespaces": "openshift-logging", "operator_group": "openshift-logging"} + ] TEST_FILTERS: Disruptive;Longduration TEST_PARALLEL: "3" TEST_SCENARIOS: sig-openshift-logging TEST_TIMEOUT: "30" test: - ref: enable-qe-catalogsource-logging - - ref: operatorhub-subscribe-elasticsearch-operator - - ref: operatorhub-subscribe-cluster-logging-operator - - ref: operatorhub-subscribe-loki-operator + - ref: install-operators - chain: openshift-e2e-test-logging-qe-disruptive workflow: cucushift-installer-rehearse-azure-upi zz_generated_metadata: diff --git a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.14__amd64-nightly-openshift-logging-5.8.yaml b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.14__amd64-nightly-openshift-logging-5.8.yaml index ca405e5245d9..c4794ba594ab 100644 --- a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.14__amd64-nightly-openshift-logging-5.8.yaml +++ b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.14__amd64-nightly-openshift-logging-5.8.yaml @@ -49,16 +49,18 @@ tests: steps: cluster_profile: gcp-qe env: - CLO_SUB_CHANNEL: stable-5.8 - CLO_TARGET_NAMESPACES: "" COMPUTE_NODE_TYPE: e2-standard-8 E2E_RUN_TAGS: '@logging5.8' - EO_SUB_CHANNEL: stable-5.8 FILTERS_ADDITIONAL: "" FIPS_ENABLED: "true" FORCE_SUCCESS_EXIT: "true" - LO_SUB_CHANNEL: stable-5.8 LOGGING_INDEX_IMAGE: quay.io/openshift-qe-optional-operators/aosqe-index:log5.8 + OPERATORS: | + [ + {"name": "elasticsearch-operator", "source": "qe-app-registry", "channel": "stable-5.8", "install_namespace": "openshift-operators-redhat","target_namespaces": "", "operator_group": "openshift-operators-redhat"}, + {"name": "loki-operator", "source": "qe-app-registry", "channel": "stable-5.8", "install_namespace": "openshift-operators-redhat","target_namespaces": "", "operator_group": "openshift-operators-redhat"}, + {"name": "cluster-logging", "source": "qe-app-registry", "channel": "stable-5.8", "install_namespace": "openshift-logging","target_namespaces": "", "operator_group": "openshift-logging"} + ] TEST_ADDITIONAL: "" TEST_FILTERS: CPaasrunOnly;CPaasrunBoth;~Disruptive&;~Longduration& TEST_IMPORTANCE: "" @@ -68,9 +70,7 @@ tests: TEST_TIMEOUT: "15" test: - ref: enable-qe-catalogsource-logging - - ref: operatorhub-subscribe-elasticsearch-operator - - ref: operatorhub-subscribe-cluster-logging-operator - - ref: operatorhub-subscribe-loki-operator + - ref: install-operators - chain: openshift-e2e-test-logging-qe workflow: cucushift-installer-rehearse-gcp-ipi-sdn zz_generated_metadata: diff --git a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.14__amd64-nightly-openshift-logging-6.0.yaml b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.14__amd64-nightly-openshift-logging-6.0.yaml index 53d40066e7b1..b6a85ec15533 100644 --- a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.14__amd64-nightly-openshift-logging-6.0.yaml +++ b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.14__amd64-nightly-openshift-logging-6.0.yaml @@ -43,14 +43,16 @@ tests: steps: cluster_profile: gcp-qe env: - CLO_SUB_CHANNEL: stable-6.0 - CLO_TARGET_NAMESPACES: "" COMPUTE_NODE_TYPE: e2-standard-8 FILTERS_ADDITIONAL: "" FIPS_ENABLED: "true" FORCE_SUCCESS_EXIT: "true" - LO_SUB_CHANNEL: stable-6.0 LOGGING_INDEX_IMAGE: quay.io/openshift-qe-optional-operators/aosqe-index:log6.0 + OPERATORS: | + [ + {"name": "loki-operator", "source": "qe-app-registry", "channel": "stable-6.0", "install_namespace": "openshift-operators-redhat","target_namespaces": "", "operator_group": "openshift-operators-redhat"}, + {"name": "cluster-logging", "source": "qe-app-registry", "channel": "stable-6.0", "install_namespace": "openshift-logging","target_namespaces": "", "operator_group": "openshift-logging"} + ] TEST_ADDITIONAL: "" TEST_FILTERS: CPaasrunOnly;CPaasrunBoth;~Disruptive&;~Longduration& TEST_IMPORTANCE: "" @@ -60,8 +62,7 @@ tests: TEST_TIMEOUT: "15" test: - ref: enable-qe-catalogsource-logging - - ref: operatorhub-subscribe-cluster-logging-operator - - ref: operatorhub-subscribe-loki-operator + - ref: install-operators - chain: openshift-e2e-test-logging-qe workflow: cucushift-installer-rehearse-gcp-ipi-sdn zz_generated_metadata: diff --git a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.14__arm64-nightly-openshift-logging-5.8.yaml b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.14__arm64-nightly-openshift-logging-5.8.yaml index 45084e79ca51..a14aa611f594 100644 --- a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.14__arm64-nightly-openshift-logging-5.8.yaml +++ b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.14__arm64-nightly-openshift-logging-5.8.yaml @@ -68,24 +68,24 @@ tests: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-latest env: BASE_DOMAIN: qe.devcluster.openshift.com - CLO_SUB_CHANNEL: stable-5.8 - CLO_TARGET_NAMESPACES: "" COMPUTE_NODE_TYPE: m6g.xlarge CONTROL_PLANE_INSTANCE_TYPE: m6g.xlarge - EO_SUB_CHANNEL: stable-5.8 FORCE_SUCCESS_EXIT: "true" - LO_SUB_CHANNEL: stable-5.8 LOGGING_INDEX_IMAGE: quay.io/openshift-qe-optional-operators/aosqe-index:log5.8 OCP_ARCH: arm64 + OPERATORS: | + [ + {"name": "elasticsearch-operator", "source": "qe-app-registry", "channel": "stable-5.8", "install_namespace": "openshift-operators-redhat","target_namespaces": "", "operator_group": "openshift-operators-redhat"}, + {"name": "loki-operator", "source": "qe-app-registry", "channel": "stable-5.8", "install_namespace": "openshift-operators-redhat","target_namespaces": "", "operator_group": "openshift-operators-redhat"}, + {"name": "cluster-logging", "source": "qe-app-registry", "channel": "stable-5.8", "install_namespace": "openshift-logging","target_namespaces": "", "operator_group": "openshift-logging"} + ] TEST_FILTERS: Disruptive;Longduration TEST_PARALLEL: "3" TEST_SCENARIOS: sig-openshift-logging TEST_TIMEOUT: "30" test: - ref: enable-qe-catalogsource-logging - - ref: operatorhub-subscribe-elasticsearch-operator - - ref: operatorhub-subscribe-cluster-logging-operator - - ref: operatorhub-subscribe-loki-operator + - ref: install-operators - chain: openshift-e2e-test-logging-qe-disruptive workflow: cucushift-installer-rehearse-aws-ipi zz_generated_metadata: diff --git a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.14__multi-nightly-openshift-logging-5.7.yaml b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.14__multi-nightly-openshift-logging-5.7.yaml index ebde2ef0cfc1..cdf263d4a43e 100644 --- a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.14__multi-nightly-openshift-logging-5.7.yaml +++ b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.14__multi-nightly-openshift-logging-5.7.yaml @@ -52,12 +52,15 @@ tests: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:multi-latest env: BASE_DOMAIN: qe.devcluster.openshift.com - CLO_SUB_CHANNEL: stable-5.7 E2E_RUN_TAGS: '@logging5.7' - EO_SUB_CHANNEL: stable-5.7 FILTERS_ADDITIONAL: "" - LO_SUB_CHANNEL: stable-5.7 LOGGING_INDEX_IMAGE: quay.io/openshift-qe-optional-operators/aosqe-index:log5.7 + OPERATORS: | + [ + {"name": "elasticsearch-operator", "source": "qe-app-registry", "channel": "stable-5.7", "install_namespace": "openshift-operators-redhat","target_namespaces": "", "operator_group": "openshift-operators-redhat"}, + {"name": "loki-operator", "source": "qe-app-registry", "channel": "stable-5.7", "install_namespace": "openshift-operators-redhat","target_namespaces": "", "operator_group": "openshift-operators-redhat"}, + {"name": "cluster-logging", "source": "qe-app-registry", "channel": "stable-5.7", "install_namespace": "openshift-logging","target_namespaces": "openshift-logging", "operator_group": "openshift-logging"} + ] TEST_ADDITIONAL: "" TEST_FILTERS: CPaasrunOnly;CPaasrunBoth;~Disruptive&;~Longduration& TEST_IMPORTANCE: "" @@ -68,9 +71,7 @@ tests: test: - ref: ipi-install-heterogeneous - ref: enable-qe-catalogsource-logging - - ref: operatorhub-subscribe-elasticsearch-operator - - ref: operatorhub-subscribe-cluster-logging-operator - - ref: operatorhub-subscribe-loki-operator + - ref: install-operators - chain: openshift-e2e-test-logging-qe workflow: cucushift-installer-rehearse-aws-ipi-ovn-ipsec zz_generated_metadata: diff --git a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.15__amd64-nightly-openshift-logging-5.9.yaml b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.15__amd64-nightly-openshift-logging-5.9.yaml index 8120951dab74..1d515d817d0d 100644 --- a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.15__amd64-nightly-openshift-logging-5.9.yaml +++ b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.15__amd64-nightly-openshift-logging-5.9.yaml @@ -84,15 +84,16 @@ tests: cluster_profile: azure-qe env: BASE_DOMAIN: qe.azure.devcluster.openshift.com - CLO_SUB_CHANNEL: stable-5.9 - CLO_TARGET_NAMESPACES: "" COMPUTE_NODE_TYPE: Standard_D4s_v3 - EO_SUB_CHANNEL: stable - EO_SUB_SOURCE: redhat-operators FILTERS_ADDITIONAL: "" FORCE_SUCCESS_EXIT: "true" - LO_SUB_CHANNEL: stable-5.9 LOGGING_INDEX_IMAGE: quay.io/openshift-qe-optional-operators/aosqe-index:log5.9 + OPERATORS: | + [ + {"name": "elasticsearch-operator", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-operators-redhat","target_namespaces": "", "operator_group": "openshift-operators-redhat"}, + {"name": "loki-operator", "source": "qe-app-registry", "channel": "stable-5.9", "install_namespace": "openshift-operators-redhat","target_namespaces": "", "operator_group": "openshift-operators-redhat"}, + {"name": "cluster-logging-operator", "source": "qe-app-registry", "channel": "stable-5.9", "install_namespace": "openshift-logging","target_namespaces": "", "operator_group": "openshift-logging"} + ] TEST_ADDITIONAL: "" TEST_FILTERS: CPaasrunOnly;CPaasrunBoth;~Disruptive&;~Longduration& TEST_IMPORTANCE: "" @@ -102,9 +103,7 @@ tests: TEST_TIMEOUT: "15" test: - ref: enable-qe-catalogsource-logging - - ref: operatorhub-subscribe-cluster-logging-operator - - ref: operatorhub-subscribe-loki-operator - - ref: operatorhub-subscribe-elasticsearch-operator + - ref: install-operators - chain: openshift-e2e-test-logging-qe workflow: cucushift-installer-rehearse-azure-ipi-proxy-workers-rhcos-rhel8 - as: aws-ipi-f14-disruptive-logging @@ -113,23 +112,22 @@ tests: cluster_profile: aws-qe env: BASE_DOMAIN: qe.devcluster.openshift.com - CLO_SUB_CHANNEL: stable-5.9 - CLO_TARGET_NAMESPACES: "" COMPUTE_NODE_TYPE: m5.2xlarge - EO_SUB_CHANNEL: stable - EO_SUB_SOURCE: redhat-operators FORCE_SUCCESS_EXIT: "true" - LO_SUB_CHANNEL: stable-5.9 LOGGING_INDEX_IMAGE: quay.io/openshift-qe-optional-operators/aosqe-index:log5.9 + OPERATORS: | + [ + {"name": "elasticsearch-operator", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-operators-redhat","target_namespaces": "", "operator_group": "openshift-operators-redhat"}, + {"name": "loki-operator", "source": "qe-app-registry", "channel": "stable-5.9", "install_namespace": "openshift-operators-redhat","target_namespaces": "", "operator_group": "openshift-operators-redhat"}, + {"name": "cluster-logging", "source": "qe-app-registry", "channel": "stable-5.9", "install_namespace": "openshift-logging","target_namespaces": "", "operator_group": "openshift-logging"} + ] TEST_FILTERS: Disruptive;Longduration TEST_PARALLEL: "3" TEST_SCENARIOS: sig-openshift-logging TEST_TIMEOUT: "30" test: - ref: enable-qe-catalogsource-logging - - ref: operatorhub-subscribe-cluster-logging-operator - - ref: operatorhub-subscribe-loki-operator - - ref: operatorhub-subscribe-elasticsearch-operator + - ref: install-operators - chain: openshift-e2e-test-logging-qe-disruptive workflow: cucushift-installer-rehearse-aws-ipi zz_generated_metadata: diff --git a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.15__multi-nightly-openshift-logging-5.8.yaml b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.15__multi-nightly-openshift-logging-5.8.yaml index ba2b5e4383a2..c4ed77c404e2 100644 --- a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.15__multi-nightly-openshift-logging-5.8.yaml +++ b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.15__multi-nightly-openshift-logging-5.8.yaml @@ -55,17 +55,19 @@ tests: ADDITIONAL_WORKER_VM_TYPE: m6i.xlarge ADDITIONAL_WORKERS: "1" BASE_DOMAIN: qe.devcluster.openshift.com - CLO_SUB_CHANNEL: stable-5.8 - CLO_TARGET_NAMESPACES: "" COMPUTE_NODE_REPLICAS: "2" COMPUTE_NODE_TYPE: m6g.xlarge CONTROL_PLANE_INSTANCE_TYPE: m6g.xlarge E2E_RUN_TAGS: '@logging5.8' - EO_SUB_CHANNEL: stable-5.8 FILTERS_ADDITIONAL: "" - LO_SUB_CHANNEL: stable-5.8 LOGGING_INDEX_IMAGE: quay.io/openshift-qe-optional-operators/aosqe-index:log5.8 OCP_ARCH: arm64 + OPERATORS: | + [ + {"name": "elasticsearch-operator", "source": "qe-app-registry", "channel": "stable-5.8", "install_namespace": "openshift-operators-redhat","target_namespaces": "", "operator_group": "openshift-operators-redhat"}, + {"name": "loki-operator", "source": "qe-app-registry", "channel": "stable-5.8", "install_namespace": "openshift-operators-redhat","target_namespaces": "", "operator_group": "openshift-operators-redhat"}, + {"name": "cluster-logging", "source": "qe-app-registry", "channel": "stable-5.8", "install_namespace": "openshift-logging","target_namespaces": "", "operator_group": "openshift-logging"} + ] TEST_ADDITIONAL: "" TEST_FILTERS: CPaasrunOnly;CPaasrunBoth;~Disruptive&;~Longduration& TEST_IMPORTANCE: "" @@ -76,9 +78,7 @@ tests: test: - ref: ipi-install-heterogeneous - ref: enable-qe-catalogsource-logging - - ref: operatorhub-subscribe-elasticsearch-operator - - ref: operatorhub-subscribe-cluster-logging-operator - - ref: operatorhub-subscribe-loki-operator + - ref: install-operators - chain: openshift-e2e-test-logging-qe workflow: cucushift-installer-rehearse-aws-ipi-ovn-ipsec zz_generated_metadata: diff --git a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.15__multi-stable-openshift-logging-6.0.yaml b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.15__multi-stable-openshift-logging-6.0.yaml index f39ef7687325..37d03e4c8b63 100644 --- a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.15__multi-stable-openshift-logging-6.0.yaml +++ b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.15__multi-stable-openshift-logging-6.0.yaml @@ -59,22 +59,23 @@ tests: cluster_profile: azure-qe env: BASE_DOMAIN: qe.azure.devcluster.openshift.com - CLO_SUB_CHANNEL: stable-6.0 - CLO_TARGET_NAMESPACES: "" COMPUTE_NODE_TYPE: Standard_D4ps_v5 EXTRACT_MANIFEST_INCLUDED: "true" FORCE_SUCCESS_EXIT: "true" - LO_SUB_CHANNEL: stable-6.0 LOGGING_INDEX_IMAGE: quay.io/openshift-qe-optional-operators/aosqe-index:log6.0 OCP_ARCH: arm64 + OPERATORS: | + [ + {"name": "loki-operator", "source": "qe-app-registry", "channel": "stable-6.0", "install_namespace": "openshift-operators-redhat","target_namespaces": "", "operator_group": "openshift-operators-redhat"}, + {"name": "cluster-logging", "source": "qe-app-registry", "channel": "stable-6.0", "install_namespace": "openshift-logging","target_namespaces": "", "operator_group": "openshift-logging"} + ] TEST_FILTERS: CPaasrunOnly;CPaasrunBoth;~Disruptive&;~Longduration& TEST_PARALLEL: "3" TEST_SCENARIOS: sig-openshift-logging TEST_TIMEOUT: "30" test: - ref: enable-qe-catalogsource-logging - - ref: operatorhub-subscribe-cluster-logging-operator - - ref: operatorhub-subscribe-loki-operator + - ref: install-operators - chain: openshift-e2e-test-logging-qe workflow: cucushift-installer-rehearse-azure-ipi-cco-manual-workload-identity zz_generated_metadata: diff --git a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.15__multi-stable-openshift-logging-6.1.yaml b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.15__multi-stable-openshift-logging-6.1.yaml index 69cf8f019ea6..3f815d8342e8 100644 --- a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.15__multi-stable-openshift-logging-6.1.yaml +++ b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.15__multi-stable-openshift-logging-6.1.yaml @@ -64,22 +64,23 @@ tests: cluster_profile: azure-qe env: BASE_DOMAIN: qe.azure.devcluster.openshift.com - CLO_SUB_CHANNEL: stable-6.1 - CLO_TARGET_NAMESPACES: "" COMPUTE_NODE_TYPE: Standard_D4ps_v5 EXTRACT_MANIFEST_INCLUDED: "true" FORCE_SUCCESS_EXIT: "true" - LO_SUB_CHANNEL: stable-6.1 LOGGING_INDEX_IMAGE: quay.io/openshift-qe-optional-operators/aosqe-index:log6.1 OCP_ARCH: arm64 + OPERATORS: | + [ + {"name": "loki-operator", "source": "qe-app-registry", "channel": "stable-6.1", "install_namespace": "openshift-operators-redhat","target_namespaces": "", "operator_group": "openshift-operators-redhat"}, + {"name": "cluster-logging", "source": "qe-app-registry", "channel": "stable-6.1", "install_namespace": "openshift-logging","target_namespaces": "", "operator_group": "openshift-logging"} + ] TEST_FILTERS: CPaasrunOnly;CPaasrunBoth;~Disruptive&;~Longduration& TEST_PARALLEL: "3" TEST_SCENARIOS: sig-openshift-logging TEST_TIMEOUT: "30" test: - ref: enable-qe-catalogsource-logging - - ref: operatorhub-subscribe-cluster-logging-operator - - ref: operatorhub-subscribe-loki-operator + - ref: install-operators - chain: openshift-e2e-test-logging-qe workflow: cucushift-installer-rehearse-azure-ipi-cco-manual-workload-identity zz_generated_metadata: diff --git a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.16__amd64-nightly-openshift-logging-5.9.yaml b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.16__amd64-nightly-openshift-logging-5.9.yaml index a175db277fce..9b7b5bb2df4b 100644 --- a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.16__amd64-nightly-openshift-logging-5.9.yaml +++ b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.16__amd64-nightly-openshift-logging-5.9.yaml @@ -79,15 +79,16 @@ tests: steps: cluster_profile: gcp-qe env: - CLO_SUB_CHANNEL: stable-5.9 - CLO_TARGET_NAMESPACES: "" COMPUTE_NODE_TYPE: e2-standard-8 - EO_SUB_CHANNEL: stable - EO_SUB_SOURCE: redhat-operators FILTERS_ADDITIONAL: "" FORCE_SUCCESS_EXIT: "true" - LO_SUB_CHANNEL: stable-5.9 LOGGING_INDEX_IMAGE: quay.io/openshift-qe-optional-operators/aosqe-index:log5.9 + OPERATORS: | + [ + {"name": "elasticsearch-operator", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-operators-redhat","target_namespaces": "", "operator_group": "openshift-operators-redhat"}, + {"name": "loki-operator", "source": "qe-app-registry", "channel": "stable-5.9", "install_namespace": "openshift-operators-redhat","target_namespaces": "", "operator_group": "openshift-operators-redhat"}, + {"name": "cluster-logging", "source": "qe-app-registry", "channel": "stable-5.9", "install_namespace": "openshift-logging","target_namespaces": "", "operator_group": "openshift-logging"} + ] TEST_ADDITIONAL: "" TEST_FILTERS: CPaasrunOnly;CPaasrunBoth;~Disruptive&;~Longduration& TEST_IMPORTANCE: "" @@ -97,9 +98,7 @@ tests: TEST_TIMEOUT: "15" test: - ref: enable-qe-catalogsource-logging - - ref: operatorhub-subscribe-cluster-logging-operator - - ref: operatorhub-subscribe-loki-operator - - ref: operatorhub-subscribe-elasticsearch-operator + - ref: install-operators - chain: openshift-e2e-test-logging-qe workflow: cucushift-installer-rehearse-gcp-ipi-ovn-ipsec zz_generated_metadata: diff --git a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.16__amd64-stable-openshift-logging-6.0.yaml b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.16__amd64-stable-openshift-logging-6.0.yaml index b03db83de20f..bde71967acfd 100644 --- a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.16__amd64-stable-openshift-logging-6.0.yaml +++ b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.16__amd64-stable-openshift-logging-6.0.yaml @@ -62,14 +62,16 @@ tests: steps: cluster_profile: gcp-qe env: - CLO_SUB_CHANNEL: stable-6.0 - CLO_TARGET_NAMESPACES: "" COMPUTE_NODE_TYPE: e2-standard-8 EXTRACT_MANIFEST_INCLUDED: "true" FILTERS_ADDITIONAL: "" FORCE_SUCCESS_EXIT: "true" - LO_SUB_CHANNEL: stable-6.0 LOGGING_INDEX_IMAGE: quay.io/openshift-qe-optional-operators/aosqe-index:log6.0 + OPERATORS: | + [ + {"name": "loki-operator", "source": "qe-app-registry", "channel": "stable-6.0", "install_namespace": "openshift-operators-redhat","target_namespaces": "", "operator_group": "openshift-operators-redhat"}, + {"name": "cluster-logging", "source": "qe-app-registry", "channel": "stable-6.0", "install_namespace": "openshift-logging","target_namespaces": "", "operator_group": "openshift-logging"} + ] TEST_ADDITIONAL: "" TEST_FILTERS: CPaasrunOnly;CPaasrunBoth;~Disruptive&;~Longduration& TEST_IMPORTANCE: "" @@ -79,8 +81,7 @@ tests: TEST_TIMEOUT: "15" test: - ref: enable-qe-catalogsource-logging - - ref: operatorhub-subscribe-cluster-logging-operator - - ref: operatorhub-subscribe-loki-operator + - ref: install-operators - chain: openshift-e2e-test-logging-qe workflow: cucushift-installer-rehearse-gcp-ipi-proxy-cco-manual-workload-identity zz_generated_metadata: diff --git a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.16__amd64-stable-openshift-logging-6.1.yaml b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.16__amd64-stable-openshift-logging-6.1.yaml index 8b7708c8a142..b7632d667a43 100644 --- a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.16__amd64-stable-openshift-logging-6.1.yaml +++ b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.16__amd64-stable-openshift-logging-6.1.yaml @@ -67,14 +67,16 @@ tests: steps: cluster_profile: gcp-qe env: - CLO_SUB_CHANNEL: stable-6.1 - CLO_TARGET_NAMESPACES: "" COMPUTE_NODE_TYPE: e2-standard-8 EXTRACT_MANIFEST_INCLUDED: "true" FILTERS_ADDITIONAL: "" FORCE_SUCCESS_EXIT: "true" - LO_SUB_CHANNEL: stable-6.1 LOGGING_INDEX_IMAGE: quay.io/openshift-qe-optional-operators/aosqe-index:log6.1 + OPERATORS: | + [ + {"name": "loki-operator", "source": "qe-app-registry", "channel": "stable-6.1", "install_namespace": "openshift-operators-redhat","target_namespaces": "", "operator_group": "openshift-operators-redhat"}, + {"name": "cluster-logging", "source": "qe-app-registry", "channel": "stable-6.1", "install_namespace": "openshift-logging","target_namespaces": "", "operator_group": "openshift-logging"} + ] TEST_ADDITIONAL: "" TEST_FILTERS: CPaasrunOnly;CPaasrunBoth;~Disruptive&;~Longduration& TEST_IMPORTANCE: "" @@ -84,8 +86,7 @@ tests: TEST_TIMEOUT: "15" test: - ref: enable-qe-catalogsource-logging - - ref: operatorhub-subscribe-cluster-logging-operator - - ref: operatorhub-subscribe-loki-operator + - ref: install-operators - chain: openshift-e2e-test-logging-qe workflow: cucushift-installer-rehearse-gcp-ipi-proxy-cco-manual-workload-identity zz_generated_metadata: diff --git a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.17__multi-stable-openshift-logging-6.0.yaml b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.17__multi-stable-openshift-logging-6.0.yaml index 3a1354f7b3cb..698b681f83b0 100644 --- a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.17__multi-stable-openshift-logging-6.0.yaml +++ b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.17__multi-stable-openshift-logging-6.0.yaml @@ -46,16 +46,18 @@ tests: ADDITIONAL_WORKER_VM_TYPE: m6i.xlarge ADDITIONAL_WORKERS: "1" BASE_DOMAIN: qe.devcluster.openshift.com - CLO_SUB_CHANNEL: stable-6.0 - CLO_TARGET_NAMESPACES: "" COMPUTE_NODE_REPLICAS: "2" COMPUTE_NODE_TYPE: m6g.xlarge CONTROL_PLANE_INSTANCE_TYPE: m6g.xlarge EXTRACT_MANIFEST_INCLUDED: "true" FILTERS_ADDITIONAL: "" - LO_SUB_CHANNEL: stable-6.0 LOGGING_INDEX_IMAGE: quay.io/openshift-qe-optional-operators/aosqe-index:log6.0 OCP_ARCH: arm64 + OPERATORS: | + [ + {"name": "loki-operator", "source": "qe-app-registry", "channel": "stable-6.0", "install_namespace": "openshift-operators-redhat","target_namespaces": "", "operator_group": "openshift-operators-redhat"}, + {"name": "cluster-logging", "source": "qe-app-registry", "channel": "stable-6.0", "install_namespace": "openshift-logging","target_namespaces": "", "operator_group": "openshift-logging"} + ] TEST_ADDITIONAL: "" TEST_FILTERS: CPaasrunOnly;CPaasrunBoth;~Disruptive&;~Longduration& TEST_IMPORTANCE: "" @@ -66,8 +68,7 @@ tests: test: - ref: ipi-install-heterogeneous - ref: enable-qe-catalogsource-logging - - ref: operatorhub-subscribe-cluster-logging-operator - - ref: operatorhub-subscribe-loki-operator + - ref: install-operators - chain: openshift-e2e-test-logging-qe workflow: cucushift-installer-rehearse-aws-ipi-proxy-cco-manual-security-token-service zz_generated_metadata: diff --git a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.17__multi-stable-openshift-logging-6.1.yaml b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.17__multi-stable-openshift-logging-6.1.yaml index d8f64d21af6a..3d10ac143645 100644 --- a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.17__multi-stable-openshift-logging-6.1.yaml +++ b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.17__multi-stable-openshift-logging-6.1.yaml @@ -51,16 +51,18 @@ tests: ADDITIONAL_WORKER_VM_TYPE: m6i.xlarge ADDITIONAL_WORKERS: "1" BASE_DOMAIN: qe.devcluster.openshift.com - CLO_SUB_CHANNEL: stable-6.1 - CLO_TARGET_NAMESPACES: "" COMPUTE_NODE_REPLICAS: "2" COMPUTE_NODE_TYPE: m6g.xlarge CONTROL_PLANE_INSTANCE_TYPE: m6g.xlarge EXTRACT_MANIFEST_INCLUDED: "true" FILTERS_ADDITIONAL: "" - LO_SUB_CHANNEL: stable-6.1 LOGGING_INDEX_IMAGE: quay.io/openshift-qe-optional-operators/aosqe-index:log6.1 OCP_ARCH: arm64 + OPERATORS: | + [ + {"name": "loki-operator", "source": "qe-app-registry", "channel": "stable-6.1", "install_namespace": "openshift-operators-redhat","target_namespaces": "", "operator_group": "openshift-operators-redhat"}, + {"name": "cluster-logging", "source": "qe-app-registry", "channel": "stable-6.1", "install_namespace": "openshift-logging","target_namespaces": "", "operator_group": "openshift-logging"} + ] TEST_ADDITIONAL: "" TEST_FILTERS: CPaasrunOnly;CPaasrunBoth;~Disruptive&;~Longduration& TEST_IMPORTANCE: "" @@ -71,8 +73,7 @@ tests: test: - ref: ipi-install-heterogeneous - ref: enable-qe-catalogsource-logging - - ref: operatorhub-subscribe-cluster-logging-operator - - ref: operatorhub-subscribe-loki-operator + - ref: install-operators - chain: openshift-e2e-test-logging-qe workflow: cucushift-installer-rehearse-aws-ipi-proxy-cco-manual-security-token-service zz_generated_metadata: diff --git a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.18__amd64-nightly-openshift-logging-6.1.yaml b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.18__amd64-nightly-openshift-logging-6.1.yaml index 54444d8d13b7..98df74d8e1a4 100644 --- a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.18__amd64-nightly-openshift-logging-6.1.yaml +++ b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.18__amd64-nightly-openshift-logging-6.1.yaml @@ -48,14 +48,16 @@ tests: steps: cluster_profile: gcp-qe env: - CLO_SUB_CHANNEL: stable-6.1 - CLO_TARGET_NAMESPACES: "" COMPUTE_NODE_TYPE: e2-standard-8 FILTERS_ADDITIONAL: "" FIPS_ENABLED: "true" FORCE_SUCCESS_EXIT: "true" - LO_SUB_CHANNEL: stable-6.1 LOGGING_INDEX_IMAGE: quay.io/openshift-qe-optional-operators/aosqe-index:log6.1 + OPERATORS: | + [ + {"name": "loki-operator", "source": "qe-app-registry", "channel": "stable-6.1", "install_namespace": "openshift-operators-redhat","target_namespaces": "", "operator_group": "openshift-operators-redhat"}, + {"name": "cluster-logging", "source": "qe-app-registry", "channel": "stable-6.1", "install_namespace": "openshift-logging","target_namespaces": "", "operator_group": "openshift-logging"} + ] TEST_ADDITIONAL: "" TEST_FILTERS: CPaasrunOnly;CPaasrunBoth;~Disruptive&;~Longduration& TEST_IMPORTANCE: "" @@ -65,8 +67,7 @@ tests: TEST_TIMEOUT: "15" test: - ref: enable-qe-catalogsource-logging - - ref: operatorhub-subscribe-cluster-logging-operator - - ref: operatorhub-subscribe-loki-operator + - ref: install-operators - chain: openshift-e2e-test-logging-qe workflow: cucushift-installer-rehearse-gcp-ipi zz_generated_metadata: diff --git a/ci-operator/step-registry/operatorhub/subscribe/cluster-logging-operator/OWNERS b/ci-operator/step-registry/operatorhub/subscribe/cluster-logging-operator/OWNERS deleted file mode 100644 index f30011df855b..000000000000 --- a/ci-operator/step-registry/operatorhub/subscribe/cluster-logging-operator/OWNERS +++ /dev/null @@ -1,12 +0,0 @@ -approvers: - - IshwarKanse - - anpingli - - QiaolingTang - - kabirbhartiRH - - gkarager -reviewers: - - IshwarKanse - - anpingli - - QiaolingTang - - kabirbhartiRH - - gkarager diff --git a/ci-operator/step-registry/operatorhub/subscribe/cluster-logging-operator/operatorhub-subscribe-cluster-logging-operator-commands.sh b/ci-operator/step-registry/operatorhub/subscribe/cluster-logging-operator/operatorhub-subscribe-cluster-logging-operator-commands.sh deleted file mode 100755 index 5b002d4151a0..000000000000 --- a/ci-operator/step-registry/operatorhub/subscribe/cluster-logging-operator/operatorhub-subscribe-cluster-logging-operator-commands.sh +++ /dev/null @@ -1,120 +0,0 @@ -#!/bin/bash - -set -o nounset -set -o errexit -set -o pipefail - -if [ -f "${SHARED_DIR}/proxy-conf.sh" ] ; then - source "${SHARED_DIR}/proxy-conf.sh" -fi - -if [[ -z "${CLO_SUB_INSTALL_NAMESPACE}" ]]; then - echo "ERROR: INSTALL_NAMESPACE is not defined" - exit 1 -fi - -if [[ -z "${CLO_PACKAGE}" ]]; then - echo "ERROR: PACKAGE is not defined" - exit 1 -fi - -if [[ -z "${CLO_SUB_CHANNEL}" ]]; then - echo "ERROR: CLO_SUB_CHANNEL is not defined" - exit 1 -fi - -if [[ "${CLO_TARGET_NAMESPACES}" == "!install" ]]; then - CLO_TARGET_NAMESPACES="${CLO_SUB_INSTALL_NAMESPACE}" -fi - -echo "Installing ${CLO_PACKAGE} from ${CLO_SUB_CHANNEL} into ${CLO_SUB_INSTALL_NAMESPACE}, targeting ${CLO_TARGET_NAMESPACES}" - -# create the install namespace -oc apply -f - < - -## Table of Contents -- [Purpose](#purpose) -- [Process](#process) -- [Prerequisite(s)](#prerequisites) - - [Infrastructure](#infrastructure) - - [Environment Variables](#environment-variables) - -## Purpose - -To deploy the Elasticsearch Operator in a specified namespace using a specified source and channel. - -## Process - -The step's script facilitates the installation of the Elasticsearch Operator on an OpenShift Container Platform. It begins by checking for a proxy configuration file and sourcing it if present. The script then verifies the required environment variables to ensure they are defined. Next, it creates an installation namespace and deploys a new operator group within that namespace. The operator is subscribed to by creating a subscription object, specifying the Elasticsearch Operator package, channel, and source details. Following a short sleep period to allow the resources to become available, the script enters a loop where it checks the deployment status for a specified number of retries. If the Elasticsearch Operator is successfully deployed, a success message is displayed. In the event of a failed deployment, an error message is printed, along with diagnostic information such as listing the catalog source, pods in the marketplace namespace, and providing detailed YAML and description of the failed deployment. The total execution time of the script varies depending on the number of retries and the duration of the sleep intervals between each retry. - -## Prerequisite(s) -- `oc` -### Infrastructure - -- A provisioned test cluster to target. - -### Environment Variables - -- `EO_SUB_PACKAGE` - - **Definition**: The package name of the Elasticsearch operator to install. - - **If left empty**: Will use the "elasticsearch-operator" package. - -- `EO_SUB_SOURCE` - - **Definition**: The catalog source name. - - **If left empty**: Will use the "qe-app-registry" source. - -- `EO_SUB_CHANNEL` - - **Definition**: The channel from which to install the package. - - **If left empty**: Will use the "stable" channel. - -- `EO_SUB_INSTALL_NAMESPACE` - - **Definition**: The namespace into which the operator and catalog will be installed. If empty, a new namespace will be created. - - **If left empty**: Will use the "openshift-operators-redhat" namespace. - -- `EO_SUB_TARGET_NAMESPACES` - - **Definition**: A comma-separated list of namespaces the operator will target. If empty, all namespaces will be targeted. If no OperatorGroup exists in $EO_SUB_INSTALL_NAMESPACE, a new one will be created with its target namespaces set to $EO_SUB_TARGET_NAMESPACES. Otherwise, the existing OperatorGroup's target namespace set will be replaced. The special value "!install" will set the target namespace to the operator's installation namespace. - - **If left empty**: "Will target all namespaces." diff --git a/ci-operator/step-registry/operatorhub/subscribe/elasticsearch-operator/operatorhub-subscribe-elasticsearch-operator-commands.sh b/ci-operator/step-registry/operatorhub/subscribe/elasticsearch-operator/operatorhub-subscribe-elasticsearch-operator-commands.sh deleted file mode 100755 index 723529a3f17d..000000000000 --- a/ci-operator/step-registry/operatorhub/subscribe/elasticsearch-operator/operatorhub-subscribe-elasticsearch-operator-commands.sh +++ /dev/null @@ -1,107 +0,0 @@ -#!/bin/bash - -set -o nounset -set -o errexit -set -o pipefail - -if [ -f "${SHARED_DIR}/proxy-conf.sh" ] ; then - source "${SHARED_DIR}/proxy-conf.sh" -fi - -if [[ -z "${EO_SUB_INSTALL_NAMESPACE}" ]]; then - echo "ERROR: INSTALL_NAMESPACE is not defined" - exit 1 -fi - -if [[ -z "${EO_SUB_PACKAGE}" ]]; then - echo "ERROR: PACKAGE is not defined" - exit 1 -fi - -if [[ -z "${EO_SUB_CHANNEL}" ]]; then - echo "ERROR: EO_SUB_CHANNEL is not defined" - exit 1 -fi - -if [[ "${EO_SUB_TARGET_NAMESPACES}" == "!install" ]]; then - EO_SUB_TARGET_NAMESPACES="${EO_SUB_INSTALL_NAMESPACE}" -fi - -echo "Installing ${EO_SUB_PACKAGE} from ${EO_SUB_CHANNEL} into ${EO_SUB_INSTALL_NAMESPACE}, targeting ${EO_SUB_TARGET_NAMESPACES}" - -# create the install namespace -oc apply -f - <