From d99b4f409b2a35764a356833b6d13d429039ece8 Mon Sep 17 00:00:00 2001 From: anfranci14 Date: Fri, 3 Jul 2026 13:55:00 -0400 Subject: [PATCH] Add rosa-e2e-ocm-fvt-longrunning step ref for OSDFM jobs --- ...a-e2e-main__ocm-fvt-osdfm-integration.yaml | 4 +- .../rosa/e2e/ocm-fvt/longrunning/OWNERS | 1 + .../rosa-e2e-ocm-fvt-longrunning-commands.sh | 1 + ...-e2e-ocm-fvt-longrunning-ref.metadata.json | 21 ++++++++ .../rosa-e2e-ocm-fvt-longrunning-ref.yaml | 53 +++++++++++++++++++ 5 files changed, 78 insertions(+), 2 deletions(-) create mode 120000 ci-operator/step-registry/rosa/e2e/ocm-fvt/longrunning/OWNERS create mode 120000 ci-operator/step-registry/rosa/e2e/ocm-fvt/longrunning/rosa-e2e-ocm-fvt-longrunning-commands.sh create mode 100644 ci-operator/step-registry/rosa/e2e/ocm-fvt/longrunning/rosa-e2e-ocm-fvt-longrunning-ref.metadata.json create mode 100644 ci-operator/step-registry/rosa/e2e/ocm-fvt/longrunning/rosa-e2e-ocm-fvt-longrunning-ref.yaml diff --git a/ci-operator/config/openshift-online/rosa-e2e/openshift-online-rosa-e2e-main__ocm-fvt-osdfm-integration.yaml b/ci-operator/config/openshift-online/rosa-e2e/openshift-online-rosa-e2e-main__ocm-fvt-osdfm-integration.yaml index cfc063579e909..f9103f772932f 100644 --- a/ci-operator/config/openshift-online/rosa-e2e/openshift-online-rosa-e2e-main__ocm-fvt-osdfm-integration.yaml +++ b/ci-operator/config/openshift-online/rosa-e2e/openshift-online-rosa-e2e-main__ocm-fvt-osdfm-integration.yaml @@ -34,7 +34,7 @@ tests: OCM_FVT_REPORT_JIRA: "false" OCM_FVT_SERVICE: osdfm test: - - ref: rosa-e2e-ocm-fvt + - ref: rosa-e2e-ocm-fvt-longrunning timeout: 12h0m0s - as: ocm-fvt-periodic-osdfm-sc-autoscaling-integration capabilities: @@ -48,7 +48,7 @@ tests: OCM_FVT_REPORT_JIRA: "false" OCM_FVT_SERVICE: osdfm test: - - ref: rosa-e2e-ocm-fvt + - ref: rosa-e2e-ocm-fvt-longrunning timeout: 12h0m0s zz_generated_metadata: branch: main diff --git a/ci-operator/step-registry/rosa/e2e/ocm-fvt/longrunning/OWNERS b/ci-operator/step-registry/rosa/e2e/ocm-fvt/longrunning/OWNERS new file mode 120000 index 0000000000000..ec405d65a79df --- /dev/null +++ b/ci-operator/step-registry/rosa/e2e/ocm-fvt/longrunning/OWNERS @@ -0,0 +1 @@ +../OWNERS \ No newline at end of file diff --git a/ci-operator/step-registry/rosa/e2e/ocm-fvt/longrunning/rosa-e2e-ocm-fvt-longrunning-commands.sh b/ci-operator/step-registry/rosa/e2e/ocm-fvt/longrunning/rosa-e2e-ocm-fvt-longrunning-commands.sh new file mode 120000 index 0000000000000..daa111aea6edb --- /dev/null +++ b/ci-operator/step-registry/rosa/e2e/ocm-fvt/longrunning/rosa-e2e-ocm-fvt-longrunning-commands.sh @@ -0,0 +1 @@ +../rosa-e2e-ocm-fvt-commands.sh \ No newline at end of file diff --git a/ci-operator/step-registry/rosa/e2e/ocm-fvt/longrunning/rosa-e2e-ocm-fvt-longrunning-ref.metadata.json b/ci-operator/step-registry/rosa/e2e/ocm-fvt/longrunning/rosa-e2e-ocm-fvt-longrunning-ref.metadata.json new file mode 100644 index 0000000000000..9b29b98234ae2 --- /dev/null +++ b/ci-operator/step-registry/rosa/e2e/ocm-fvt/longrunning/rosa-e2e-ocm-fvt-longrunning-ref.metadata.json @@ -0,0 +1,21 @@ +{ + "path": "rosa/e2e/ocm-fvt/longrunning/rosa-e2e-ocm-fvt-longrunning-ref.yaml", + "owners": { + "approvers": [ + "bmeng", + "dustman9000", + "gdbranco", + "jfrazierredhat", + "ravitri", + "tiwillia" + ], + "reviewers": [ + "bmeng", + "dustman9000", + "gdbranco", + "jfrazierredhat", + "ravitri", + "tiwillia" + ] + } +} \ No newline at end of file diff --git a/ci-operator/step-registry/rosa/e2e/ocm-fvt/longrunning/rosa-e2e-ocm-fvt-longrunning-ref.yaml b/ci-operator/step-registry/rosa/e2e/ocm-fvt/longrunning/rosa-e2e-ocm-fvt-longrunning-ref.yaml new file mode 100644 index 0000000000000..44a760b841734 --- /dev/null +++ b/ci-operator/step-registry/rosa/e2e/ocm-fvt/longrunning/rosa-e2e-ocm-fvt-longrunning-ref.yaml @@ -0,0 +1,53 @@ +ref: + as: rosa-e2e-ocm-fvt-longrunning + from: nested-podman + commands: rosa-e2e-ocm-fvt-longrunning-commands.sh + nested_podman: true + timeout: 12h0m0s + grace_period: 30s + credentials: + - namespace: ci + name: cs-qe-credentials + mount_path: /usr/local/cs-qe-credentials + resources: + requests: + cpu: 100m + memory: 200Mi + env: + - name: OCM_FVT_JOB_NAME + documentation: |- + Required. The ocmtest job name passed to --job flag. + Example: cs-rosa-hcp-ad-staging-main + - name: OCM_FVT_SERVICE + default: "cms" + documentation: |- + Optional. The ocmtest --service flag value. + Use "cms" for Clusters Service tests (default), "osdfm" for + OSD Fleet Manager tests. + - name: OCM_FVT_REPORT_JIRA + default: "true" + documentation: |- + Optional. Set to "true" to enable Jira reporting via + --reportJiraTicket flag and ENABLE_JIRA_REPORTING env var. + Set to "false" for tests that do not use Jira reporting. + - name: OCM_FVT_OCM_ENV + default: "" + documentation: |- + Optional. OCM environment override. Set to "integration" for + integration tests. When empty, ocmtest uses its default (staging). + - name: OCM_FVT_EXTRA_ENVS + default: "" + documentation: |- + Optional. Newline-delimited KEY=VALUE pairs for additional env vars + injected into the podman container. Example: + DR_AWS_CREDENTIALS_FILE=/credentials/aws_dr_shared_cred + - name: OCM_FVT_GCP_CREDS + default: "false" + documentation: |- + Optional. Set to "true" to mount the GCP credentials file + (osd-ccs-admin.json) into the podman container at + /home/ci-user/.gcp/osd-ccs-admin.json. Required for OSD GCP tests. + documentation: |- + Runs an OCM FVT (Functional Verification Test) using ocmtest inside + a nested podman container. Same as rosa-e2e-ocm-fvt but with a 12h + step timeout for long-running jobs (e.g. OSDFM SC/MC autoscaling).