make CLO build clusters instead of claim (openshift#50833)

saifshaikh48 · Apr 23, 2024 · 5afaa95 · 5afaa95
1 parent 6b778ae
commit 5afaa95
Show file tree

Hide file tree

Showing 4 changed files with 84 additions and 790 deletions.
diff --git a/.../config/openshift/cluster-logging-operator/openshift-cluster-logging-operator-master.yaml b/.../config/openshift/cluster-logging-operator/openshift-cluster-logging-operator-master.yaml
@@ -102,9 +102,9 @@ releases:
       name: "4.14"
       namespace: ocp
   latest:
-    integration:
-      name: "4.14"
-      namespace: ocp
+    release:
+      channel: stable
+      version: "4.15"
 resources:
   '*':
     requests:
@@ -121,15 +121,9 @@ tests:
     from: src
   timeout: 15m0s
 - as: e2e-target
-  cluster_claim:
-    architecture: amd64
-    cloud: aws
-    owner: cvp
-    product: ocp
-    timeout: 1h0m0s
-    version: "4.14"
   skip_if_only_changed: ^docs/|^config/docs|\.adoc$|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)
   steps:
+    cluster_profile: aws
     test:
     - as: test
       cli: latest
@@ -169,166 +163,12 @@ tests:
         requests:
           cpu: 100m
       timeout: 3h0m0s
-    workflow: generic-claim
+    workflow: ipi-aws
   timeout: 5h0m0s
-- as: e2e-ocp-target-minus-one
-  cluster_claim:
-    architecture: amd64
-    cloud: aws
-    owner: openshift-ci
-    product: ocp
-    timeout: 1h0m0s
-    version: "4.13"
-  optional: true
-  skip_if_only_changed: ^docs/|^config/docs|\.adoc$|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)
-  steps:
-    test:
-    - as: test
-      cli: latest
-      commands: FAKE_HOME_DIR=/tmp/home LOG_DIR=${ARTIFACT_DIR}/logging-logs ARTIFACT_DIR=${ARTIFACT_DIR}/logging-artifacts
-        make test-e2e-olm
-      dependencies:
-      - env: IMAGE_CLUSTER_LOGGING_OPERATOR_REGISTRY
-        name: pipeline:cluster-logging-operator-registry
-      - env: IMAGE_CLUSTER_LOGGING_OPERATOR
-        name: pipeline:cluster-logging-operator
-      - env: IMAGE_ELASTICSEARCH_OPERATOR
-        name: pipeline:elasticsearch-operator
-      - env: IMAGE_ELASTICSEARCH_OPERATOR_REGISTRY
-        name: pipeline:elasticsearch-operator-registry
-      - env: IMAGE_OAUTH_PROXY
-        name: pipeline:oauth-proxy
-      - env: IMAGE_LOGGING_CONSOLE_PLUGIN
-        name: pipeline:logging-view-plugin
-      - env: RELATED_IMAGE_LOGGING_CONSOLE_PLUGIN
-        name: pipeline:logging-view-plugin
-      - env: IMAGE_LOGGING_FLUENTD
-        name: pipeline:logging-fluentd
-      - env: IMAGE_LOGGING_VECTOR
-        name: pipeline:logging-vector
-      - env: IMAGE_ELASTICSEARCH_PROXY
-        name: pipeline:elasticsearch-proxy
-      - env: IMAGE_ELASTICSEARCH6
-        name: pipeline:logging-elasticsearch6
-      - env: IMAGE_LOGGING_KIBANA6
-        name: pipeline:logging-kibana6
-      - env: IMAGE_LOGGING_EVENTROUTER
-        name: pipeline:logging-eventrouter
-      - env: IMAGE_LOG_FILE_METRIC_EXPORTER
-        name: pipeline:log-file-metric-exporter
-      from: pipeline:cluster-logging-operator-e2e
-      resources:
-        requests:
-          cpu: 100m
-      timeout: 3h0m0s
-    workflow: generic-claim
-  timeout: 5h0m0s
-- as: e2e-ocp-target-minus-two
-  cluster_claim:
-    architecture: amd64
-    cloud: aws
-    owner: openshift-ci
-    product: ocp
-    timeout: 1h0m0s
-    version: "4.12"
-  optional: true
-  skip_if_only_changed: ^docs/|^config/docs|\.adoc$|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)
-  steps:
-    test:
-    - as: test
-      cli: latest
-      commands: FAKE_HOME_DIR=/tmp/home LOG_DIR=${ARTIFACT_DIR}/logging-logs ARTIFACT_DIR=${ARTIFACT_DIR}/logging-artifacts
-        make test-e2e-olm
-      dependencies:
-      - env: IMAGE_CLUSTER_LOGGING_OPERATOR_REGISTRY
-        name: pipeline:cluster-logging-operator-registry
-      - env: IMAGE_CLUSTER_LOGGING_OPERATOR
-        name: pipeline:cluster-logging-operator
-      - env: IMAGE_ELASTICSEARCH_OPERATOR
-        name: pipeline:elasticsearch-operator
-      - env: IMAGE_ELASTICSEARCH_OPERATOR_REGISTRY
-        name: pipeline:elasticsearch-operator-registry
-      - env: IMAGE_OAUTH_PROXY
-        name: pipeline:oauth-proxy
-      - env: IMAGE_LOGGING_CONSOLE_PLUGIN
-        name: pipeline:logging-view-plugin
-      - env: RELATED_IMAGE_LOGGING_CONSOLE_PLUGIN
-        name: pipeline:logging-view-plugin
-      - env: IMAGE_LOGGING_FLUENTD
-        name: pipeline:logging-fluentd
-      - env: IMAGE_LOGGING_VECTOR
-        name: pipeline:logging-vector
-      - env: IMAGE_ELASTICSEARCH_PROXY
-        name: pipeline:elasticsearch-proxy
-      - env: IMAGE_ELASTICSEARCH6
-        name: pipeline:logging-elasticsearch6
-      - env: IMAGE_LOGGING_KIBANA6
-        name: pipeline:logging-kibana6
-      - env: IMAGE_LOGGING_EVENTROUTER
-        name: pipeline:logging-eventrouter
-      - env: IMAGE_LOG_FILE_METRIC_EXPORTER
-        name: pipeline:log-file-metric-exporter
-      from: pipeline:cluster-logging-operator-e2e
-      resources:
-        requests:
-          cpu: 100m
-      timeout: 3h0m0s
-    workflow: generic-claim
-  timeout: 5h0m0s
-- as: functional
-  cluster_claim:
-    architecture: amd64
-    cloud: aws
-    owner: openshift-ci
-    product: ocp
-    timeout: 1h0m0s
-    version: "4.13"
-  optional: true
-  skip_if_only_changed: ^docs/|^config/docs|\.adoc$|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)
-  steps:
-    test:
-    - as: test
-      cli: latest
-      commands: FAKE_HOME_DIR=/tmp/home LOG_DIR=${ARTIFACT_DIR}/logging-logs ARTIFACT_DIR=${ARTIFACT_DIR}/logging-artifacts
-        make test-functional
-      dependencies:
-      - env: IMAGE_CLUSTER_LOGGING_OPERATOR_REGISTRY
-        name: pipeline:cluster-logging-operator-registry
-      - env: IMAGE_CLUSTER_LOGGING_OPERATOR
-        name: pipeline:cluster-logging-operator
-      - env: IMAGE_OAUTH_PROXY
-        name: pipeline:oauth-proxy
-      - env: IMAGE_LOGGING_CONSOLE_PLUGIN
-        name: pipeline:logging-view-plugin
-      - env: IMAGE_LOGGING_FLUENTD
-        name: pipeline:logging-fluentd
-      - env: IMAGE_LOGGING_VECTOR
-        name: pipeline:logging-vector
-      - env: IMAGE_ELASTICSEARCH_PROXY
-        name: pipeline:elasticsearch-proxy
-      - env: IMAGE_ELASTICSEARCH6
-        name: pipeline:logging-elasticsearch6
-      - env: IMAGE_LOGGING_KIBANA6
-        name: pipeline:logging-kibana6
-      - env: IMAGE_LOGGING_EVENTROUTER
-        name: pipeline:logging-eventrouter
-      - env: IMAGE_LOG_FILE_METRIC_EXPORTER
-        name: pipeline:log-file-metric-exporter
-      from: pipeline:cluster-logging-operator-e2e
-      resources:
-        requests:
-          cpu: 100m
-    workflow: generic-claim
 - as: functional-target
-  cluster_claim:
-    architecture: amd64
-    cloud: aws
-    owner: cvp
-    product: ocp
-    timeout: 1h0m0s
-    version: "4.14"
   skip_if_only_changed: ^docs/|^config/docs|\.adoc$|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)
   steps:
+    cluster_profile: aws
     test:
     - as: test
       cli: latest
@@ -361,7 +201,7 @@ tests:
       resources:
         requests:
           cpu: 100m
-    workflow: generic-claim
+    workflow: ipi-aws
 zz_generated_metadata:
   branch: master
   org: openshift