This is an automated email from the ASF dual-hosted git repository. onichols pushed a commit to branch release/1.9.1 in repository https://gitbox.apache.org/repos/asf/geode.git
commit 5a746977829171bcb841582ede755de9865a9f83 Author: Robert Houghton <[email protected]> AuthorDate: Wed May 1 10:11:50 2019 -0700 GEODE-6734: Change packer image resources and scripts to Bionic Authored-by: Robert Houghton <[email protected]> --- ci/images/google-geode-builder/packer.json | 2 +- ci/images/google-geode-builder/scripts/setup.sh | 13 +++++-------- ci/pipelines/meta/deploy_meta.sh | 7 +++---- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/ci/images/google-geode-builder/packer.json b/ci/images/google-geode-builder/packer.json index 4c905da..2d2167f 100644 --- a/ci/images/google-geode-builder/packer.json +++ b/ci/images/google-geode-builder/packer.json @@ -32,7 +32,7 @@ { "type": "googlecompute", "project_id": "{{user `gcp_project`}}", - "source_image_family": "debian-9", + "source_image_family": "ubuntu-minimal-1804-lts", "ssh_username": "packer", "zone": "us-central1-f", "image_family": "{{user `pipeline_prefix`}}geode-builder", diff --git a/ci/images/google-geode-builder/scripts/setup.sh b/ci/images/google-geode-builder/scripts/setup.sh index af4ca30..11fbf4a 100755 --- a/ci/images/google-geode-builder/scripts/setup.sh +++ b/ci/images/google-geode-builder/scripts/setup.sh @@ -28,11 +28,11 @@ apt-get install -y --no-install-recommends \ lsb-release echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google-chrome.list -echo "deb [arch=amd64] https://download.docker.com/linux/debian $(lsb_release -cs) stable" | tee -a /etc/apt/sources.list.d/google-cloud-sdk.list +echo "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | tee -a /etc/apt/sources.list.d/google-cloud-sdk.list curl -sSL https://dl.google.com/linux/linux_signing_key.pub | apt-key add - -curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add - +curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - apt-get update -apt-get purge -y google-cloud-sdk lxc-docker +set +e && apt-get purge -y google-cloud-sdk lxc-docker && set -e apt-get install -y --no-install-recommends \ aptitude \ ca-certificates \ @@ -55,14 +55,11 @@ apt-get install -y --no-install-recommends \ cp -R /etc/alternatives /etc/keep-alternatives apt-get install -y --no-install-recommends \ - openjdk-8-jdk + openjdk-8-jdk \ + openjdk-11-jdk rm -rf /etc/alternatives mv /etc/keep-alternatives /etc/alternatives -JDK_URL=$(curl -Ls http://jdk.java.net/11 | awk '/linux-x64/{sub(/.*href=./,"");sub(/".*/,"");if(found!=1)print;found=1}') -tar xzf <(curl -s $JDK_URL) -C /usr/lib/jvm -mv /usr/lib/jvm/jdk-11* /usr/lib/jvm/java-11-openjdk-amd64 - pushd /tmp curl -O https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-${CLOUD_SDK_VERSION}-linux-x86_64.tar.gz tar xzf google-cloud-sdk-${CLOUD_SDK_VERSION}-linux-x86_64.tar.gz -C / diff --git a/ci/pipelines/meta/deploy_meta.sh b/ci/pipelines/meta/deploy_meta.sh index aaa153b..46bf3f6 100755 --- a/ci/pipelines/meta/deploy_meta.sh +++ b/ci/pipelines/meta/deploy_meta.sh @@ -123,13 +123,12 @@ YML --var concourse-team=main \ --yaml-var public-pipelines=${PUBLIC} 2>&1 |tee flyOutput.log + if [[ "$(tail -n1 flyOutput.log)" == "bailing out" ]]; then + exit 1 + fi popd 2>&1 > /dev/null -if [[ "$(tail -n1 flyOutput.log)" == "bailing out" ]]; then - exit 1 -fi - # bootstrap all precursors of the actual Build job function jobStatus {
