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 2021/01/19 21:00:22 UTC

[geode] branch support/1.13 updated (ac11ccf -> cf35b3d)

This is an automated email from the ASF dual-hosted git repository.

onichols pushed a change to branch support/1.13
in repository https://gitbox.apache.org/repos/asf/geode.git.


    from ac11ccf  GEODE-8798: Improve output from export logs command (#5863)
     new 52934a6  GEODE-8834: pin docker version since we can't update to testcontainers 1.15 yet (#5917)
     new cf35b3d  GEODE-8496: update cached dependencies on changes to dependencies

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/scripts/setup.sh |  4 +++-
 ci/pipelines/images/jinja.template.yml          | 13 +++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)


[geode] 01/02: GEODE-8834: pin docker version since we can't update to testcontainers 1.15 yet (#5917)

Posted by on...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

onichols pushed a commit to branch support/1.13
in repository https://gitbox.apache.org/repos/asf/geode.git

commit 52934a6d6ae558323024f2de93d53074d6edf73f
Author: Sean Goller <se...@goller.net>
AuthorDate: Fri Jan 15 16:44:59 2021 -0800

    GEODE-8834: pin docker version since we can't update to testcontainers 1.15 yet (#5917)
    
    * Use docker 19.03.14 because of breaking API changes.
---
 ci/images/google-geode-builder/scripts/setup.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ci/images/google-geode-builder/scripts/setup.sh b/ci/images/google-geode-builder/scripts/setup.sh
index 5198d21..5416685 100755
--- a/ci/images/google-geode-builder/scripts/setup.sh
+++ b/ci/images/google-geode-builder/scripts/setup.sh
@@ -40,7 +40,9 @@ apt-get install -y --no-install-recommends \
     ca-certificates \
     cgroupfs-mount \
     docker-compose \
-    docker-ce \
+    containerd.io \
+    docker-ce="5:19.03.14~3-0~ubuntu-bionic" \
+    docker-ce-cli="5:19.03.14~3-0~ubuntu-bionic" \
     git \
     google-chrome-stable \
     htop \


[geode] 02/02: GEODE-8496: update cached dependencies on changes to dependencies

Posted by on...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

onichols pushed a commit to branch support/1.13
in repository https://gitbox.apache.org/repos/asf/geode.git

commit cf35b3d85d7746735668724167e1ec58bb8a4ef6
Author: Owen Nichols <on...@apache.org>
AuthorDate: Tue Jan 19 10:45:13 2021 -0800

    GEODE-8496: update cached dependencies on changes to dependencies
    
    (cherry picked from commit 834090159e2a4d42e2a7ccbac2ce1d2695ecb905)
---
 ci/pipelines/images/jinja.template.yml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/ci/pipelines/images/jinja.template.yml b/ci/pipelines/images/jinja.template.yml
index c0b9bbe..ec29682 100644
--- a/ci/pipelines/images/jinja.template.yml
+++ b/ci/pipelines/images/jinja.template.yml
@@ -155,6 +155,15 @@ resources:
     password: ((docker-password))
     repository: gcr.io/((gcp-project))/((pipeline-prefix))metric-tools
 
+- name: geode-dependencies
+  type: git
+  source:
+    {{ github_access() | indent(4) }}
+    branch: ((geode-build-branch))
+    depth: 1
+    paths:
+    - "buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy"
+
 - name: gce-instances-resource-dockerfile
   type: git
   source:
@@ -223,6 +232,8 @@ jobs:
       trigger: true
     - get: build-concourse-dockerfile
       trigger: true
+    - get: geode-dependencies
+      trigger: true
   - put: build-concourse-docker-image
     params:
       build: build-concourse-dockerfile/ci/docker
@@ -242,6 +253,8 @@ jobs:
       passed: [build-alpine-tools-docker-image]
     - get: linux-base-family
       trigger: true
+    - get: geode-dependencies
+      trigger: true
   - task: build-image
     timeout: 1h
     image: alpine-tools-docker-image