Skip to content

ROSAENG-1340: Consolidate OCM FVT configs into shared step registry ref #79840

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
May 29, 2026
Merged

ROSAENG-1340: Consolidate OCM FVT configs into shared step registry ref #79840

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
135 changes: 18 additions & 117 deletions ...ig/openshift-online/rosa-e2e/openshift-online-rosa-e2e-main__ocm-fvt-osd-gcp-staging.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,135 +25,36 @@ tests:
- as: ocm-fvt-periodic-cs-osd-ccs-gcp-ad-staging-main
capabilities:
- nested-podman
commands: |
old_umask=$(umask)
umask 077
podman_env_file="$(mktemp /tmp/podman.env.XXXXXX)"
trap 'rm -f "${podman_env_file}"' EXIT
umask "$old_umask"

JOB_LINK="https://prow.ci.openshift.org/view/gs/test-platform-results/"
if [ -n "${PULL_NUMBER:-}" ]; then
JOB_LINK="${JOB_LINK}pr-logs/pull/openshift_release/${PULL_NUMBER}/${JOB_NAME}/${BUILD_ID}"
else
JOB_LINK="${JOB_LINK}logs/${JOB_NAME}/${BUILD_ID}"
fi

env -i bash --norc --noprofile << EOF > "${podman_env_file}"
export AWS_SHARED_CREDENTIALS_FILE=/credentials/aws-cred
export SHARED_VPC_AWS_SHARED_CREDENTIALS_FILE=/credentials/aws-shared-vpc-credentials
export ENABLE_JIRA_REPORTING=true
export JOB_LINK="${JOB_LINK}"
source /usr/local/cs-qe-credentials/ocm-tokens
source /usr/local/cs-qe-credentials/jira-cred
env | grep -v '^_='
EOF

podman run \
--authfile /usr/local/cs-qe-credentials/.dockerconfigjson \
--env-file "${podman_env_file}" \
-v /usr/local/cs-qe-credentials:/credentials:ro,z \
-v /usr/local/cs-qe-credentials/osd-ccs-admin.json:/home/ci-user/.gcp/osd-ccs-admin.json:ro,z \
--rm \
quay.io/redhat-services-prod/ocmci/ocmci:latest \
ocmtest test --service cms --job cs-osd-ccs-gcp-ad-staging-main --reportJiraTicket
container:
from: nested-podman
memory_backed_volume:
size: 1Gi
cron: 0 9 * * *
nested_podman: true
secrets:
- mount_path: /usr/local/cs-qe-credentials
name: cs-qe-credentials
steps:
env:
OCM_FVT_GCP_CREDS: "true"
OCM_FVT_JOB_NAME: cs-osd-ccs-gcp-ad-staging-main
test:
- ref: rosa-e2e-ocm-fvt
- as: ocm-fvt-periodic-cs-osd-ccs-gcp-marketplace-staging-main
capabilities:
- nested-podman
commands: |
old_umask=$(umask)
umask 077
podman_env_file="$(mktemp /tmp/podman.env.XXXXXX)"
trap 'rm -f "${podman_env_file}"' EXIT
umask "$old_umask"

JOB_LINK="https://prow.ci.openshift.org/view/gs/test-platform-results/"
if [ -n "${PULL_NUMBER:-}" ]; then
JOB_LINK="${JOB_LINK}pr-logs/pull/openshift_release/${PULL_NUMBER}/${JOB_NAME}/${BUILD_ID}"
else
JOB_LINK="${JOB_LINK}logs/${JOB_NAME}/${BUILD_ID}"
fi

env -i bash --norc --noprofile << EOF > "${podman_env_file}"
export AWS_SHARED_CREDENTIALS_FILE=/credentials/aws-cred
export SHARED_VPC_AWS_SHARED_CREDENTIALS_FILE=/credentials/aws-shared-vpc-credentials
export ENABLE_JIRA_REPORTING=true
export JOB_LINK="${JOB_LINK}"
source /usr/local/cs-qe-credentials/ocm-tokens
source /usr/local/cs-qe-credentials/jira-cred
env | grep -v '^_='
EOF

podman run \
--authfile /usr/local/cs-qe-credentials/.dockerconfigjson \
--env-file "${podman_env_file}" \
-v /usr/local/cs-qe-credentials:/credentials:ro,z \
-v /usr/local/cs-qe-credentials/osd-ccs-admin.json:/home/ci-user/.gcp/osd-ccs-admin.json:ro,z \
--rm \
quay.io/redhat-services-prod/ocmci/ocmci:latest \
ocmtest test --service cms --job cs-osd-ccs-gcp-marketplace-staging-main --reportJiraTicket
container:
from: nested-podman
memory_backed_volume:
size: 1Gi
cron: 0 8 * * *
nested_podman: true
secrets:
- mount_path: /usr/local/cs-qe-credentials
name: cs-qe-credentials
steps:
env:
OCM_FVT_GCP_CREDS: "true"
OCM_FVT_JOB_NAME: cs-osd-ccs-gcp-marketplace-staging-main
test:
- ref: rosa-e2e-ocm-fvt
- as: ocm-fvt-periodic-cs-osd-gcp-non-cross-proj-wif-staging-main
capabilities:
- nested-podman
commands: |
old_umask=$(umask)
umask 077
podman_env_file="$(mktemp /tmp/podman.env.XXXXXX)"
trap 'rm -f "${podman_env_file}"' EXIT
umask "$old_umask"

JOB_LINK="https://prow.ci.openshift.org/view/gs/test-platform-results/"
if [ -n "${PULL_NUMBER:-}" ]; then
JOB_LINK="${JOB_LINK}pr-logs/pull/openshift_release/${PULL_NUMBER}/${JOB_NAME}/${BUILD_ID}"
else
JOB_LINK="${JOB_LINK}logs/${JOB_NAME}/${BUILD_ID}"
fi

env -i bash --norc --noprofile << EOF > "${podman_env_file}"
export AWS_SHARED_CREDENTIALS_FILE=/credentials/aws-cred
export SHARED_VPC_AWS_SHARED_CREDENTIALS_FILE=/credentials/aws-shared-vpc-credentials
export ENABLE_JIRA_REPORTING=true
export JOB_LINK="${JOB_LINK}"
source /usr/local/cs-qe-credentials/ocm-tokens
source /usr/local/cs-qe-credentials/jira-cred
env | grep -v '^_='
EOF

podman run \
--authfile /usr/local/cs-qe-credentials/.dockerconfigjson \
--env-file "${podman_env_file}" \
-v /usr/local/cs-qe-credentials:/credentials:ro,z \
-v /usr/local/cs-qe-credentials/osd-ccs-admin.json:/home/ci-user/.gcp/osd-ccs-admin.json:ro,z \
--rm \
quay.io/redhat-services-prod/ocmci/ocmci:latest \
ocmtest test --service cms --job cs-osd-gcp-non-cross-project-wif-staging-main --reportJiraTicket
container:
from: nested-podman
memory_backed_volume:
size: 1Gi
cron: 0 9 * * *
nested_podman: true
secrets:
- mount_path: /usr/local/cs-qe-credentials
name: cs-qe-credentials
steps:
env:
OCM_FVT_GCP_CREDS: "true"
OCM_FVT_JOB_NAME: cs-osd-gcp-non-cross-project-wif-staging-main
test:
- ref: rosa-e2e-ocm-fvt
zz_generated_metadata:
branch: main
org: openshift-online
Expand Down
43 changes: 5 additions & 38 deletions ...ift-online/rosa-e2e/openshift-online-rosa-e2e-main__ocm-fvt-rosa-classic-integration.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,46 +25,13 @@ tests:
- as: ocm-fvt-periodic-cs-rosa-sts-ad-integration-main
capabilities:
- nested-podman
commands: |
old_umask=$(umask)
umask 077
podman_env_file="$(mktemp /tmp/podman.env.XXXXXX)"
trap 'rm -f "${podman_env_file}"' EXIT
umask "$old_umask"

JOB_LINK="https://prow.ci.openshift.org/view/gs/test-platform-results/"
if [ -n "${PULL_NUMBER:-}" ]; then
JOB_LINK="${JOB_LINK}pr-logs/pull/openshift_release/${PULL_NUMBER}/${JOB_NAME}/${BUILD_ID}"
else
JOB_LINK="${JOB_LINK}logs/${JOB_NAME}/${BUILD_ID}"
fi

env -i bash --norc --noprofile << EOF > "${podman_env_file}"
export AWS_SHARED_CREDENTIALS_FILE=/credentials/aws-cred
export SHARED_VPC_AWS_SHARED_CREDENTIALS_FILE=/credentials/aws-shared-vpc-credentials
export ENABLE_JIRA_REPORTING=true
export JOB_LINK="${JOB_LINK}"
source /usr/local/cs-qe-credentials/ocm-tokens
source /usr/local/cs-qe-credentials/jira-cred
env | grep -v '^_='
EOF

podman run \
--authfile /usr/local/cs-qe-credentials/.dockerconfigjson \
--env-file "${podman_env_file}" \
-v /usr/local/cs-qe-credentials:/credentials:ro,z \
--rm \
quay.io/redhat-services-prod/ocmci/ocmci:latest \
ocmtest test --service cms --job cs-rosa-sts-ad-integration-main --reportJiraTicket
container:
from: nested-podman
memory_backed_volume:
size: 1Gi
cron: 0 8 * * *
nested_podman: true
secrets:
- mount_path: /usr/local/cs-qe-credentials
name: cs-qe-credentials
steps:
env:
OCM_FVT_JOB_NAME: cs-rosa-sts-ad-integration-main
test:
- ref: rosa-e2e-ocm-fvt
zz_generated_metadata:
branch: main
org: openshift-online
Expand Down
Loading