You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by on...@apache.org on 2019/08/20 20:21:47 UTC
[geode] branch release/1.9.1 updated (8355f5d -> ded8d51)
This is an automated email from the ASF dual-hosted git repository.
onichols pushed a change to branch release/1.9.1
in repository https://gitbox.apache.org/repos/asf/geode.git.
from 8355f5d [GEODE-7027] Use cygwin to get rsync instead of chocolatey directly. (#3863)
new 1ac6f38 GEODE-6734: Change packer image resources and scripts to Bionic
new ded8d51 Remove unattended-upgrades and autoremove unnecessary stuff. (#3881)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
ci/images/google-geode-builder/packer.json | 2 +-
ci/images/google-geode-builder/scripts/setup.sh | 15 ++++++---------
ci/pipelines/meta/deploy_meta.sh | 7 +++----
3 files changed, 10 insertions(+), 14 deletions(-)
[geode] 02/02: Remove unattended-upgrades and autoremove
unnecessary stuff. (#3881)
Posted by on...@apache.org.
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 ded8d512b92567f4e8a6001e1e076c71627a6371
Author: Sean Goller <se...@goller.net>
AuthorDate: Fri Aug 2 12:33:30 2019 -0700
Remove unattended-upgrades and autoremove unnecessary stuff. (#3881)
---
ci/images/google-geode-builder/scripts/setup.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ci/images/google-geode-builder/scripts/setup.sh b/ci/images/google-geode-builder/scripts/setup.sh
index 11fbf4a..16a38f4 100755
--- a/ci/images/google-geode-builder/scripts/setup.sh
+++ b/ci/images/google-geode-builder/scripts/setup.sh
@@ -87,6 +87,6 @@ ln -fs /opt/selenium/chromedriver-${CHROME_DRIVER_VERSION} /usr/bin/chromedriver
adduser --disabled-password --gecos "" --uid ${LOCAL_UID} ${LOCAL_USER}
usermod -G docker,google-sudoers -a ${LOCAL_USER}
echo "export PATH=/google-cloud-sdk/bin:${PATH}" > /etc/profile.d/google_sdk_path.sh
-
+apt-get remove -y unattended-upgrades && apt-get -y autoremove
apt-get clean
rm -rf /var/lib/apt/lists/*
[geode] 01/02: GEODE-6734: Change packer image resources and
scripts to Bionic
Posted by on...@apache.org.
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 1ac6f38c0b12bbe7bed71d1ccd41de35835e8494
Author: Robert Houghton <rh...@pivotal.io>
AuthorDate: Wed May 1 10:11:50 2019 -0700
GEODE-6734: Change packer image resources and scripts to Bionic
Authored-by: Robert Houghton <rh...@pivotal.io>
---
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 {