Remove -e2e- from name and fix IBM cloud CLI error

Signed-off-by: CS Zhang <zhangcho@us.ibm.com>
openshift · Jan 31, 2024 · 1166626 · 1166626
1 parent 375bd03
commit 1166626
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/ci-operator/config/openshift/multiarch/openshift-multiarch-master__nightly-4.15.yaml b/ci-operator/config/openshift/multiarch/openshift-multiarch-master__nightly-4.15.yaml
@@ -682,8 +682,8 @@ tests:
       OCP_ARCH: amd64
       TEST_SUITE: upgrade-conformance
     workflow: openshift-upgrade-gcp-heterogeneous
-- as: ocp-e2e-assisted-sno-power
-  cron: 0 8 * * *
+- as: ocp-assisted-sno-power
+  cron: 0 8 * * 5
   steps:
     env:
       INSTALL_TYPE: assisted

diff --git a/ci-operator/jobs/openshift/multiarch/openshift-multiarch-master-periodics.yaml b/ci-operator/jobs/openshift/multiarch/openshift-multiarch-master-periodics.yaml
@@ -14235,7 +14235,7 @@ periodics:
         secretName: result-aggregator
 - agent: kubernetes
   cluster: build02
-  cron: 0 8 * * *
+  cron: 0 8 * * 5
   decorate: true
   decoration_config:
     skip_cloning: true
@@ -14248,15 +14248,15 @@ periodics:
     ci.openshift.io/generator: prowgen
     job-release: "4.15"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-multiarch-master-nightly-4.15-ocp-e2e-assisted-sno-power
+  name: periodic-ci-openshift-multiarch-master-nightly-4.15-ocp-assisted-sno-power
   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
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=ocp-e2e-assisted-sno-power
+      - --target=ocp-assisted-sno-power
       - --variant=nightly-4.15
       command:
       - ci-operator

diff --git a/...perator/step-registry/upi/deprovision/powervs/sno/upi-deprovision-powervs-sno-commands.sh b/...perator/step-registry/upi/deprovision/powervs/sno/upi-deprovision-powervs-sno-commands.sh
@@ -26,7 +26,7 @@ ibmcloud plugin install power-iaas
 ibmcloud plugin install cis
 
 # Set target powervs and cis service instance
-ibmcloud pi st ${POWERVS_INSTANCE_CRN}
+ibmcloud pi ws tg ${POWERVS_INSTANCE_CRN}
 ibmcloud cis instance-set ${CIS_INSTANCE}
 
 # Setting IBMCLOUD_TRACE to true to enable debug logs for pi and cis operations

diff --git a/ci-operator/step-registry/upi/install/powervs/sno/upi-install-powervs-sno-commands.sh b/ci-operator/step-registry/upi/install/powervs/sno/upi-install-powervs-sno-commands.sh
@@ -25,7 +25,7 @@ ibmcloud plugin install power-iaas
 ibmcloud plugin install cis
 
 # Set target powervs and cis service instance
-ibmcloud pi st ${POWERVS_INSTANCE_CRN}
+ibmcloud pi ws tg ${POWERVS_INSTANCE_CRN}
 ibmcloud cis instance-set ${CIS_INSTANCE}
 
 # Setting IBMCLOUD_TRACE to true to enable debug logs for pi and cis operations