fix

Author: chrischdi

hack/e2e.sh

@@ -39,7 +39,7 @@ fi
 # Redirect all output of this script additionally to a file in artifacts,
 # so we can create a junit file with its content in case of general CI failures.
 # This way the bash script's log can be analyzed using k8s-triage.
-exec &> >(tee script.log)
+exec &> >(tee "${ARTIFACTS}/junit.e2e-sh.xml")
 
 # shellcheck source=./hack/ensure-go.sh
 source "${REPO_ROOT}/hack/ensure-go.sh"
@@ -57,7 +57,7 @@ on_exit() {
     [[ -z ${HEART_BEAT_PID:-} ]] || kill -9 "${HEART_BEAT_PID}"
 
     # If Boskos is being used then release the vsphere project.
-    [ -z "${BOSKOS_HOST:-}" ] || docker run -e VSPHERE_USERNAME -e VSPHERE_PASSWORD gcr.io/k8s-staging-capi-vsphere/extra/boskosctl:latest release --boskos-host="${BOSKOS_HOST}" --resource-owner="${BOSKOS_RESOURCE_OWNER}" --resource-name="${BOSKOS_RESOURCE_NAME}" --vsphere-server="${VSPHERE_SERVER}" --vsphere-tls-thumbprint="${VSPHERE_TLS_THUMBPRINT}" --vsphere-folder="${BOSKOS_RESOURCE_FOLDER}" --vsphere-resource-pool="${BOSKOS_RESOURCE_POOL}"
+    [ -z "${BOSKOS_HOST:-}" && -z "${BOSKOS_RESOURCE_NAME:-}" ] || docker run -e VSPHERE_USERNAME -e VSPHERE_PASSWORD gcr.io/k8s-staging-capi-vsphere/extra/boskosctl:latest release --boskos-host="${BOSKOS_HOST}" --resource-owner="${BOSKOS_RESOURCE_OWNER}" --resource-name="${BOSKOS_RESOURCE_NAME}" --vsphere-server="${VSPHERE_SERVER}" --vsphere-tls-thumbprint="${VSPHERE_TLS_THUMBPRINT}" --vsphere-folder="${BOSKOS_RESOURCE_FOLDER}" --vsphere-resource-pool="${BOSKOS_RESOURCE_POOL}"
   fi
 
   # Cleanup VSPHERE_PASSWORD from temporary artifacts directory.