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:30:51 UTC
[geode] branch support/1.12 updated (1bb094c -> f6bfe2f)
This is an automated email from the ASF dual-hosted git repository.
onichols pushed a change to branch support/1.12
in repository https://gitbox.apache.org/repos/asf/geode.git.
from 1bb094c GEODE-8798: Improve output from export logs command (#5863)
new 8159b53 GEODE-8834: pin docker version since we can't update to testcontainers 1.15 yet (#5917)
new f6bfe2f 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] 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.12
in repository https://gitbox.apache.org/repos/asf/geode.git
commit f6bfe2fd0bf70a0f8c94ec72082547426c6ed9ae
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 954580d..d0c6b7a 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:
@@ -196,6 +205,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
@@ -215,6 +226,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
[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.12
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 8159b53d43db3fb3efa05a123c5fa63f236980cc
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.
(cherry picked from commit 52934a6d6ae558323024f2de93d53074d6edf73f)
---
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 \