fix several issues on azure jobs (#44065)

openshift · Oct 7, 2023 · bb3eda1 · bb3eda1
1 parent d5dceca
commit bb3eda1
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 3 deletions.
diff --git a/...ure/stack/upi/provision/cucushift-installer-rehearse-azure-stack-upi-provision-chain.yaml b/...ure/stack/upi/provision/cucushift-installer-rehearse-azure-stack-upi-provision-chain.yaml
@@ -7,7 +7,6 @@ chain:
   - ref: ipi-conf-additional-ca-azurestack
   - ref: ipi-conf-azurestack-rhcos
   - ref: upi-install-azurestack
-  - ref: ipi-install-times-collection
   - ref: enable-qe-catalogsource
   - chain: cucushift-installer-check
   env:

diff --git a/...nected/provision/cucushift-installer-rehearse-azure-upi-disconnected-provision-chain.yaml b/...nected/provision/cucushift-installer-rehearse-azure-upi-disconnected-provision-chain.yaml
@@ -13,6 +13,7 @@ chain:
   - ref: upi-install-azure
   - ref: enable-qe-catalogsource-disconnected
   - ref: set-sample-operator-disconnected
+  - chain: cucushift-installer-check
   env:
   - name: RESTRICTED_NETWORK
     default:  "yes"

diff --git a/.../rehearse/azure/upi/provision/cucushift-installer-rehearse-azure-upi-provision-chain.yaml b/.../rehearse/azure/upi/provision/cucushift-installer-rehearse-azure-upi-provision-chain.yaml
@@ -5,5 +5,6 @@ chain:
   - chain: ipi-conf-azure
   - ref: upi-install-azure
   - ref: enable-qe-catalogsource
+  - chain: cucushift-installer-check
   documentation: |-
     Create an UPI cluster on Azure for QE e2e tests.
diff --git a/...ure/upi/proxy/provision/cucushift-installer-rehearse-azure-upi-proxy-provision-chain.yaml b/...ure/upi/proxy/provision/cucushift-installer-rehearse-azure-upi-proxy-provision-chain.yaml
@@ -11,6 +11,7 @@ chain:
   - ref: ipi-conf-proxy
   - ref: upi-install-azure 
   - ref: enable-qe-catalogsource
+  - chain: cucushift-installer-check
   env:
   - name: RESTRICTED_NETWORK
     default: "yes"

diff --git a/ci-operator/step-registry/gather/azure-resource/gather-azure-resource-commands.sh b/ci-operator/step-registry/gather/azure-resource/gather-azure-resource-commands.sh
@@ -59,7 +59,7 @@ function gatherLBs() {
         for ap in $aps; do
             echo "address-pool: $ap"
             if [[ "${CLUSTER_TYPE}" == "azurestack" ]]; then
-                run_command "az network lb address-pool show --lb-name $lb --name $ap --resource-group $RESOURCE_GROUP | jq -r .backendIpConfigurations[].id"
+                run_command "az network lb address-pool show --lb-name $lb --name $ap --resource-group $RESOURCE_GROUP | jq -r .backendIPConfigurations[].id"
             else
                 run_command "az network lb address-pool address list --lb-name $lb --pool-name $ap --resource-group $RESOURCE_GROUP -o table"
             fi
@@ -89,4 +89,4 @@ run_command "az vm list --resource-group $RESOURCE_GROUP -o tsv"
 
 run_command "az resource list --resource-group $RESOURCE_GROUP -o tsv"
 
-gatherLBs
+gatherLBs