Skip to content
Merged
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 @@ -1205,7 +1205,7 @@ tests:
steps:
cluster_profile: vsphere-elastic
env:
POOLS: vcenter-110.ci.ibmc.devcluster.openshift.com-vcenter-110-dc01-vcenter-110-cl01
POOL_SELECTOR: vsphere-type=vcf9
TEST_SKIPS: provisioning should mount multiple PV pointing to the same storage
on the same node
observers:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1777,7 +1777,7 @@ tests:
cluster_profile: vsphere-elastic
env:
ENABLE_LONG_CSI_CERTIFICATION_TESTS: "true"
POOLS: vcenter-110.ci.ibmc.devcluster.openshift.com-vcenter-110-dc01-vcenter-110-cl01
POOL_SELECTOR: vsphere-type=vcf9
TEST_SKIPS: provisioning should mount multiple PV pointing to the same storage
on the same node
observers:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ tests:
steps:
cluster_profile: vsphere-elastic
env:
POOLS: vcenter-110.ci.ibmc.devcluster.openshift.com-vcenter-110-dc01-vcenter-110-cl01
POOL_SELECTOR: vsphere-type=vcf9
observers:
enable:
- observers-resource-watch
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1729,7 +1729,7 @@ tests:
cluster_profile: vsphere-elastic
env:
ENABLE_LONG_CSI_CERTIFICATION_TESTS: "true"
POOLS: vcenter-110.ci.ibmc.devcluster.openshift.com-vcenter-110-dc01-vcenter-110-cl01
POOL_SELECTOR: vsphere-type=vcf9
TEST_SKIPS: provisioning should mount multiple PV pointing to the same storage
on the same node
observers:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ tests:
steps:
cluster_profile: vsphere-elastic
env:
POOLS: vcenter-110.ci.ibmc.devcluster.openshift.com-vcenter-110-dc01-vcenter-110-cl01
POOL_SELECTOR: vsphere-type=vcf9
observers:
enable:
- observers-resource-watch
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -629,7 +629,7 @@ tests:
steps:
cluster_profile: vsphere-elastic
env:
POOLS: vcenter-110.ci.ibmc.devcluster.openshift.com-vcenter-110-dc01-vcenter-110-cl01
POOL_SELECTOR: vsphere-type=vcf9
TEST_SKIPS: provisioning should mount multiple PV pointing to the same storage
on the same node
observers:
Expand Down Expand Up @@ -691,7 +691,7 @@ tests:
steps:
cluster_profile: vsphere-elastic
env:
POOLS: vcenter-110.ci.ibmc.devcluster.openshift.com-vcenter-110-dc01-vcenter-110-cl01
POOL_SELECTOR: vsphere-type=vcf9
TEST_SKIPS: provisioning should mount multiple PV pointing to the same storage
on the same node
observers:
Expand Down Expand Up @@ -742,7 +742,7 @@ tests:
cluster_profile: vsphere-elastic
env:
ENABLE_LONG_CSI_CERTIFICATION_TESTS: "true"
POOLS: vcenter-110.ci.ibmc.devcluster.openshift.com-vcenter-110-dc01-vcenter-110-cl01
POOL_SELECTOR: vsphere-type=vcf9
TEST_SKIPS: provisioning should mount multiple PV pointing to the same storage
on the same node
observers:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -830,7 +830,7 @@ tests:
steps:
cluster_profile: vsphere-elastic
env:
POOLS: vcenter-110.ci.ibmc.devcluster.openshift.com-vcenter-110-dc01-vcenter-110-cl01
POOL_SELECTOR: vsphere-type=vcf9
TEST_SKIPS: provisioning should mount multiple PV pointing to the same storage
on the same node
observers:
Expand Down Expand Up @@ -902,7 +902,7 @@ tests:
steps:
cluster_profile: vsphere-elastic
env:
POOLS: vcenter-110.ci.ibmc.devcluster.openshift.com-vcenter-110-dc01-vcenter-110-cl01
POOL_SELECTOR: vsphere-type=vcf9
TEST_SKIPS: provisioning should mount multiple PV pointing to the same storage
on the same node
observers:
Expand Down Expand Up @@ -953,7 +953,7 @@ tests:
cluster_profile: vsphere-elastic
env:
ENABLE_LONG_CSI_CERTIFICATION_TESTS: "true"
POOLS: vcenter-110.ci.ibmc.devcluster.openshift.com-vcenter-110-dc01-vcenter-110-cl01
POOL_SELECTOR: vsphere-type=vcf9
TEST_SKIPS: provisioning should mount multiple PV pointing to the same storage
on the same node
observers:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -899,7 +899,7 @@ tests:
steps:
cluster_profile: vsphere-elastic
env:
POOLS: vcenter-110.ci.ibmc.devcluster.openshift.com-vcenter-110-dc01-vcenter-110-cl01
POOL_SELECTOR: vsphere-type=vcf9
TEST_SKIPS: provisioning should mount multiple PV pointing to the same storage
on the same node
observers:
Expand Down Expand Up @@ -980,7 +980,7 @@ tests:
steps:
cluster_profile: vsphere-elastic
env:
POOLS: vcenter-110.ci.ibmc.devcluster.openshift.com-vcenter-110-dc01-vcenter-110-cl01
POOL_SELECTOR: vsphere-type=vcf9
TEST_SKIPS: provisioning should mount multiple PV pointing to the same storage
on the same node
observers:
Expand Down Expand Up @@ -1035,7 +1035,7 @@ tests:
env:
ENABLE_LONG_CSI_CERTIFICATION_TESTS: "true"
ENABLE_VSPHERE_FILESHARE_TESTS: "true"
POOLS: vcenter-110.ci.ibmc.devcluster.openshift.com-vcenter-110-dc01-vcenter-110-cl01
POOL_SELECTOR: vsphere-type=vcf9
TEST_SKIPS: 'Testpattern: Dynamic PV (xfs).*multiVolume.*should concurrently
access the single volume from pods on different node\|Testpattern: Dynamic
PV (block volmode).*multiVolume.*should concurrently access the single volume
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -899,7 +899,7 @@ tests:
steps:
cluster_profile: vsphere-elastic
env:
POOLS: vcenter-110.ci.ibmc.devcluster.openshift.com-vcenter-110-dc01-vcenter-110-cl01
POOL_SELECTOR: vsphere-type=vcf9
TEST_SKIPS: provisioning should mount multiple PV pointing to the same storage
on the same node
observers:
Expand Down Expand Up @@ -980,7 +980,7 @@ tests:
steps:
cluster_profile: vsphere-elastic
env:
POOLS: vcenter-110.ci.ibmc.devcluster.openshift.com-vcenter-110-dc01-vcenter-110-cl01
POOL_SELECTOR: vsphere-type=vcf9
TEST_SKIPS: provisioning should mount multiple PV pointing to the same storage
on the same node
observers:
Expand Down Expand Up @@ -1035,7 +1035,7 @@ tests:
env:
ENABLE_LONG_CSI_CERTIFICATION_TESTS: "true"
ENABLE_VSPHERE_FILESHARE_TESTS: "true"
POOLS: vcenter-110.ci.ibmc.devcluster.openshift.com-vcenter-110-dc01-vcenter-110-cl01
POOL_SELECTOR: vsphere-type=vcf9
TEST_SKIPS: 'Testpattern: Dynamic PV (xfs).*multiVolume.*should concurrently
access the single volume from pods on different node\|Testpattern: Dynamic
PV (block volmode).*multiVolume.*should concurrently access the single volume
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ tests:
cluster_profile: vsphere-elastic
env:
ENABLE_LONG_CSI_CERTIFICATION_TESTS: "true"
POOLS: vcenter-110.ci.ibmc.devcluster.openshift.com-vcenter-110-dc01-vcenter-110-cl01
POOL_SELECTOR: vsphere-type=vcf9
workflow: openshift-e2e-vsphere-csi
- as: verify-deps
steps:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ tests:
steps:
cluster_profile: vsphere-elastic
env:
POOLS: vcenter-110.ci.ibmc.devcluster.openshift.com-vcenter-110-dc01-vcenter-110-cl01
POOL_SELECTOR: vsphere-type=vcf9
TEST_SKIPS: provisioning should mount multiple PV pointing to the same storage
on the same node
workflow: openshift-e2e-vsphere-csi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ tests:
cluster_profile: vsphere-elastic
env:
ENABLE_LONG_CSI_CERTIFICATION_TESTS: "true"
POOLS: vcenter-110.ci.ibmc.devcluster.openshift.com-vcenter-110-dc01-vcenter-110-cl01
POOL_SELECTOR: vsphere-type=vcf9
TEST_SKIPS: provisioning should mount multiple PV pointing to the same storage
on the same node
workflow: openshift-e2e-vsphere-csi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ tests:
cluster_profile: vsphere-elastic
env:
ENABLE_LONG_CSI_CERTIFICATION_TESTS: "true"
POOLS: vcenter-110.ci.ibmc.devcluster.openshift.com-vcenter-110-dc01-vcenter-110-cl01
POOL_SELECTOR: vsphere-type=vcf9
TEST_SKIPS: provisioning should mount multiple PV pointing to the same storage
on the same node
workflow: openshift-e2e-vsphere-csi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ tests:
cluster_profile: vsphere-elastic
env:
ENABLE_LONG_CSI_CERTIFICATION_TESTS: "true"
POOLS: vcenter-110.ci.ibmc.devcluster.openshift.com-vcenter-110-dc01-vcenter-110-cl01
POOL_SELECTOR: vsphere-type=vcf9
TEST_SKIPS: provisioning should mount multiple PV pointing to the same storage
on the same node
workflow: openshift-e2e-vsphere-csi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ tests:
cluster_profile: vsphere-elastic
env:
ENABLE_LONG_CSI_CERTIFICATION_TESTS: "true"
POOLS: vcenter-110.ci.ibmc.devcluster.openshift.com-vcenter-110-dc01-vcenter-110-cl01
POOL_SELECTOR: vsphere-type=vcf9
TEST_SKIPS: provisioning should mount multiple PV pointing to the same storage
on the same node
workflow: openshift-e2e-vsphere-csi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ tests:
cluster_profile: vsphere-elastic
env:
ENABLE_LONG_CSI_CERTIFICATION_TESTS: "true"
POOLS: vcenter-110.ci.ibmc.devcluster.openshift.com-vcenter-110-dc01-vcenter-110-cl01
POOL_SELECTOR: vsphere-type=vcf9
workflow: openshift-e2e-vsphere-csi
- as: verify-deps
steps:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ tests:
cluster_profile: vsphere-elastic
env:
ENABLE_LONG_CSI_CERTIFICATION_TESTS: "true"
POOLS: vcenter-110.ci.ibmc.devcluster.openshift.com-vcenter-110-dc01-vcenter-110-cl01
POOL_SELECTOR: vsphere-type=vcf9
workflow: openshift-e2e-vsphere-csi
- as: verify-deps
steps:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ tests:
cluster_profile: vsphere-elastic
env:
ENABLE_LONG_CSI_CERTIFICATION_TESTS: "true"
POOLS: vcenter-110.ci.ibmc.devcluster.openshift.com-vcenter-110-dc01-vcenter-110-cl01
POOL_SELECTOR: vsphere-type=vcf9
workflow: openshift-e2e-vsphere-csi
- as: verify-deps
steps:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ tests:
cluster_profile: vsphere-elastic
env:
ENABLE_LONG_CSI_CERTIFICATION_TESTS: "true"
POOLS: vcenter-110.ci.ibmc.devcluster.openshift.com-vcenter-110-dc01-vcenter-110-cl01
POOL_SELECTOR: vsphere-type=vcf9
workflow: openshift-e2e-vsphere-csi
- as: verify-deps
steps:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ tests:
steps:
cluster_profile: vsphere-elastic
env:
POOLS: vcenter-110.ci.ibmc.devcluster.openshift.com-vcenter-110-dc01-vcenter-110-cl01
POOL_SELECTOR: vsphere-type=vcf9
TEST_SKIPS: provisioning should mount multiple PV pointing to the same storage
on the same node
workflow: openshift-e2e-vsphere-csi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ tests:
cluster_profile: vsphere-elastic
env:
ENABLE_LONG_CSI_CERTIFICATION_TESTS: "true"
POOLS: vcenter-110.ci.ibmc.devcluster.openshift.com-vcenter-110-dc01-vcenter-110-cl01
POOL_SELECTOR: vsphere-type=vcf9
TEST_SKIPS: provisioning should mount multiple PV pointing to the same storage
on the same node
workflow: openshift-e2e-vsphere-csi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ tests:
cluster_profile: vsphere-elastic
env:
ENABLE_LONG_CSI_CERTIFICATION_TESTS: "true"
POOLS: vcenter-110.ci.ibmc.devcluster.openshift.com-vcenter-110-dc01-vcenter-110-cl01
POOL_SELECTOR: vsphere-type=vcf9
TEST_SKIPS: provisioning should mount multiple PV pointing to the same storage
on the same node
workflow: openshift-e2e-vsphere-csi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ tests:
cluster_profile: vsphere-elastic
env:
ENABLE_LONG_CSI_CERTIFICATION_TESTS: "true"
POOLS: vcenter-110.ci.ibmc.devcluster.openshift.com-vcenter-110-dc01-vcenter-110-cl01
POOL_SELECTOR: vsphere-type=vcf9
TEST_SKIPS: provisioning should mount multiple PV pointing to the same storage
on the same node
workflow: openshift-e2e-vsphere-csi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ tests:
cluster_profile: vsphere-elastic
env:
ENABLE_LONG_CSI_CERTIFICATION_TESTS: "true"
POOLS: vcenter-110.ci.ibmc.devcluster.openshift.com-vcenter-110-dc01-vcenter-110-cl01
POOL_SELECTOR: vsphere-type=vcf9
TEST_SKIPS: provisioning should mount multiple PV pointing to the same storage
on the same node
workflow: openshift-e2e-vsphere-csi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ tests:
cluster_profile: vsphere-elastic
env:
ENABLE_LONG_CSI_CERTIFICATION_TESTS: "true"
POOLS: vcenter-110.ci.ibmc.devcluster.openshift.com-vcenter-110-dc01-vcenter-110-cl01
POOL_SELECTOR: vsphere-type=vcf9
workflow: openshift-e2e-vsphere-csi
- as: verify-deps
steps:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ tests:
cluster_profile: vsphere-elastic
env:
ENABLE_LONG_CSI_CERTIFICATION_TESTS: "true"
POOLS: vcenter-110.ci.ibmc.devcluster.openshift.com-vcenter-110-dc01-vcenter-110-cl01
POOL_SELECTOR: vsphere-type=vcf9
workflow: openshift-e2e-vsphere-csi
- as: verify-deps
steps:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ tests:
cluster_profile: vsphere-elastic
env:
ENABLE_LONG_CSI_CERTIFICATION_TESTS: "true"
POOLS: vcenter-110.ci.ibmc.devcluster.openshift.com-vcenter-110-dc01-vcenter-110-cl01
POOL_SELECTOR: vsphere-type=vcf9
workflow: openshift-e2e-vsphere-csi
- as: verify-deps
steps:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,12 @@ if [[ -z "${LEASED_RESOURCE}" ]]; then
exit 1
fi

# Make sure POOLS and POOL_COUNT are not both configured
if [[ "${POOL_COUNT}" != "1" && "${POOLS}" != "" ]]; then
echo "Cannot set both POOL_COUNT and POOLS"
exit 1
fi

export GOVC_TLS_CA_CERTS=/var/run/vault/vsphere-ibmcloud-ci/vcenter-certificate

# only used in zonal and vsphere environments with
Expand Down Expand Up @@ -247,6 +253,22 @@ if [[ "${PROW_JOB_TYPE}" == "presubmit" ]]; then
git-pr: \"${GIT_PR}\""
fi

# Handle POOL_SELECTOR if provided (parse once and use for all leases)
poolSelector=""
if [ -n "${POOL_SELECTOR:-}" ]; then
# Parse POOL_SELECTOR in format "key=value"
if [[ "${POOL_SELECTOR}" =~ ^([^=]+)=([^=]+)$ ]]; then
selector_key="${BASH_REMATCH[1]}"
selector_value="${BASH_REMATCH[2]}"
poolSelector="poolSelector:
${selector_key}: \"${selector_value}\""
log "setting poolSelector with ${selector_key}=${selector_value}"
else
log "ERROR: POOL_SELECTOR must be in format 'key=value', got: ${POOL_SELECTOR}"
exit 1
fi
fi

if [[ -n "${VSPHERE_BASTION_LEASED_RESOURCE:-}" ]]; then
log "creating bastion lease resource ${VSPHERE_BASTION_LEASED_RESOURCE}"

Expand All @@ -269,6 +291,7 @@ spec:
memory: 0
network-type: \"${NETWORK_TYPE}\"
requiresPool: \"${VSPHERE_BASTION_LEASED_RESOURCE}\"
${poolSelector}
networks: 1" | oc create --kubeconfig "${SA_KUBECONFIG}" -o json -f - | jq -r '.metadata.name')")
fi

Expand Down Expand Up @@ -354,7 +377,9 @@ spec:
vcpus: ${OPENSHIFT_REQUIRED_CORES}
memory: ${OPENSHIFT_REQUIRED_MEMORY}
network-type: \"${NETWORK_TYPE}\"
pool-count: ${POOL_COUNT}
${requiredPool}
${poolSelector}
networks: $networks_number" | oc create --kubeconfig "${SA_KUBECONFIG}" -o json -f - | jq -r '.metadata.name')")
done

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,13 @@ ref:
documentation: when defined, the legacy platform spec will be populated.
- name: POOLS
default: ""
documentation: A space separated list of pools for which leases are to be acquired. If not defined, the vsphere-capacity-manager will allocate from an available pool.
documentation: A space separated list of pools for which leases are to be acquired. If not defined, the vsphere-capacity-manager will allocate from an available pool. This field is not to be used with POOL_COUNT.
- name: POOL_COUNT
default: "1"
documentation: The number of pools to requests. Use this to allow VCM to select the specified number of pools. This field is not to be used with POOL.
- name: POOL_SELECTOR
default: ""
documentation: This specifies the poolSelector to configure for the leases used by this job. The value should be in the format of "key=value". Currently only one label is supported.
- name: OPENSHIFT_REQUIRED_CORES
default: ""
documentation: The number of vCPUs assigned to the job.
Expand Down