summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLiam Hopkins <liamh@google.com>2019-09-05 15:06:17 -0700
committerGitHub <noreply@github.com>2019-09-05 15:06:17 -0700
commit1fda9db94741a72e1985ab41fc73becdd91a11d1 (patch)
tree6414fd4bcd39ac7a04ec46b26f0ffbfc4507776a
parent9510f08f6eb828aad0fe16a3ee89ad78a86b4ed8 (diff)
downloadgoogle-compute-image-packages-1fda9db94741a72e1985ab41fc73becdd91a11d1.tar.gz
remove deb10 builds (#843)
* bump versions to 20190905 * missed version bump
-rwxr-xr-xdaisy_workflows/build_deb_packages.sh9
-rw-r--r--daisy_workflows/build_debian.wf.json28
-rwxr-xr-xpackages/python-google-compute-engine/setup.py2
3 files changed, 4 insertions, 35 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/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': [