particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace GOVC_DATACENTER with GOVMOMI_DATACENTER ENV var

Browse source 
both are defined in CI, but the GOVC_ prefix doesn't match anything
else. Additionally this value is slightly different for vCenter8 and may
lead to failures if not unified.
This commit is contained in:
Alexander Todorov 2024-07-26 11:57:31 +03:00 • committed by Alexander Todorov
parent fdb8cfb26a
commit dd82900f53
1 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

22
test/cases/api/common/vsphere.sh
View file

@ -25,7 +25,7 @@ function installClientVSphere() {
} }
function checkEnvVSphere() { function checkEnvVSphere() {
printenv GOVMOMI_USERNAME GOVMOMI_PASSWORD GOVMOMI_URL GOVMOMI_CLUSTER GOVC_DATACENTER GOVMOMI_DATASTORE GOVMOMI_FOLDER GOVMOMI_NETWORK > /dev/null printenv GOVMOMI_USERNAME GOVMOMI_PASSWORD GOVMOMI_URL GOVMOMI_CLUSTER GOVMOMI_DATACENTER GOVMOMI_DATASTORE GOVMOMI_FOLDER GOVMOMI_NETWORK > /dev/null
} }
# Create a cloud-int user-data file # Create a cloud-int user-data file
@ -136,7 +136,7 @@ function verifyInVSphere() {
$GOVC_CMD import.vmdk \ $GOVC_CMD import.vmdk \
-u "${GOVMOMI_USERNAME}:${GOVMOMI_PASSWORD}@${GOVMOMI_URL}" \ -u "${GOVMOMI_USERNAME}:${GOVMOMI_PASSWORD}@${GOVMOMI_URL}" \
-k=true \ -k=true \
-dc="${GOVC_DATACENTER}" \ -dc="${GOVMOMI_DATACENTER}" \
-pool="${GOVMOMI_CLUSTER}"/Resources \ -pool="${GOVMOMI_CLUSTER}"/Resources \
-ds="${GOVMOMI_DATASTORE}" \ -ds="${GOVMOMI_DATASTORE}" \
"${WORKDIR}/${VSPHERE_IMAGE_NAME}" \ "${WORKDIR}/${VSPHERE_IMAGE_NAME}" \
@ -147,7 +147,7 @@ function verifyInVSphere() {
$GOVC_CMD vm.create \ $GOVC_CMD vm.create \
-u "${GOVMOMI_USERNAME}:${GOVMOMI_PASSWORD}@${GOVMOMI_URL}" \ -u "${GOVMOMI_USERNAME}:${GOVMOMI_PASSWORD}@${GOVMOMI_URL}" \
-k=true \ -k=true \
-dc="${GOVC_DATACENTER}" \ -dc="${GOVMOMI_DATACENTER}" \
-pool="${GOVMOMI_CLUSTER}"/Resources \ -pool="${GOVMOMI_CLUSTER}"/Resources \
-ds="${GOVMOMI_DATASTORE}" \ -ds="${GOVMOMI_DATASTORE}" \
-folder="${GOVMOMI_FOLDER}" \ -folder="${GOVMOMI_FOLDER}" \
@ -172,7 +172,7 @@ function verifyInVSphere() {
$GOVC_CMD datastore.upload \ $GOVC_CMD datastore.upload \
-u "${GOVMOMI_USERNAME}:${GOVMOMI_PASSWORD}@${GOVMOMI_URL}" \ -u "${GOVMOMI_USERNAME}:${GOVMOMI_PASSWORD}@${GOVMOMI_URL}" \
-k=true \ -k=true \
-dc="${GOVC_DATACENTER}" \ -dc="${GOVMOMI_DATACENTER}" \
-ds="${GOVMOMI_DATASTORE}" \ -ds="${GOVMOMI_DATASTORE}" \
"${_ci_iso_path}" \ "${_ci_iso_path}" \
"${VSPHERE_CIDATA_ISO_PATH}" "${VSPHERE_CIDATA_ISO_PATH}"
@ -182,14 +182,14 @@ function verifyInVSphere() {
_cdrom_device="$($GOVC_CMD device.cdrom.add \ _cdrom_device="$($GOVC_CMD device.cdrom.add \
-u "${GOVMOMI_USERNAME}:${GOVMOMI_PASSWORD}@${GOVMOMI_URL}" \ -u "${GOVMOMI_USERNAME}:${GOVMOMI_PASSWORD}@${GOVMOMI_URL}" \
-k=true \ -k=true \
-dc="${GOVC_DATACENTER}" \ -dc="${GOVMOMI_DATACENTER}" \
-vm "${VSPHERE_VM_NAME}")" -vm "${VSPHERE_VM_NAME}")"
greenprint "💿 Inserting the cloud-init ISO into the CD-ROM device" greenprint "💿 Inserting the cloud-init ISO into the CD-ROM device"
$GOVC_CMD device.cdrom.insert \ $GOVC_CMD device.cdrom.insert \
-u "${GOVMOMI_USERNAME}:${GOVMOMI_PASSWORD}@${GOVMOMI_URL}" \ -u "${GOVMOMI_USERNAME}:${GOVMOMI_PASSWORD}@${GOVMOMI_URL}" \
-k=true \ -k=true \
-dc="${GOVC_DATACENTER}" \ -dc="${GOVMOMI_DATACENTER}" \
-ds="${GOVMOMI_DATASTORE}" \ -ds="${GOVMOMI_DATASTORE}" \
-vm "${VSPHERE_VM_NAME}" \ -vm "${VSPHERE_VM_NAME}" \
-device "${_cdrom_device}" \ -device "${_cdrom_device}" \
@ -200,14 +200,14 @@ function verifyInVSphere() {
$GOVC_CMD vm.power \ $GOVC_CMD vm.power \
-u "${GOVMOMI_USERNAME}:${GOVMOMI_PASSWORD}@${GOVMOMI_URL}" \ -u "${GOVMOMI_USERNAME}:${GOVMOMI_PASSWORD}@${GOVMOMI_URL}" \
-k=true \ -k=true \
-dc="${GOVC_DATACENTER}" \ -dc="${GOVMOMI_DATACENTER}" \
-on "${VSPHERE_VM_NAME}" -on "${VSPHERE_VM_NAME}"
HOST=$($GOVC_CMD vm.ip \ HOST=$($GOVC_CMD vm.ip \
-u "${GOVMOMI_USERNAME}:${GOVMOMI_PASSWORD}@${GOVMOMI_URL}" \ -u "${GOVMOMI_USERNAME}:${GOVMOMI_PASSWORD}@${GOVMOMI_URL}" \
-k=true \ -k=true \
-v4=true \ -v4=true \
-dc="${GOVC_DATACENTER}" \ -dc="${GOVMOMI_DATACENTER}" \
"${VSPHERE_VM_NAME}") "${VSPHERE_VM_NAME}")
greenprint "⏱ Waiting for the VSphere VM to respond to ssh" greenprint "⏱ Waiting for the VSphere VM to respond to ssh"
_instanceWaitSSH "${HOST}" _instanceWaitSSH "${HOST}"
@ -228,14 +228,14 @@ function cleanupVSphere() {
$GOVC_CMD vm.destroy \ $GOVC_CMD vm.destroy \
-u "${GOVMOMI_USERNAME}:${GOVMOMI_PASSWORD}@${GOVMOMI_URL}" \ -u "${GOVMOMI_USERNAME}:${GOVMOMI_PASSWORD}@${GOVMOMI_URL}" \
-k=true \ -k=true \
-dc="${GOVC_DATACENTER}" \ -dc="${GOVMOMI_DATACENTER}" \
"${VSPHERE_VM_NAME}" "${VSPHERE_VM_NAME}"
greenprint "🧹 Cleaning up the VSphere Datastore" greenprint "🧹 Cleaning up the VSphere Datastore"
$GOVC_CMD datastore.rm \ $GOVC_CMD datastore.rm \
-u "${GOVMOMI_USERNAME}:${GOVMOMI_PASSWORD}@${GOVMOMI_URL}" \ -u "${GOVMOMI_USERNAME}:${GOVMOMI_PASSWORD}@${GOVMOMI_URL}" \
-k=true \ -k=true \
-dc="${GOVC_DATACENTER}" \ -dc="${GOVMOMI_DATACENTER}" \
-ds="${GOVMOMI_DATASTORE}" \ -ds="${GOVMOMI_DATASTORE}" \
-f \ -f \
"${VSPHERE_CIDATA_ISO_PATH}" "${VSPHERE_CIDATA_ISO_PATH}"
@ -243,7 +243,7 @@ function cleanupVSphere() {
$GOVC_CMD datastore.rm \ $GOVC_CMD datastore.rm \
-u "${GOVMOMI_USERNAME}:${GOVMOMI_PASSWORD}@${GOVMOMI_URL}" \ -u "${GOVMOMI_USERNAME}:${GOVMOMI_PASSWORD}@${GOVMOMI_URL}" \
-k=true \ -k=true \
-dc="${GOVC_DATACENTER}" \ -dc="${GOVMOMI_DATACENTER}" \
-ds="${GOVMOMI_DATASTORE}" \ -ds="${GOVMOMI_DATASTORE}" \
-f \ -f \
"${VSPHERE_VM_NAME}" "${VSPHERE_VM_NAME}"