Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ resources:
cpu: 200m
memory: 400Mi
tests:
- as: fusion-access-operator-ipi-ocp420
- as: ibm-fusion-access-operator-ipi-ocp420
cron: 0 23 31 2 *
steps:
cluster_profile: aws-cspi-qe
Expand All @@ -38,7 +38,7 @@ tests:
CUSTOM_SECURITY_GROUP_SOURCES: ""
FIPS_ENABLED: "false"
FIREWATCH_CONFIG_FILE_PATH: https://raw.githubusercontent.com/CSPI-QE/cspi-utils/main/firewatch-base-configs/aws-ipi/lp-interop.json
FIREWATCH_DEFAULT_JIRA_ADDITIONAL_LABELS: '["4.20-lp", "self-managed-lp", "fusion-access-lp"]'
FIREWATCH_DEFAULT_JIRA_ADDITIONAL_LABELS: '["4.20-lp", "self-managed-lp", "ibm-fusion-access-lp"]'
FIREWATCH_DEFAULT_JIRA_ASSIGNEE: [email protected]
FIREWATCH_DEFAULT_JIRA_PROJECT: LPINTEROP
FIREWATCH_FAIL_WITH_TEST_FAILURES: "true"
Expand All @@ -54,19 +54,19 @@ tests:
STORAGE_SCALE_STORAGE_CPU: "2"
STORAGE_SCALE_STORAGE_MEMORY: 8Gi
USER_TAGS: |
scenario fusion-access
scenario ibm-fusion-access
post:
- ref: interop-tests-fusion-access-custom-ibm-must-gather
- ref: interop-tests-ibm-fusion-access-custom-ibm-must-gather
- chain: ipi-aws-post
pre:
- chain: ipi-aws-pre
test:
- chain: interop-tests-fusion-access-environment-setup-chain
- chain: interop-tests-fusion-access-ebs-integration-chain
- chain: interop-tests-ibm-fusion-access-environment-setup-chain
- chain: interop-tests-ibm-fusion-access-ebs-integration-chain
workflow: firewatch-ipi-aws
timeout: 4h0m0s
zz_generated_metadata:
branch: master
org: RedHatQE
repo: interop-testing
variant: fusion-access-operator-ocp4.20-lp-interop
variant: ibm-fusion-access-operator-ocp4.20-lp-interop
Original file line number Diff line number Diff line change
Expand Up @@ -582,22 +582,11 @@ periodics:
labels:
ci-operator.openshift.io/cloud: aws
ci-operator.openshift.io/cloud-cluster-profile: aws-cspi-qe
ci-operator.openshift.io/variant: fusion-access-operator-ocp4.20-lp-interop
ci-operator.openshift.io/variant: ibm-fusion-access-operator-ocp4.20-lp-interop
ci.openshift.io/generator: prowgen
job-release: "4.20"
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: periodic-ci-RedHatQE-interop-testing-master-fusion-access-operator-ocp4.20-lp-interop-fusion-access-operator-ipi-ocp420
reporter_config:
slack:
channel: '#team-ecoeng-fusion-access'
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-RedHatQE-interop-testing-master-ibm-fusion-access-operator-ocp4.20-lp-interop-ibm-fusion-access-operator-ipi-ocp420
spec:
containers:
- args:
Expand All @@ -606,8 +595,8 @@ periodics:
- --lease-server-credentials-file=/etc/boskos/credentials
- --report-credentials-file=/etc/report/credentials
- --secret-dir=/secrets/ci-pull-credentials
- --target=fusion-access-operator-ipi-ocp420
- --variant=fusion-access-operator-ocp4.20-lp-interop
- --target=ibm-fusion-access-operator-ipi-ocp420
- --variant=ibm-fusion-access-operator-ocp4.20-lp-interop
command:
- ci-operator
image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -238,25 +238,25 @@ presubmits:
- ^master$
- ^master-
cluster: build03
context: ci/prow/fusion-access-operator-ocp4.20-lp-interop-images
context: ci/prow/ibm-fusion-access-operator-ocp4.20-lp-interop-images
decorate: true
decoration_config:
skip_cloning: true
labels:
ci-operator.openshift.io/variant: fusion-access-operator-ocp4.20-lp-interop
ci-operator.openshift.io/variant: ibm-fusion-access-operator-ocp4.20-lp-interop
ci.openshift.io/generator: prowgen
job-release: "4.20"
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-RedHatQE-interop-testing-master-fusion-access-operator-ocp4.20-lp-interop-images
rerun_command: /test fusion-access-operator-ocp4.20-lp-interop-images
name: pull-ci-RedHatQE-interop-testing-master-ibm-fusion-access-operator-ocp4.20-lp-interop-images
rerun_command: /test ibm-fusion-access-operator-ocp4.20-lp-interop-images
spec:
containers:
- args:
- --gcs-upload-secret=/secrets/gcs/service-account.json
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
- --report-credentials-file=/etc/report/credentials
- --target=[images]
- --variant=fusion-access-operator-ocp4.20-lp-interop
- --variant=ibm-fusion-access-operator-ocp4.20-lp-interop
command:
- ci-operator
image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
Expand Down Expand Up @@ -289,4 +289,4 @@ presubmits:
- name: result-aggregator
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )fusion-access-operator-ocp4.20-lp-interop-images,?($|\s.*)
trigger: (?m)^/test( | .* )ibm-fusion-access-operator-ocp4.20-lp-interop-images,?($|\s.*)
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ ref:
cpu: 100m
memory: 200Mi
documentation: |-
Configure AWS security groups for Fusion Access Operator and IBM Storage Scale testing.
Configure AWS security groups for IBM Fusion Access Operator and IBM Storage Scale testing.
This step configures the necessary ports for IBM Storage Scale communication and shared storage access.
Ports configured by default:
- 12345: IBM Storage Scale NSD (Network Shared Disk)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ else
echo "Using internal OpenShift registry: ${FINAL_REGISTRY_URL}/${FULL_REPO}"
fi

# Create kmm-image-config ConfigMap in Fusion Access namespace
# Create kmm-image-config ConfigMap in IBM Fusion Access namespace
echo ""
echo "Creating kmm-image-config in ${FA__NAMESPACE}..."
cat <<EOF | oc apply -f -
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ ref:
Configure KMM (Kernel Module Management) registry for IBM Storage Scale kernel modules.

CRITICAL: This step creates kmm-image-config ConfigMap in TWO namespaces:
1. ibm-fusion-access - For Fusion Access operator
1. ibm-fusion-access - For IBM Fusion Access operator
2. ibm-spectrum-scale-operator - For IBM Storage Scale operator (prevents broken buildgpl)

Fusion Access Operator v0.0.19+ uses KMM to build GPFS kernel modules (supports
IBM Fusion Access Operator v0.0.19+ uses KMM to build GPFS kernel modules (supports
secure boot, removes machineconfig requirement). KMM requires a container registry
to build, push, and distribute kernel module containers.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ ref:
documentation: The IBM Storage Scale version to use
default: "5.2.3.1"
documentation: |-
Create the FusionAccess custom resource to initialize the Fusion Access Operator.
Create the FusionAccess custom resource to initialize the IBM Fusion Access Operator.
This step creates the main FusionAccess resource that triggers the operator to set up
the necessary components and prepare for IBM Storage Scale integration.
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
#!/bin/bash
set -eux -o pipefail; shopt -s inherit_errexit

echo "🚀 Creating namespaces for Fusion Access Operator and IBM Storage Scale..."
echo "🚀 Creating namespaces for IBM Fusion Access Operator and IBM Storage Scale..."

# Set default values from environment variables
FUSION_ACCESS_NAMESPACE="${FA__NAMESPACE:-ibm-fusion-access}"
FA__SCALE__NAMESPACE="${FA__SCALE__NAMESPACE:-ibm-spectrum-scale}"

echo "Fusion Access namespace: ${FUSION_ACCESS_NAMESPACE}"
echo "IBM Fusion Access namespace: ${FUSION_ACCESS_NAMESPACE}"
echo "Storage Scale namespace: ${FA__SCALE__NAMESPACE}"

# Create Fusion Access namespace
echo "Creating Fusion Access namespace..."
# Create IBM Fusion Access namespace
echo "Creating IBM Fusion Access namespace..."
if oc get namespace "${FUSION_ACCESS_NAMESPACE}" >/dev/null; then
echo "✅ Namespace ${FUSION_ACCESS_NAMESPACE} already exists"
else
echo "Creating namespace ${FUSION_ACCESS_NAMESPACE}..."
oc create namespace "${FUSION_ACCESS_NAMESPACE}"
fi

echo "Waiting for Fusion Access namespace to be ready..."
echo "Waiting for IBM Fusion Access namespace to be ready..."
oc wait --for=jsonpath='{.status.phase}'=Active namespace/${FUSION_ACCESS_NAMESPACE} --timeout=60s

# Create IBM Storage Scale namespace
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ STORAGE_SCALE_OPERATOR_NAMESPACE="${STORAGE_SCALE_OPERATOR_NAMESPACE:-ibm-spectr
IBM_ENTITLEMENT_KEY_PATH="/var/run/secrets/ibm-entitlement-key"
FA__PULL_SECRET_EXTRA_PATH="/var/run/secrets/fusion-pullsecret-extra"

echo "🚀 Creating Fusion Access pull secrets..."
echo "🚀 Creating IBM Fusion Access pull secrets..."
echo "Primary Namespace: $FUSION_ACCESS_NAMESPACE"
echo "IBM Registry: $FA__IBM_REGISTRY"
echo ""
Expand Down Expand Up @@ -428,4 +428,4 @@ if oc get secret fusion-pullsecret-extra -n "${FUSION_ACCESS_NAMESPACE}" >/dev/n
fi

echo ""
echo "✅ All Fusion Access pull secrets creation completed!"
echo "✅ All IBM Fusion Access pull secrets creation completed!"
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ ref:
name: fusion-access-operator
mount_path: /var/run/secrets
documentation: |-
Create Fusion Access pull secrets for IBM entitlement key and additional registry access.
Create IBM Fusion Access pull secrets for IBM entitlement key and additional registry access.

**Required Secret Files** (mounted via credentials):
- `ibm-entitlement-key` - IBM entitlement key for cp.icr.io registry access
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash
set -eux -o pipefail; shopt -s inherit_errexit

echo "🔧 Installing Fusion Access Operator..."
echo "🔧 Installing IBM Fusion Access Operator..."

FUSION_ACCESS_NAMESPACE="${FA__NAMESPACE:-ibm-fusion-access}"
CATALOG_SOURCE_IMAGE="${FA__CATALOG_SOURCE_IMAGE:-quay.io/openshift-storage-scale/openshift-fusion-access-catalog:stable}"
Expand Down Expand Up @@ -79,4 +79,4 @@ else
oc wait --for=jsonpath='{.status.phase}'=Succeeded csv -l operators.coreos.com/openshift-fusion-access-operator.${FUSION_ACCESS_NAMESPACE} -n ${FUSION_ACCESS_NAMESPACE} --timeout=600s
fi

echo "✅ Fusion Access Operator installation completed!"
echo "✅ IBM Fusion Access Operator installation completed!"
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ ref:
Install IBM Fusion Access Operator via custom catalog source.

**Operator Channel:**
- Using "alpha" channel as this is the active development channel for the Fusion Access Operator
- Using "alpha" channel as this is the active development channel for the IBM Fusion Access Operator
- The operator provides IBM Storage Scale (formerly Spectrum Scale) integration for OpenShift
- Reference: https://www.ibm.com/docs/en/scalecontainernative/5.2.3

Expand All @@ -22,15 +22,15 @@ ref:
4. Create Subscription - installs operator from catalog using specified channel
5. Wait for CSV (ClusterServiceVersion) - confirms successful operator installation

This step installs the Fusion Access Operator which deploys and manages IBM Storage Scale
This step installs the IBM Fusion Access Operator which deploys and manages IBM Storage Scale
for container-native storage on OpenShift.
env:
- name: FA__NAMESPACE
documentation: The namespace for IBM Fusion Access Operator deployment and management
default: "ibm-fusion-access"
- name: FA__CATALOG_SOURCE_IMAGE
documentation: Custom catalog source image containing the Fusion Access Operator packages
documentation: Custom catalog source image containing the IBM Fusion Access Operator packages
default: "quay.io/openshift-storage-scale/openshift-fusion-access-catalog:stable"
- name: FA__OPERATOR_CHANNEL
documentation: Operator channel - using "alpha" as active development channel for Fusion Access Operator
documentation: Operator channel - using "alpha" as active development channel for IBM Fusion Access Operator
default: "alpha"
20 changes: 10 additions & 10 deletions ci-operator/step-registry/ibm-fusion-access/shared-lib/README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Fusion Access Shared Library
# IBM Fusion Access Shared Library

This step generates a shared library of bash functions for JUnit XML test result reporting, used across all Fusion Access test steps.
This step generates a shared library of bash functions for JUnit XML test result reporting, used across all IBM Fusion Access test steps.

## Purpose

- **Centralize JUnit XML reporting functions**: Provides common functions for test result reporting
- **Ensure consistency**: All Fusion Access tests use the same reporting format
- **Ensure consistency**: All IBM Fusion Access tests use the same reporting format
- **Reduce duplication**: Eliminates the need to duplicate JUnit XML code in each test step
- **Follow best practices**: Implements OCP CI standard patterns for test result reporting
- **Enable integration**: Supports Prow/Spyglass visualization and component readiness dashboards
Expand Down Expand Up @@ -68,7 +68,7 @@ Generates the final JUnit XML test results report. Should be called at the end o
- `TEST_CASES`: Accumulated test case XML (string)

**Optional Global Variables:**
- `JUNIT_SUITE_NAME`: Name of the test suite (default: `"Fusion Access Tests"`)
- `JUNIT_SUITE_NAME`: Name of the test suite (default: `"IBM Fusion Access Tests"`)
- `JUNIT_EXIT_ON_FAILURE`: Exit with error if tests failed (default: `"true"`, set to `"false"` to suppress)
- `SHARED_DIR`: Directory for sharing artifacts between steps (results copied here if exists)

Expand Down Expand Up @@ -111,7 +111,7 @@ Before using the functions, initialize all required variables:
# JUnit XML test results configuration
ARTIFACT_DIR="${ARTIFACT_DIR:-/tmp/artifacts}"
JUNIT_RESULTS_FILE="${ARTIFACT_DIR}/junit_<descriptive_test_name>_tests.xml"
JUNIT_SUITE_NAME="Fusion Access <Test Category> Tests"
JUNIT_SUITE_NAME="IBM Fusion Access <Test Category> Tests"
TEST_START_TIME=$(date +%s)
TESTS_TOTAL=0
TESTS_FAILED=0
Expand Down Expand Up @@ -159,15 +159,15 @@ set -o nounset
set -o errexit
set -o pipefail

echo "************ Example Fusion Access Test ************"
echo "************ Example IBM Fusion Access Test ************"

# Source shared library
source "${SHARED_DIR}/common-fusion-access-bash-functions.sh"

# Initialize JUnit XML variables
ARTIFACT_DIR="${ARTIFACT_DIR:-/tmp/artifacts}"
JUNIT_RESULTS_FILE="${ARTIFACT_DIR}/junit_example_tests.xml"
JUNIT_SUITE_NAME="Fusion Access Example Tests"
JUNIT_SUITE_NAME="IBM Fusion Access Example Tests"
TEST_START_TIME=$(date +%s)
TESTS_TOTAL=0
TESTS_FAILED=0
Expand All @@ -189,7 +189,7 @@ if oc get deployment -n ibm-fusion-access fusion-access-operator >/dev/null 2>&1
TEST1_STATUS="passed"
else
echo " ❌ Operator deployment not found"
TEST1_MESSAGE="Fusion Access operator deployment not found in namespace ibm-fusion-access"
TEST1_MESSAGE="IBM Fusion Access operator deployment not found in namespace ibm-fusion-access"
fi

TEST1_DURATION=$(($(date +%s) - TEST1_START))
Expand Down Expand Up @@ -268,7 +268,7 @@ fi
## Related Steps

- `interop-tests-deploy-fusion-access` - Uses this library for deployment tests
- `interop-tests-fusion-access-tests` - Uses this library for functional tests
- `interop-tests-ibm-fusion-access-tests` - Uses this library for functional tests
- `interop-tests-verify-shared-storage` - Uses this library for storage verification tests

## Maintenance
Expand All @@ -277,7 +277,7 @@ When updating this shared library:

1. **Test changes locally**: Validate bash syntax with `bash -n`
2. **Update documentation**: Keep this README and ref.yaml documentation in sync
3. **Consider backward compatibility**: Changes affect all Fusion Access test steps
3. **Consider backward compatibility**: Changes affect all IBM Fusion Access test steps
4. **Test with existing steps**: Verify existing test steps still work
5. **Document breaking changes**: Clearly communicate any API changes

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
set -eux -o pipefail; shopt -s inherit_errexit

# ============================================================================
# Fusion Access Shared Library Generator
# IBM Fusion Access Shared Library Generator
# ============================================================================
# This script generates a shared library of bash functions for JUnit XML
# test result reporting, used across all Fusion Access test steps.
# test result reporting, used across all IBM Fusion Access test steps.
#
# Purpose:
# - Centralize JUnit XML reporting functions
# - Ensure consistent test reporting across all Fusion Access tests
# - Ensure consistent test reporting across all IBM Fusion Access tests
# - Reduce code duplication and improve maintainability
# - Follow OCP CI best practices for test result reporting
#
Expand All @@ -21,16 +21,16 @@ set -eux -o pipefail; shopt -s inherit_errexit
# - JUnit XML Schema: https://www.ibm.com/docs/en/developer-for-zos/9.1.1?topic=formats-junit-xml-format
# ============================================================================

echo "************ Fusion Access Generating Shared Functions ************"
echo "************ IBM Fusion Access Generating Shared Functions ************"

FUNCTIONS_PATH="${SHARED_DIR}/common-fusion-access-bash-functions.sh"

cat <<'EO-SHARED-FUNCTION' > "${FUNCTIONS_PATH}"
########################################################################
# Fusion Access Shared Test Functions
# IBM Fusion Access Shared Test Functions
########################################################################
# Common JUnit XML test result reporting functions used by multiple
# Fusion Access test steps.
# IBM Fusion Access test steps.
#
# These functions provide standardized test result reporting that
# integrates with OCP CI test platform, Prow/Spyglass visualization,
Expand Down Expand Up @@ -137,7 +137,7 @@ add_test_result() {
#
# Optional Global Variables:
# - JUNIT_SUITE_NAME: Name of the test suite (string)
# Default: "Fusion Access Tests"
# Default: "IBM Fusion Access Tests"
# - JUNIT_EXIT_ON_FAILURE: Exit with error if tests failed (boolean string)
# Default: "true"
# Set to "false" to suppress exit on failure
Expand All @@ -156,7 +156,7 @@ add_test_result() {
# Example Setup:
# ARTIFACT_DIR="${ARTIFACT_DIR:-/tmp/artifacts}"
# JUNIT_RESULTS_FILE="${ARTIFACT_DIR}/junit_fusion_access_tests.xml"
# JUNIT_SUITE_NAME="Fusion Access Operator Installation Tests"
# JUNIT_SUITE_NAME="IBM Fusion Access Operator Installation Tests"
# TEST_START_TIME=$(date +%s)
# TESTS_TOTAL=0
# TESTS_FAILED=0
Expand Down
Loading