diff --git a/ci-operator/step-registry/hypershift/mce/power/OWNERS b/ci-operator/step-registry/hypershift/mce/power/OWNERS index 344f8c756d47..75ab14f1e176 100644 --- a/ci-operator/step-registry/hypershift/mce/power/OWNERS +++ b/ci-operator/step-registry/hypershift/mce/power/OWNERS @@ -2,8 +2,10 @@ approvers: - mkumatag - dharaneeshvrd - Shilpa-Gokul +- LiangquanLi930 options: {} reviewers: - mkumatag - dharaneeshvrd - Shilpa-Gokul +- LiangquanLi930 \ No newline at end of file diff --git a/ci-operator/step-registry/hypershift/mce/power/conformance/OWNERS b/ci-operator/step-registry/hypershift/mce/power/conformance/OWNERS index 344f8c756d47..96b58dd99148 100644 --- a/ci-operator/step-registry/hypershift/mce/power/conformance/OWNERS +++ b/ci-operator/step-registry/hypershift/mce/power/conformance/OWNERS @@ -2,8 +2,10 @@ approvers: - mkumatag - dharaneeshvrd - Shilpa-Gokul +- LiangquanLi930 options: {} reviewers: - mkumatag - dharaneeshvrd - Shilpa-Gokul +- LiangquanLi930 diff --git a/ci-operator/step-registry/hypershift/mce/power/conformance/hypershift-mce-power-conformance-workflow.metadata.json b/ci-operator/step-registry/hypershift/mce/power/conformance/hypershift-mce-power-conformance-workflow.metadata.json index 830616e43447..e9edcffb23ac 100644 --- a/ci-operator/step-registry/hypershift/mce/power/conformance/hypershift-mce-power-conformance-workflow.metadata.json +++ b/ci-operator/step-registry/hypershift/mce/power/conformance/hypershift-mce-power-conformance-workflow.metadata.json @@ -4,12 +4,14 @@ "approvers": [ "mkumatag", "dharaneeshvrd", - "Shilpa-Gokul" + "Shilpa-Gokul", + "LiangquanLi930" ], "reviewers": [ "mkumatag", "dharaneeshvrd", - "Shilpa-Gokul" + "Shilpa-Gokul", + "LiangquanLi930" ] } } \ No newline at end of file diff --git a/ci-operator/step-registry/hypershift/mce/power/conformance/hypershift-mce-power-conformance-workflow.yaml b/ci-operator/step-registry/hypershift/mce/power/conformance/hypershift-mce-power-conformance-workflow.yaml index 30b51c106904..88082c0dde74 100644 --- a/ci-operator/step-registry/hypershift/mce/power/conformance/hypershift-mce-power-conformance-workflow.yaml +++ b/ci-operator/step-registry/hypershift/mce/power/conformance/hypershift-mce-power-conformance-workflow.yaml @@ -8,8 +8,10 @@ workflow: - ref: ingress-aws-nlb-manifest - chain: ipi-aws-pre - ref: hypershift-mce-install + - ref: hypershift-mce-conf-os-images - ref: hypershift-mce-power-create test: + - ref: hypershift-mce-agent-info - chain: hypershift-mce-power-test - chain: hypershift-conformance post: diff --git a/ci-operator/step-registry/hypershift/mce/power/create/OWNERS b/ci-operator/step-registry/hypershift/mce/power/create/OWNERS index 344f8c756d47..75ab14f1e176 100644 --- a/ci-operator/step-registry/hypershift/mce/power/create/OWNERS +++ b/ci-operator/step-registry/hypershift/mce/power/create/OWNERS @@ -2,8 +2,10 @@ approvers: - mkumatag - dharaneeshvrd - Shilpa-Gokul +- LiangquanLi930 options: {} reviewers: - mkumatag - dharaneeshvrd - Shilpa-Gokul +- LiangquanLi930 \ No newline at end of file diff --git a/ci-operator/step-registry/hypershift/mce/power/create/hypershift-mce-power-create-commands.sh b/ci-operator/step-registry/hypershift/mce/power/create/hypershift-mce-power-create-commands.sh index 7237f6cfe716..e5918e88b614 100644 --- a/ci-operator/step-registry/hypershift/mce/power/create/hypershift-mce-power-create-commands.sh +++ b/ci-operator/step-registry/hypershift/mce/power/create/hypershift-mce-power-create-commands.sh @@ -18,7 +18,6 @@ POWERVS_VSI_SYS_TYPE="e980" # MCE agentserviceconfig configs export DB_VOLUME_SIZE="10Gi" export FS_VOLUME_SIZE="10Gi" -export ARCH="ppc64le" # InfraEnv configs SSH_PUB_KEY_FILE="${AGENT_POWER_CREDENTIALS}/ssh-publickey" @@ -142,27 +141,9 @@ data: EOF - oc adm release info ${OCP_IMAGE_MULTI} --filter-by-os=linux/ppc64le -o json > ocpversion.json - OPENSHIFT_VERSION="$(cat ocpversion.json | jq -r . | grep "BUILD_VERSION=v" | tr -d 'v",' | awk -F '=' '{print $2}')" - export OPENSHIFT_VERSION - - if [[ "${OPENSHIFT_VERSION}" == *"4.14."* ]] - then - RHCOS_VERSION="4.14-9.2" - elif [[ "${OPENSHIFT_VERSION}" == *"4.15."* ]] - then - RHCOS_VERSION="4.15-9.2" - else - echo "unrecognized version for RHCOS" - exit 1 - fi - - RHCOS_BUILD_VERSION=$(cat ocpversion.json | jq -r '.displayVersions."machine-os".Version') - export RHCOS_BUILD_VERSION - export ISO_URL="https://rhcos.mirror.openshift.com/art/storage/prod/streams/${RHCOS_VERSION}/builds/${RHCOS_BUILD_VERSION}/ppc64le/rhcos-${RHCOS_BUILD_VERSION}-live.ppc64le.iso" - export ROOT_FS_URL="https://rhcos.mirror.openshift.com/art/storage/prod/streams/${RHCOS_VERSION}/builds/${RHCOS_BUILD_VERSION}/ppc64le/rhcos-${RHCOS_BUILD_VERSION}-live-rootfs.ppc64le.img" - # Creating AgentServiceConfig +CLUSTER_VERSION=$(oc get clusterversion -o jsonpath={..desired.version} | cut -d '.' -f 1,2) +OS_IMAGES=$(jq --arg CLUSTER_VERSION "${CLUSTER_VERSION}" '[.[] | select(.openshift_version == $CLUSTER_VERSION)]' "${SHARED_DIR}/default_os_images.json") echo "$(date) Creating AgentServiceConfig" envsubst <<"EOF" | oc apply -f - apiVersion: agent-install.openshift.io/v1beta1 @@ -185,11 +166,10 @@ spec: mirrorRegistryRef: name: mirror-config osImages: - - openshiftVersion: "${OPENSHIFT_VERSION}" - version: "${RHCOS_BUILD_VERSION}" - url: "${ISO_URL}" - rootFSUrl: "${ROOT_FS_URL}" - cpuArchitecture: "${ARCH}" + - openshiftVersion: "${CLUSTER_VERSION}" + version: $(echo "$OS_IMAGES" | jq -r '.[] | select(.cpu_architecture == "ppc64le").version') + url: $(echo "$OS_IMAGES" | jq -r '.[] | select(.cpu_architecture == "ppc64le").url') + cpuArchitecture: ppc64le EOF oc wait --timeout=5m --for=condition=DeploymentsHealthy agentserviceconfig agent diff --git a/ci-operator/step-registry/hypershift/mce/power/create/hypershift-mce-power-create-ref.metadata.json b/ci-operator/step-registry/hypershift/mce/power/create/hypershift-mce-power-create-ref.metadata.json index 0fe289fa09cd..076d3ac02d48 100644 --- a/ci-operator/step-registry/hypershift/mce/power/create/hypershift-mce-power-create-ref.metadata.json +++ b/ci-operator/step-registry/hypershift/mce/power/create/hypershift-mce-power-create-ref.metadata.json @@ -4,12 +4,14 @@ "approvers": [ "mkumatag", "dharaneeshvrd", - "Shilpa-Gokul" + "Shilpa-Gokul", + "LiangquanLi930" ], "reviewers": [ "mkumatag", "dharaneeshvrd", - "Shilpa-Gokul" + "Shilpa-Gokul", + "LiangquanLi930" ] } } \ No newline at end of file diff --git a/ci-operator/step-registry/hypershift/mce/power/destroy/OWNERS b/ci-operator/step-registry/hypershift/mce/power/destroy/OWNERS index 344f8c756d47..96b58dd99148 100644 --- a/ci-operator/step-registry/hypershift/mce/power/destroy/OWNERS +++ b/ci-operator/step-registry/hypershift/mce/power/destroy/OWNERS @@ -2,8 +2,10 @@ approvers: - mkumatag - dharaneeshvrd - Shilpa-Gokul +- LiangquanLi930 options: {} reviewers: - mkumatag - dharaneeshvrd - Shilpa-Gokul +- LiangquanLi930 diff --git a/ci-operator/step-registry/hypershift/mce/power/destroy/hypershift-mce-power-destroy-ref.metadata.json b/ci-operator/step-registry/hypershift/mce/power/destroy/hypershift-mce-power-destroy-ref.metadata.json index 315669d2e601..cf0e12b09c37 100644 --- a/ci-operator/step-registry/hypershift/mce/power/destroy/hypershift-mce-power-destroy-ref.metadata.json +++ b/ci-operator/step-registry/hypershift/mce/power/destroy/hypershift-mce-power-destroy-ref.metadata.json @@ -4,12 +4,14 @@ "approvers": [ "mkumatag", "dharaneeshvrd", - "Shilpa-Gokul" + "Shilpa-Gokul", + "LiangquanLi930" ], "reviewers": [ "mkumatag", "dharaneeshvrd", - "Shilpa-Gokul" + "Shilpa-Gokul", + "LiangquanLi930" ] } } \ No newline at end of file diff --git a/ci-operator/step-registry/hypershift/mce/power/test/OWNERS b/ci-operator/step-registry/hypershift/mce/power/test/OWNERS index 344f8c756d47..96b58dd99148 100644 --- a/ci-operator/step-registry/hypershift/mce/power/test/OWNERS +++ b/ci-operator/step-registry/hypershift/mce/power/test/OWNERS @@ -2,8 +2,10 @@ approvers: - mkumatag - dharaneeshvrd - Shilpa-Gokul +- LiangquanLi930 options: {} reviewers: - mkumatag - dharaneeshvrd - Shilpa-Gokul +- LiangquanLi930 diff --git a/ci-operator/step-registry/hypershift/mce/power/test/hypershift-mce-power-test-chain.metadata.json b/ci-operator/step-registry/hypershift/mce/power/test/hypershift-mce-power-test-chain.metadata.json index 989dc499c499..3fdf76737f51 100644 --- a/ci-operator/step-registry/hypershift/mce/power/test/hypershift-mce-power-test-chain.metadata.json +++ b/ci-operator/step-registry/hypershift/mce/power/test/hypershift-mce-power-test-chain.metadata.json @@ -4,12 +4,14 @@ "approvers": [ "mkumatag", "dharaneeshvrd", - "Shilpa-Gokul" + "Shilpa-Gokul", + "LiangquanLi930" ], "reviewers": [ "mkumatag", "dharaneeshvrd", - "Shilpa-Gokul" + "Shilpa-Gokul", + "LiangquanLi930" ] } } \ No newline at end of file