diff --git a/daisy_release_cloudbuild.yaml b/daisy_release_cloudbuild.yaml index 83e7f26b5..8117dc59a 100644 --- a/daisy_release_cloudbuild.yaml +++ b/daisy_release_cloudbuild.yaml @@ -49,7 +49,7 @@ steps: args: ['build', '-o=windows/gce_export.exe', 'github.com/GoogleCloudPlatform/compute-image-tools/cli_tools/gce_export'] env: ['GOOS=windows'] - name: 'gcr.io/cloud-builders/go' - args: ['build', '-o=windows/import_precheck.exe', 'github.com/GoogleCloudPlatform/compute-image-tools/cli_tools/import_precheck] + args: ['build', '-o=windows/import_precheck.exe', 'github.com/GoogleCloudPlatform/compute-image-tools/cli_tools/import_precheck'] env: ['GOOS=windows'] - name: 'gcr.io/cloud-builders/gsutil' args: ['cp', './windows/*', 'gs://compute-image-tools/release/windows/'] diff --git a/daisy_workflows/export/export_disk.sh b/daisy_workflows/export/export_disk.sh index 9ec86edeb..ca8d1696f 100644 --- a/daisy_workflows/export/export_disk.sh +++ b/daisy_workflows/export/export_disk.sh @@ -13,22 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -echo "Installing necessary packages..." -apt-get update -apt-get -q -y install git-core - function exit_error { echo "export failed" exit 1 } -wget --quiet https://storage.googleapis.com/golang/go1.8.3.linux-amd64.tar.gz || exit_error -tar -C /usr/local -xzf go1.8.3.linux-amd64.tar.gz || exit_error -export PATH=$PATH:/usr/local/go/bin -export GOPATH=~/go -export PATH=$PATH:~/go/bin -go get -t -v github.com/GoogleCloudPlatform/compute-image-tools/cli_tools/gce_export || exit_error +wget --quiet https://storage.googleapis.com/compute-image-tools/release/linux/gce_export || exit_error +chmod +x ./gce_export URL="http://metadata/computeMetadata/v1/instance/attributes" GCS_PATH=$(curl -f -H Metadata-Flavor:Google ${URL}/gcs-path) @@ -36,9 +28,9 @@ LICENSES=$(curl -f -H Metadata-Flavor:Google ${URL}/licenses) echo "Uploading image." if [[ -n $LICENSES ]]; then - gce_export -gcs_path "$GCS_PATH" -disk /dev/sdb -licenses "$LICENSES" -y || exit_error + ./gce_export -gcs_path "$GCS_PATH" -disk /dev/sdb -licenses "$LICENSES" -y || exit_error else - gce_export -gcs_path "$GCS_PATH" -disk /dev/sdb -y || exit_error + ./gce_export -gcs_path "$GCS_PATH" -disk /dev/sdb -y || exit_error fi echo "export success"