Update CI/CD bosh2 -> bosh references

Author: jhunt

ci/scripts/shipit

@@ -61,7 +61,7 @@ fi
 ###############################################################
 
 cd ${REPO_ROOT}
-RELEASE_NAME=$(bosh2 int config/final.yml --path /final_name)
+RELEASE_NAME=$(bosh int config/final.yml --path /final_name)
 
 ######
 ######
@@ -80,8 +80,8 @@ YAML
 ######
 ######
 header "Creating final release..."
-bosh2 -n create-release --final --version "${VERSION}"
-bosh2 -n create-release releases/$RELEASE_NAME/$RELEASE_NAME-$VERSION.yml \
+bosh -n create-release --final --version "${VERSION}"
+bosh -n create-release releases/$RELEASE_NAME/$RELEASE_NAME-$VERSION.yml \
               --tarball releases/$RELEASE_NAME/$RELEASE_NAME-$VERSION.tgz
 cd -
 

ci/scripts/testflight

@@ -55,13 +55,13 @@ fi
 ######
 ######
 header "Cleaning up any previous '${BOSH_DEPLOYMENT}' deployments..."
-bosh2 -n delete-deployment --force || true
+bosh -n delete-deployment --force || true
 
 ######
 ######
 ######
 header "Creating candidate BOSH release..."
-bosh2 -n reset-release # in case dev_releases/ is in repo accidentally
+bosh -n reset-release # in case dev_releases/ is in repo accidentally
 cat > config/private.yml <<YAML
 ---
 blobstore:
@@ -70,18 +70,18 @@ blobstore:
     access_key_id: ${AWS_ACCESS_KEY}
     secret_access_key: ${AWS_SECRET_KEY}
 YAML
-bosh2 create-release
-bosh2 upload-release --rebase
+bosh create-release
+bosh upload-release --rebase
 
 ######
 ######
 ######
 header "Choosing cloud-config options"
-vm_type=$(  bosh2 int <(bosh2 cloud-config) --path /vm_types/0/name)
-disk_type=$(bosh2 int <(bosh2 cloud-config) --path /disk_types/0/name)
-network=$(  bosh2 int <(bosh2 cloud-config) --path /networks/0/name)
+vm_type=$(  bosh int <(bosh cloud-config) --path /vm_types/0/name)
+disk_type=$(bosh int <(bosh cloud-config) --path /disk_types/0/name)
+network=$(  bosh int <(bosh cloud-config) --path /networks/0/name)
 
-release_name=$(bosh2 int config/final.yml --path /final_name)
+release_name=$(bosh int config/final.yml --path /final_name)
 release_version=$(spruce json dev_releases/*/index.yml | jq -r ".builds[].version" | sed -e "s%+.*%%")
 
 ######
@@ -127,21 +127,21 @@ done) > overrides.yml
 ######
 ######
 header "Deploying to ${BOSH_ENVIRONMENT}..."
-bosh2 -n deploy $MANIFEST_PATH -o overrides.yml
+bosh -n deploy $MANIFEST_PATH -o overrides.yml
 
 ######
 ######
 ######
 if [[ -n ${TEST_ERRAND:-} ]]; then
   header "Running '${TEST_ERRAND}' errand"
-  bosh2 -n run-errand ${TEST_ERRAND}
+  bosh -n run-errand ${TEST_ERRAND}
 fi
 
 ######
 ######
 ######
 header "Cleaning up testflight '${BOSH_DEPLOYMENT}' deployment..."
-bosh2 -n delete-deployment --force
+bosh -n delete-deployment --force
 
 echo
 echo

ci/scripts/update-blob

@@ -67,7 +67,7 @@ EOF
 header "Performing cleanup on old blobs"
 remove=$(spruce json config/blobs.yml | jq -r "keys[] | select(test(\"${BLOB_CLEANUP}\"))")
 if [[ -n $remove ]]; then
-  echo "$remove" | xargs -L1 bosh2 remove-blob
+  echo "$remove" | xargs -L1 bosh remove-blob
 fi
 
 ######
@@ -97,17 +97,17 @@ eval "blob_dst=${BLOB_DESTINATION}"
 if [[ "$BLOB_BINARY" == "*" ]]; then
   for blob_src in ../${BLOB_DIR}/${BLOB_BINARY}; do
     base=${blob_src##*/}
-    bosh2 add-blob "${blob_src}" "${blob_dst}/${base}"
+    bosh add-blob "${blob_src}" "${blob_dst}/${base}"
   done
 else
-  bosh2 add-blob "../${BLOB_DIR}/${BLOB_BINARY}" "${blob_dst}"
+  bosh add-blob "../${BLOB_DIR}/${BLOB_BINARY}" "${blob_dst}"
 fi
 
 ######
 ######
 ######
 header "Uploading blobs to blobstore (AWS)"
-bosh2 -n upload-blobs
+bosh -n upload-blobs
 rm config/private.yml
 popd
 

ci/scripts/wait-until-proxy-bosh-cf-running

@@ -40,13 +40,13 @@ if [[ "${PROXY_IP:-X}" != "X" ]]; then
 fi
 
 header "Checking bosh available..."
-until bosh2 env; do
+until bosh env; do
   echo "Waiting until bosh available..."
 	sleep 60
 done
 
 if [[ -f git/tmp/vars.yml ]]; then
-	cf_api_url=$(bosh2 int git/tmp/vars.yml --path /cf-api-url)
+	cf_api_url=$(bosh int git/tmp/vars.yml --path /cf-api-url)
 	if [[ "${cf_api_url:-X}" != "X" ]]; then
 		header "Checking Cloud Foundry available..."
 		until cf api $cf_api_url --skip-ssl-validation; do