MULTIARCH-6023: update ibm power single-node-openshift scheduling

ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.22.yaml

@@ -923,12 +923,34 @@ tests:
       ZONES_EXCLUSION_PATTERN: (asia-southeast1-a|us-central1-c)
     workflow: openshift-upgrade-gcp-heterogeneous
 - as: ocp-e2e-sno-power
-  cron: 30 11 6 1 *
+  cron: 0 0 1-31/2 * *
   steps:
-    cluster_profile: powervs-1
+    cluster_profile: powervs-sno
     env:
+      BASE_DOMAIN: multi-arch-cicd.cis.ibm.net
+      BASTION: rh-sno-ci-bastion.multi-arch-cicd.cis.ibm.net
+      BASTION_IP: 67.18.69.123
+      CIS_DOMAIN_ID: 9b50a03127620e2492fe9f06885eda70
+      CIS_INSTANCE: 'crn:v1:bluemix:public:internet-svcs:global:a/3c24cb272ca44aa1ac9f6e9490ac5ecd:8a93b3a8-b109-4c74-952c-7578dca2c4ee::'
       INSTALL_TYPE: sno
       OCP_VERSION: "4.22"
+      POWERVS_IMAGE: rhcos-none
+      POWERVS_INSTANCE_CRN: 'crn:v1:bluemix:public:power-iaas:dal14:a/3c24cb272ca44aa1ac9f6e9490ac5ecd:3e2a17e0-b9e3-4655-9c26-e0d18c57178a::'
+      POWERVS_MACHINE_NETWORK_CIDR: 192.168.140.0/24
+      POWERVS_NETWORK: private-net
+      POWERVS_USER_ID: rhocpdev
+      TEST_SKIPS: The HAProxy router should be able to connect to a service that is
+        idled\| HTPasswd IDP should successfully configure htpasswd and be responsive\|
+        LDAP IDP should authenticate against an ldap server\| expected headers returned
+        from the authorize URL\| expected headers returned from the grant URL\| expected
+        headers returned from the login URL for the allow all IDP\| expected headers
+        returned from the login URL for the bootstrap IDP\| expected headers returned
+        from the login URL for when there is only one IDP\| expected headers returned
+        from the logout URL\| expected headers returned from the root URL\| expected
+        headers returned from the token URL\| expected headers returned from the token
+        request URL\| Using a OAuth client with a non-default token max age\| well-known
+        endpoint should be reachable
+      TEST_TYPE: suite
     workflow: upi-powervs-sno
 - as: ocp-e2e-agent-sno-power
   cron: 41 11 4 7 *

ci-operator/jobs/openshift/multiarch/openshift-multiarch-main-periodics.yaml

@@ -47577,7 +47577,7 @@ periodics:
         secretName: result-aggregator
 - agent: kubernetes
   cluster: build06
-  cron: 30 11 6 1 *
+  cron: 0 0 1-31/2 * *
   decorate: true
   decoration_config:
     skip_cloning: true
@@ -47586,8 +47586,8 @@ periodics:
     org: openshift
     repo: multiarch
   labels:
-    ci-operator.openshift.io/cloud: powervs-1
-    ci-operator.openshift.io/cloud-cluster-profile: powervs-1
+    ci-operator.openshift.io/cloud: powervs-sno
+    ci-operator.openshift.io/cloud-cluster-profile: powervs-sno
     ci-operator.openshift.io/variant: nightly-4.22
     ci.openshift.io/generator: prowgen
     job-release: "4.22"

ci-operator/step-registry/upi/install/powervs/sno/upi-install-powervs-sno-commands.sh

@@ -5,7 +5,10 @@ set -euox pipefail
 CLUSTER_NAME="cicd-$(printf $PROW_JOB_ID|sha256sum|cut -c-10)"
 POWERVS_VSI_NAME="${CLUSTER_NAME}-worker"
 BASTION_CI_SCRIPTS_DIR="/tmp/${CLUSTER_NAME}-config"
-CREDENTIALS_PATH="/etc/sno-power-credentials"
+CREDENTIALS_PATH="/etc/cluster-secrets-powervs-sno-1"
+ls -lrt /etc/cluster-secrets-powervs-sno-1
+# Read secrets into variables
+IBMCLOUD_API_KEY=$(cat /etc/cluster-secrets-powervs-sno-1/POWERVS_SNO_ibmcloud-api-key)
 
 setup_env() {
   set +x
@@ -21,7 +24,8 @@ setup_env() {
 
   # IBM cloud login
   ibmcloud config --check-version=false
-  echo | ibmcloud login --apikey @"${CREDENTIALS_PATH}/.powercreds" --no-region
+  ibmcloud login --apikey "${IBMCLOUD_API_KEY}" --no-region
+  # ibmcloud login --apikey @"${CREDENTIALS_PATH}/.powercreds" --no-region
 
   # Installing required ibmcloud plugins
   echo "$(date) Installing required ibmcloud plugins"
@@ -34,7 +38,7 @@ setup_env() {
 
   # Setting IBMCLOUD_TRACE to true to enable debug logs for pi and cis operations
   export IBMCLOUD_TRACE=true
-  set -x
+  #set -x
 }
 
 create_sno_node() {
@@ -131,6 +135,7 @@ cp "${CREDENTIALS_PATH}/ssh-privatekey" ${SSH_PRIVATE}
 chmod 0600 ${SSH_PRIVATE}
 SSH_OPTIONS=(-o 'PreferredAuthentications=publickey' -o 'StrictHostKeyChecking=no' -o 'ServerAliveInterval=60' -o 'ServerAliveCountMax=60' -o 'UserKnownHostsFile=/dev/null' -i "${SSH_PRIVATE}")
 # Save private-key, pull-secret and offline-token to bastion
+ssh -vvv "${SSH_OPTIONS[@]}" root@${BASTION} 'echo ok'
 ssh "${SSH_OPTIONS[@]}" root@${BASTION} "mkdir -p ~/.sno"
 scp "${SSH_OPTIONS[@]}" ${CREDENTIALS_PATH}/{ssh-publickey,pull-secret,pull-secret-ci,offline-token} root@${BASTION}:~/.sno/.
 scp "${SSH_OPTIONS[@]}" ${SSH_PRIVATE} root@${BASTION}:~/.sno/.
@@ -756,7 +761,7 @@ IBMCLOUD_API_KEY=$(cat ${CREDENTIALS_PATH}/.powercreds)
 POWERVS_SERVICE_INSTANCE_ID=$(echo ${POWERVS_INSTANCE_CRN} | cut -f8 -d":")
 POWERVS_REGION=$(echo ${POWERVS_INSTANCE_CRN} | cut -f6 -d":")
 POWERVS_ZONE=$(echo ${POWERVS_REGION} | sed 's/-*[0-9].*//')
-POWERVS_RESOURCE_GROUP=""
+POWERVS_RESOURCE_GROUP="${POWERVS_SNO_RESOURCE_GROUP:-}"
 cat > /tmp/powervs-config.json << EOF
 {"id":"${POWERVS_USER_ID}","apikey":"${IBMCLOUD_API_KEY}","region":"${POWERVS_REGION}","zone":"${POWERVS_ZONE}","serviceinstance":"${POWERVS_SERVICE_INSTANCE_ID}","resourcegroup":"${POWERVS_RESOURCE_GROUP}"}
 EOF
@@ -794,4 +799,4 @@ echo "=========== oc get co -o wide ==============" >> ${CLUSTER_INFO}
 oc get co -o wide >> ${CLUSTER_INFO}
 echo "=========== oc get pod -A -o wide ==============" >> ${CLUSTER_INFO}
 oc get pod -A -o wide >> ${CLUSTER_INFO}
-cp ${CLUSTER_INFO} "${ARTIFACT_DIR}/"
+cp ${CLUSTER_INFO} "${ARTIFACT_DIR}/"

ci-operator/step-registry/upi/install/powervs/sno/upi-install-powervs-sno-ref.yaml

@@ -41,6 +41,9 @@ ref:
       documentation: Name of the private network where SNO node will get hosted
     - name: POWERVS_MACHINE_NETWORK_CIDR
       documentation: CIDR of machine network to use for the cluster
+    - name: POWERVS_SNO_RESOURCE_GROUP
+      default: "powervs-sno-resource-group"
+      documentation: IBM Cloud resource group for PowerVS SNO resources
     - name: POWERVS_VSI_MEMORY
       default: "32"
       documentation: Memory in GB of SNO power node
@@ -60,9 +63,6 @@ ref:
   timeout: 3h
   grace_period: 15m
   credentials:
-    - mount_path: /etc/ci-pull-credentials
-      name: ci-pull-credentials
-      namespace: test-credentials
-    - mount_path: /etc/sno-power-credentials
-      name: sno-power-credentials
-      namespace: test-credentials
+    - mount_path: /etc/cluster-secrets-powervs-sno-1
+      name: cluster-secrets-powervs-sno-1
+      namespace: ci

ci-operator/step-registry/upi/powervs/sno/upi-powervs-sno-workflow.yaml

@@ -8,16 +8,16 @@ workflow:
     post:
       - chain: upi-powervs-sno-post
     env:
-      BASE_DOMAIN: "mac-ppc64le.cis.ibm.net"
+      BASE_DOMAIN: "multi-arch-cicd.cis.ibm.net"
       POWERVS_USER_ID: "rhocpdev"
-      POWERVS_INSTANCE_CRN: "crn:v1:bluemix:public:power-iaas:tok04:a/3c24cb272ca44aa1ac9f6e9490ac5ecd:03b647ba-f416-4170-85b7-7774e5c13dfb::"
+      POWERVS_INSTANCE_CRN: 'crn:v1:bluemix:public:power-iaas:dal14:a/3c24cb272ca44aa1ac9f6e9490ac5ecd:3e2a17e0-b9e3-4655-9c26-e0d18c57178a::'
       POWERVS_IMAGE: "rhcos-none"
       POWERVS_NETWORK: "private-net"
       POWERVS_MACHINE_NETWORK_CIDR: "192.168.140.0/24"
-      CIS_INSTANCE: "mac-cicd-internet-services"
-      CIS_DOMAIN_ID: "b31e8504ad96d64c5b5f6dfa9e94d83a"
-      BASTION: "rh-sno-ci-bastion.mac-ppc64le.cis.ibm.net"
-      BASTION_IP: "128.168.100.252"
+      CIS_INSTANCE: "crn:v1:bluemix:public:internet-svcs:global:a/3c24cb272ca44aa1ac9f6e9490ac5ecd:8a93b3a8-b109-4c74-952c-7578dca2c4ee::"
+      CIS_DOMAIN_ID: "9b50a03127620e2492fe9f06885eda70"
+      BASTION: "rh-sno-ci-bastion.multi-arch-cicd.cis.ibm.net"
+      BASTION_IP: "67.18.69.123"
       TEST_TYPE: suite
       TEST_SKIPS: The HAProxy router should be able to connect to a service that is
         idled\| HTPasswd IDP should successfully configure htpasswd and be responsive\|