Merge branch 'development'

7 files changed, 20 insertions, 37 deletions

diff --git a/daisy_workflows/build_deb_packages.sh b/daisy_workflows/build_deb_packages.sh
index 061b31d..7754a7c 100755
--- a/daisy_workflows/build_deb_packages.sh
+++ b/daisy_workflows/build_deb_packages.sh
@@ -13,6 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+set -e
+
 URL="http://metadata/computeMetadata/v1/instance/attributes"
 
 BRANCH="$(curl -f -H Metadata-Flavor:Google ${URL}/github_branch)"
@@ -57,12 +59,7 @@ done
 
 # Copy the deb and dsc files to the output.
 cd "${workdir}/output"
-# For Debian 10 right now, only copy OS Login package.
-if [[ "$(cut -d. -f1 </etc/debian_version)" == "10" ]]; then
-  gsutil cp google-compute-engine-oslogin*.* ${OUTPUT}
-else
-  gsutil cp *.dsc *.deb ${OUTPUT}
-fi
+gsutil cp *.dsc *.deb ${OUTPUT}
 
 if [ $? -ne 0 ]; then
   echo "BuildFailed: copying to ${OUTPUT} failed."
diff --git a/daisy_workflows/build_debian.wf.json b/daisy_workflows/build_debian.wf.json
index bc72ef4..ad4f52b 100644
--- a/daisy_workflows/build_debian.wf.json
+++ b/daisy_workflows/build_debian.wf.json
@@ -24,12 +24,6 @@
           "SourceImage": "projects/debian-cloud/global/images/family/debian-9",
           "SizeGb": "10",
           "Type": "pd-ssd"
-        },
-        {
-          "Name": "disk-deb10-build",
-          "SourceImage": "projects/debian-cloud/global/images/family/debian-10",
-          "SizeGb": "10",
-          "Type": "pd-ssd"
         }
       ]
     },
@@ -48,20 +42,6 @@
           },
           "Scopes": ["https://www.googleapis.com/auth/devstorage.read_write"],
           "StartupScript": "build_deb_packages.sh"
-        },
-        {
-          "Name": "inst-deb10-build",
-          "Disks": [
-            {"Source": "disk-deb10-build"}
-          ],
-          "MachineType": "n1-standard-2",
-          "Metadata": {
-            "github_branch": "${github_branch}",
-            "github_repo": "${github_repo}",
-            "output_path": "${output_path}"
-          },
-          "Scopes": ["https://www.googleapis.com/auth/devstorage.read_write"],
-          "StartupScript": "build_deb_packages.sh"
         }
       ]
     },
@@ -74,14 +54,6 @@
             "SuccessMatch": "BuildSuccess:",
             "FailureMatch": "BuildFailed:"
           }
-        },
-        {
-          "Name": "inst-deb10-build",
-          "SerialOutput": {
-            "Port": 1,
-            "SuccessMatch": "BuildSuccess:",
-            "FailureMatch": "BuildFailed:"
-          }
         }
       ]
     }
diff --git a/packages/google-compute-engine/packaging/debian/changelog b/packages/google-compute-engine/packaging/debian/changelog
index 2c1d458..c9ce87b 100644
--- a/packages/google-compute-engine/packaging/debian/changelog
+++ b/packages/google-compute-engine/packaging/debian/changelog
@@ -1,3 +1,9 @@
+google-compute-engine (1:20190905.00-g1) stable; urgency=medium
+
+  * Bump version to match python package release.
+
+ -- Google Cloud Team <gc-team@google.com>  Thu, 05 Sep 2019 12:00:22 -0700
+
 google-compute-engine (1:20190801.00-g1) stable; urgency=medium
 
   * Re-enable boto config and drop writing plugin directory.
diff --git a/packages/google-compute-engine/packaging/setup_deb.sh b/packages/google-compute-engine/packaging/setup_deb.sh
index 42ef266..06e5f82 100755
--- a/packages/google-compute-engine/packaging/setup_deb.sh
+++ b/packages/google-compute-engine/packaging/setup_deb.sh
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 NAME="google-compute-engine"
-VERSION="20190801.00"
+VERSION="20190905.00"
 
 working_dir=${PWD}
 if [[ $(basename "$working_dir") != $NAME ]]; then
diff --git a/packages/google-compute-engine/packaging/setup_rpm.sh b/packages/google-compute-engine/packaging/setup_rpm.sh
index 42e9c15..28065e2 100755
--- a/packages/google-compute-engine/packaging/setup_rpm.sh
+++ b/packages/google-compute-engine/packaging/setup_rpm.sh
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 NAME="google-compute-engine"
-VERSION="20190801.00"
+VERSION="20190905.00"
 
 rpm_working_dir=/tmp/rpmpackage/${NAME}-${VERSION}
 working_dir=${PWD}
diff --git a/packages/python-google-compute-engine/packaging/debian/changelog b/packages/python-google-compute-engine/packaging/debian/changelog
index 85cd567..f918826 100644
--- a/packages/python-google-compute-engine/packaging/debian/changelog
+++ b/packages/python-google-compute-engine/packaging/debian/changelog
@@ -1,3 +1,11 @@
+python-google-compute-engine (1:20190905.00-g1) stable; urgency=medium
+
+  * Fix setup.py version to be compliant with legacy builds.
+  * Detect hostname changes.
+  * Use non-numeric project ID in generated boto.cfg for GSUtil.
+
+ -- Google Cloud Team <gc-team@google.com>  Thu, 05 Sep 2019 11:08:18 -0700
+
 python-google-compute-engine (1:20190801.00-g1) stable; urgency=medium
 
   * Fix setup.py version to be compliant with legacy builds.
diff --git a/packages/python-google-compute-engine/setup.py b/packages/python-google-compute-engine/setup.py
index e955081..5722ab0 100755
--- a/packages/python-google-compute-engine/setup.py
+++ b/packages/python-google-compute-engine/setup.py
@@ -37,7 +37,7 @@ setuptools.setup(
     name='google-compute-engine',
     packages=setuptools.find_packages(),
     url='https://github.com/GoogleCloudPlatform/compute-image-packages',
-    version='20190801.0',
+    version='20190905.0',
     # Entry points create scripts in /usr/bin that call a function.
     entry_points={
         'console_scripts': [