From a465a70b1b28cd1a7f003c1108b6799ba82d3bd3 Mon Sep 17 00:00:00 2001 From: Vivek Shakya Date: Fri, 5 Jul 2024 08:13:12 -0400 Subject: [PATCH 1/2] rename openshift logging config files --- ...t-logging-ocp4.14-lp-rosa-hypershift.yaml} | 2 +- ...t-logging-ocp4.15-lp-rosa-hypershift.yaml} | 4 +- ...logging-interop-ocp-ci-main-periodics.yaml | 40 +++++-------------- 3 files changed, 12 insertions(+), 34 deletions(-) rename ci-operator/config/openshift-logging/interop-ocp-ci/{openshift-logging-interop-ocp-ci-main__hypershift-4.14-lp-rosa-hypershift.yaml => openshift-logging-interop-ocp-ci-main__openshift-logging-ocp4.14-lp-rosa-hypershift.yaml} (98%) rename ci-operator/config/openshift-logging/interop-ocp-ci/{openshift-logging-interop-ocp-ci-main__hypershift-4.15-lp-rosa-hypershift.yaml => openshift-logging-interop-ocp-ci-main__openshift-logging-ocp4.15-lp-rosa-hypershift.yaml} (97%) diff --git a/ci-operator/config/openshift-logging/interop-ocp-ci/openshift-logging-interop-ocp-ci-main__hypershift-4.14-lp-rosa-hypershift.yaml b/ci-operator/config/openshift-logging/interop-ocp-ci/openshift-logging-interop-ocp-ci-main__openshift-logging-ocp4.14-lp-rosa-hypershift.yaml similarity index 98% rename from ci-operator/config/openshift-logging/interop-ocp-ci/openshift-logging-interop-ocp-ci-main__hypershift-4.14-lp-rosa-hypershift.yaml rename to ci-operator/config/openshift-logging/interop-ocp-ci/openshift-logging-interop-ocp-ci-main__openshift-logging-ocp4.14-lp-rosa-hypershift.yaml index 361ff065b6aa..f5420b93ad1b 100644 --- a/ci-operator/config/openshift-logging/interop-ocp-ci/openshift-logging-interop-ocp-ci-main__hypershift-4.14-lp-rosa-hypershift.yaml +++ b/ci-operator/config/openshift-logging/interop-ocp-ci/openshift-logging-interop-ocp-ci-main__openshift-logging-ocp4.14-lp-rosa-hypershift.yaml @@ -103,4 +103,4 @@ zz_generated_metadata: branch: main org: openshift-logging repo: interop-ocp-ci - variant: hypershift-4.14-lp-rosa-hypershift + variant: openshift-logging-ocp4.14-lp-rosa-hypershift diff --git a/ci-operator/config/openshift-logging/interop-ocp-ci/openshift-logging-interop-ocp-ci-main__hypershift-4.15-lp-rosa-hypershift.yaml b/ci-operator/config/openshift-logging/interop-ocp-ci/openshift-logging-interop-ocp-ci-main__openshift-logging-ocp4.15-lp-rosa-hypershift.yaml similarity index 97% rename from ci-operator/config/openshift-logging/interop-ocp-ci/openshift-logging-interop-ocp-ci-main__hypershift-4.15-lp-rosa-hypershift.yaml rename to ci-operator/config/openshift-logging/interop-ocp-ci/openshift-logging-interop-ocp-ci-main__openshift-logging-ocp4.15-lp-rosa-hypershift.yaml index b1ad89aed9d9..6d5eb2fc3631 100644 --- a/ci-operator/config/openshift-logging/interop-ocp-ci/openshift-logging-interop-ocp-ci-main__hypershift-4.15-lp-rosa-hypershift.yaml +++ b/ci-operator/config/openshift-logging/interop-ocp-ci/openshift-logging-interop-ocp-ci-main__openshift-logging-ocp4.15-lp-rosa-hypershift.yaml @@ -46,7 +46,7 @@ resources: cpu: "1" memory: 4Gi tests: -- as: cluster-logging-operator-rosa-hypershift +- as: openshift-logging-rosa-hypershift cron: 0 6 25 10 * steps: cluster_profile: aws-cspi-qe @@ -103,4 +103,4 @@ zz_generated_metadata: branch: main org: openshift-logging repo: interop-ocp-ci - variant: hypershift-4.15-lp-rosa-hypershift + variant: openshift-logging-ocp4.15-lp-rosa-hypershift diff --git a/ci-operator/jobs/openshift-logging/interop-ocp-ci/openshift-logging-interop-ocp-ci-main-periodics.yaml b/ci-operator/jobs/openshift-logging/interop-ocp-ci/openshift-logging-interop-ocp-ci-main-periodics.yaml index 688d2986b957..6c4c85a9fc47 100644 --- a/ci-operator/jobs/openshift-logging/interop-ocp-ci/openshift-logging-interop-ocp-ci-main-periodics.yaml +++ b/ci-operator/jobs/openshift-logging/interop-ocp-ci/openshift-logging-interop-ocp-ci-main-periodics.yaml @@ -12,22 +12,11 @@ periodics: labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: aws-cspi-qe - ci-operator.openshift.io/variant: hypershift-4.14-lp-rosa-hypershift + ci-operator.openshift.io/variant: openshift-logging-ocp4.14-lp-rosa-hypershift ci.openshift.io/generator: prowgen job-release: "4.14" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-logging-interop-ocp-ci-main-hypershift-4.14-lp-rosa-hypershift-cluster-logging-operator-rosa-hypershift - reporter_config: - slack: - channel: '#ocp-logging-ci-report' - job_states_to_report: - - success - - failure - - error - report_template: '{{if eq .Status.State "success"}} :slack-green: Job *{{.Spec.Job}}* - ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> {{else}} :failed: - Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View - logs> {{end}}' + name: periodic-ci-openshift-logging-interop-ocp-ci-main-openshift-logging-ocp4.14-lp-rosa-hypershift-cluster-logging-operator-rosa-hypershift spec: containers: - args: @@ -38,7 +27,7 @@ periodics: - --secret-dir=/secrets/ci-pull-credentials - --secret-dir=/usr/local/cluster-logging-operator-rosa-hypershift-cluster-profile - --target=cluster-logging-operator-rosa-hypershift - - --variant=hypershift-4.14-lp-rosa-hypershift + - --variant=openshift-logging-ocp4.14-lp-rosa-hypershift command: - ci-operator image: ci-operator:latest @@ -104,22 +93,11 @@ periodics: labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: aws-cspi-qe - ci-operator.openshift.io/variant: hypershift-4.15-lp-rosa-hypershift + ci-operator.openshift.io/variant: openshift-logging-ocp4.15-lp-rosa-hypershift ci.openshift.io/generator: prowgen job-release: "4.15" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-logging-interop-ocp-ci-main-hypershift-4.15-lp-rosa-hypershift-cluster-logging-operator-rosa-hypershift - reporter_config: - slack: - channel: '#ocp-logging-ci-report' - job_states_to_report: - - success - - failure - - error - report_template: '{{if eq .Status.State "success"}} :slack-green: Job *{{.Spec.Job}}* - ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> {{else}} :failed: - Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View - logs> {{end}}' + name: periodic-ci-openshift-logging-interop-ocp-ci-main-openshift-logging-ocp4.15-lp-rosa-hypershift-openshift-logging-rosa-hypershift spec: containers: - args: @@ -128,9 +106,9 @@ periodics: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/cluster-logging-operator-rosa-hypershift-cluster-profile - - --target=cluster-logging-operator-rosa-hypershift - - --variant=hypershift-4.15-lp-rosa-hypershift + - --secret-dir=/usr/local/openshift-logging-rosa-hypershift-cluster-profile + - --target=openshift-logging-rosa-hypershift + - --variant=openshift-logging-ocp4.15-lp-rosa-hypershift command: - ci-operator image: ci-operator:latest @@ -146,7 +124,7 @@ periodics: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/cluster-logging-operator-rosa-hypershift-cluster-profile + - mountPath: /usr/local/openshift-logging-rosa-hypershift-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials From f4964adf8b4455709e7e2c468a178b9e6fae9d46 Mon Sep 17 00:00:00 2001 From: Vivek Shakya Date: Mon, 8 Jul 2024 17:02:53 -0400 Subject: [PATCH 2/2] update jira project --- ...ft-logging-ocp4.14-lp-rosa-hypershift.yaml | 2 +- ...ft-logging-ocp4.15-lp-rosa-hypershift.yaml | 2 +- ...logging-interop-ocp-ci-main-periodics.yaml | 22 +++++++++++++++++++ 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/ci-operator/config/openshift-logging/interop-ocp-ci/openshift-logging-interop-ocp-ci-main__openshift-logging-ocp4.14-lp-rosa-hypershift.yaml b/ci-operator/config/openshift-logging/interop-ocp-ci/openshift-logging-interop-ocp-ci-main__openshift-logging-ocp4.14-lp-rosa-hypershift.yaml index f5420b93ad1b..580774d98ab2 100644 --- a/ci-operator/config/openshift-logging/interop-ocp-ci/openshift-logging-interop-ocp-ci-main__openshift-logging-ocp4.14-lp-rosa-hypershift.yaml +++ b/ci-operator/config/openshift-logging/interop-ocp-ci/openshift-logging-interop-ocp-ci-main__openshift-logging-ocp4.14-lp-rosa-hypershift.yaml @@ -60,7 +60,7 @@ tests: { "failure_rules": [ - {"step": "openshift-extended-*", "failure_type": "test_failure", "classification": "Test Failure", "jira_project": "Openshift Logging", "group": {"name": "lp-tests", "priority": 2},"jira_assignee":"anli@redhat.com"} + {"step": "openshift-extended-*", "failure_type": "test_failure", "classification": "Test Failure", "jira_project": "LOG", "group": {"name": "lp-tests", "priority": 2},"jira_assignee":"anli@redhat.com"} ], "success_rules": [ diff --git a/ci-operator/config/openshift-logging/interop-ocp-ci/openshift-logging-interop-ocp-ci-main__openshift-logging-ocp4.15-lp-rosa-hypershift.yaml b/ci-operator/config/openshift-logging/interop-ocp-ci/openshift-logging-interop-ocp-ci-main__openshift-logging-ocp4.15-lp-rosa-hypershift.yaml index 6d5eb2fc3631..1add81f37128 100644 --- a/ci-operator/config/openshift-logging/interop-ocp-ci/openshift-logging-interop-ocp-ci-main__openshift-logging-ocp4.15-lp-rosa-hypershift.yaml +++ b/ci-operator/config/openshift-logging/interop-ocp-ci/openshift-logging-interop-ocp-ci-main__openshift-logging-ocp4.15-lp-rosa-hypershift.yaml @@ -60,7 +60,7 @@ tests: { "failure_rules": [ - {"step": "openshift-extended-*", "failure_type": "test_failure", "classification": "Test Failure", "jira_project": "Openshift Logging", "group": {"name": "lp-tests", "priority": 2},"jira_assignee":"anli@redhat.com"} + {"step": "openshift-extended-*", "failure_type": "test_failure", "classification": "Test Failure", "jira_project": "LOG", "group": {"name": "lp-tests", "priority": 2},"jira_assignee":"anli@redhat.com"} ], "success_rules": [ diff --git a/ci-operator/jobs/openshift-logging/interop-ocp-ci/openshift-logging-interop-ocp-ci-main-periodics.yaml b/ci-operator/jobs/openshift-logging/interop-ocp-ci/openshift-logging-interop-ocp-ci-main-periodics.yaml index 6c4c85a9fc47..5e1892bd4836 100644 --- a/ci-operator/jobs/openshift-logging/interop-ocp-ci/openshift-logging-interop-ocp-ci-main-periodics.yaml +++ b/ci-operator/jobs/openshift-logging/interop-ocp-ci/openshift-logging-interop-ocp-ci-main-periodics.yaml @@ -17,6 +17,17 @@ periodics: job-release: "4.14" pj-rehearse.openshift.io/can-be-rehearsed: "true" name: periodic-ci-openshift-logging-interop-ocp-ci-main-openshift-logging-ocp4.14-lp-rosa-hypershift-cluster-logging-operator-rosa-hypershift + reporter_config: + slack: + channel: '#ocp-logging-ci-report' + job_states_to_report: + - success + - failure + - error + report_template: '{{if eq .Status.State "success"}} :slack-green: Job *{{.Spec.Job}}* + ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> {{else}} :failed: + Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View + logs> {{end}}' spec: containers: - args: @@ -98,6 +109,17 @@ periodics: job-release: "4.15" pj-rehearse.openshift.io/can-be-rehearsed: "true" name: periodic-ci-openshift-logging-interop-ocp-ci-main-openshift-logging-ocp4.15-lp-rosa-hypershift-openshift-logging-rosa-hypershift + reporter_config: + slack: + channel: '#ocp-logging-ci-report' + job_states_to_report: + - success + - failure + - error + report_template: '{{if eq .Status.State "success"}} :slack-green: Job *{{.Spec.Job}}* + ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> {{else}} :failed: + Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View + logs> {{end}}' spec: containers: - args: