[CI] Change references from bosh2 to bosh

Author: proplex

ci/scripts/shipit

@@ -47,7 +47,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 ###############################################################
 
 cd ${REPO_ROOT}
-RELEASE_NAME=$(bosh2 int config/final.yml --path /final_name)
+RELEASE_NAME=$(bosh int config/final.yml --path /final_name)
 
 cat > config/private.yml <<YAML
 ---
@@ -62,8 +62,8 @@ header "Pulling in any git submodules..."
 git submodule update --init --recursive --force
 
 header "Create 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

@@ -2,7 +2,7 @@
 #
 # ci/scripts/testflight
 #
-# Script for testing a BOSH release using bosh2
+# Script for testing a BOSH release using bosh
 #
 # author:  James Hunt <[email protected]>
 
@@ -66,10 +66,10 @@ fi
 
 
 header "Cleaning up from any previous deployments..."
-bosh2 -n delete-deployment
+bosh -n delete-deployment
 
 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
 ---
@@ -79,16 +79,16 @@ 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 "Deploying to ${BOSH_ENVIRONMENT}..."
-release_name=$(bosh2 int config/final.yml --path /final_name)
+release_name=$(bosh int config/final.yml --path /final_name)
 
 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_final_version=$(spruce json dev_releases/*/index.yml | jq -r ".builds[].version" | sed -e "s%+.*%%")
 release_dev_version="${release_final_version}.latest"
@@ -129,30 +129,30 @@ done
 
 set -x
 
-bosh2 int ${MANIFEST_PATH} \
+bosh int ${MANIFEST_PATH} \
   -o tmp/deployment.yml    \
   ${op_patch_files_flags}            \
   --vars-store tmp/creds.yml \
   --vars-file  tmp/vars.yml  \
   --var-errs \
     > tmp/manifest.yml
 
-bosh2 -n deploy tmp/manifest.yml
+bosh -n deploy tmp/manifest.yml
 
 TEST_ERRAND=${TEST_ERRAND:-} # backwards compatibility
 TEST_ERRANDS=${TEST_ERRANDS:-$TEST_ERRAND}
 if [[ -n ${TEST_ERRANDS} ]]; then
 	for errand in ${TEST_ERRANDS}; do
 		header "Running '${errand}' errand"
-		bosh2 -n run-errand ${errand}
+		bosh -n run-errand ${errand}
 	done
 else
 	echo "No test errands specified, skipping."
 fi
 
 if [[ -z ${SKIP_DELETE_DEPLOYMENT:-} ]]; then
 	header "Cleaning up after successful deployment..."
-	bosh2 -n delete-deployment
+	bosh -n delete-deployment
 else
 	header "Skipping cleanup of successful deployment."
 fi

ci/scripts/update-blob

@@ -23,13 +23,13 @@ EOF
 
 blobs_to_remove=$(spruce json config/blobs.yml | jq -r "keys[] | select(test(\"${BLOB_CLEANUP}\"))")
 if [[ ! -z $blobs_to_remove ]]; then
-  echo "$blobs_to_remove" | xargs -L1 bosh2 remove-blob
+  echo "$blobs_to_remove" | xargs -L1 bosh remove-blob
 fi
 
 # expand ${VERSION} env var into file path
 eval "blob_destination=${BLOB_DESTINATION}"
-bosh2 add-blob ../${BLOB_DIR}/${BLOB_BINARY} "${blob_destination}"
-bosh2 -n upload-blobs
+bosh add-blob ../${BLOB_DIR}/${BLOB_BINARY} "${blob_destination}"
+bosh -n upload-blobs
 rm config/private.yml
 popd