[geode] branch develop updated: GEODE-9773: roll redis benchmark baseline past incompatible change (#7049)
This is an automated email from the ASF dual-hosted git repository. onichols pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git The following commit(s) were added to refs/heads/develop by this push: new e24d185 GEODE-9773: roll redis benchmark baseline past incompatible change (#7049) e24d185 is described below commit e24d18550e29464d0a60d8702ed09487c2dae1ea Author: Owen Nichols <34043438+onichols-pivo...@users.noreply.github.com> AuthorDate: Tue Oct 26 19:53:56 2021 -0700 GEODE-9773: roll redis benchmark baseline past incompatible change (#7049) --- ci/pipelines/shared/jinja.variables.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/pipelines/shared/jinja.variables.yml b/ci/pipelines/shared/jinja.variables.yml index be83f2d..0dda931 100644 --- a/ci/pipelines/shared/jinja.variables.yml +++ b/ci/pipelines/shared/jinja.variables.yml @@ -37,8 +37,8 @@ benchmarks: timeout: 12h - title: 'radish' # The current radish baseline version is taken from the commit: -# GEODE-9567: Restore accidentally-removed patch file. -baseline_branch: '311ba9853ee32742690374b9e57b1ffa2c750843' +# GEODE-9773: move RedisPropertiesTest to match the location of the source class +baseline_branch: '80bd4419998c9334d68c9a4863a800e83fad8870' baseline_version: '' flag: '-PtestJVM=/usr/lib/jvm/bellsoft-java11-amd64 -Pbenchmark.withRedisCluster=geode -Pbenchmark.withServerCount=2' options: '--tests=org.apache.geode.benchmark.redis.tests.*'
[geode-site] branch asf-site updated: Update verification instructions: SHA256 replaces MD5
This is an automated email from the ASF dual-hosted git repository.
dbarnes pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/geode-site.git
The following commit(s) were added to refs/heads/asf-site by this push:
new d4811bb Update verification instructions: SHA256 replaces MD5
d4811bb is described below
commit d4811bb9bdabb030cb875ee382cee5ef3b9ad743
Author: Dave Barnes
AuthorDate: Tue Oct 26 17:45:35 2021 -0700
Update verification instructions: SHA256 replaces MD5
---
releases/index.html | 42 ++
1 file changed, 26 insertions(+), 16 deletions(-)
diff --git a/releases/index.html b/releases/index.html
index 3d460e1..9ba94df 100644
--- a/releases/index.html
+++ b/releases/index.html
@@ -295,28 +295,38 @@ dependencies {
The PGP signatures can be verified
using PGP or GPG. First download the https://downloads.apache.org/geode/KEYS;>KEYS as well as the asc
signature file for the particular distribution. Then verify the signatures
using:
-
+
% pgpk -a KEYS
-
- % pgpv ${filename}.tar.gz.asc
-
+
+ % pgpv ${filename}.tar.gz.asc
+
+
or
-
+
% pgp -ka KEYS
-
- % pgp ${filename}.tar.gz.asc
-
+
+ % pgp ${filename}.tar.gz.asc
+
or
-
+
% gpg --import KEYS
-
- % gpg --verify ${filename}.tar.gz.asc
-
+
+ % gpg --verify ${filename}.tar.gz.asc
-
- Alternatively, you can verify the MD5 signature
on the files. A Unix program called md5 or md5sum is included in many Unix
distributions.
-It is also available as part of http://www.gnu.org/software/textutils/textutils.html;>GNU Textutils.
-Windows users can get binary md5 programs from
http://www.fourmilab.ch/md5/;>Fourmilab.ch, http://www.pc-tools.net/win32/md5sums/;>PC-Tools.Net, or http://www.slavasoft.com/fsum/;>SlavaSoft.com.
+
+Alternatively, you can verify the SHA256 checksum on the files. A
program called sha256sum
+or shasum -a 256 is included in most Linux distributions:
+
+sha256sum --check
${filename}.tgz.sha256
+
+
+ Windows users can use the built-in CertUtil:
+
+ CertUtil -hashfile ${filename}.tgz
SHA256
+
+ or PowerShell command:
+ Get-FileHash ${filename}.tgz -Algorithm
SHA256 | Format-List
+
If you want to build directly from
source, see the BUILDING.md file in the top-level source directory.
[geode-site] branch master updated: Update verification instructions: SHA256 replaces MD5
This is an automated email from the ASF dual-hosted git repository.
dbarnes pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/geode-site.git
The following commit(s) were added to refs/heads/master by this push:
new 77881b4 Update verification instructions: SHA256 replaces MD5
77881b4 is described below
commit 77881b412d028d256d4397fcc6df1994f724283e
Author: Dave Barnes
AuthorDate: Tue Oct 26 17:44:02 2021 -0700
Update verification instructions: SHA256 replaces MD5
---
website/content/releases/index.html | 42 +++--
1 file changed, 26 insertions(+), 16 deletions(-)
diff --git a/website/content/releases/index.html
b/website/content/releases/index.html
index 9b2408c..57b01c0 100644
--- a/website/content/releases/index.html
+++ b/website/content/releases/index.html
@@ -218,28 +218,38 @@ dependencies {
The PGP signatures can be verified
using PGP or GPG. First download the https://downloads.apache.org/geode/KEYS;>KEYS as well as the asc
signature file for the particular distribution. Then verify the signatures
using:
-
+
% pgpk -a KEYS
-
- % pgpv ${filename}.tar.gz.asc
-
+
+ % pgpv ${filename}.tar.gz.asc
+
+
or
-
+
% pgp -ka KEYS
-
- % pgp ${filename}.tar.gz.asc
-
+
+ % pgp ${filename}.tar.gz.asc
+
or
-
+
% gpg --import KEYS
-
- % gpg --verify ${filename}.tar.gz.asc
-
+
+ % gpg --verify ${filename}.tar.gz.asc
-
- Alternatively, you can verify the MD5 signature
on the files. A Unix program called md5 or md5sum is included in many Unix
distributions.
-It is also available as part of http://www.gnu.org/software/textutils/textutils.html;>GNU Textutils.
-Windows users can get binary md5 programs from
http://www.fourmilab.ch/md5/;>Fourmilab.ch, http://www.pc-tools.net/win32/md5sums/;>PC-Tools.Net, or http://www.slavasoft.com/fsum/;>SlavaSoft.com.
+
+Alternatively, you can verify the SHA256 checksum on the files. A
program called sha256sum
+or shasum -a 256 is included in most Linux distributions:
+
+sha256sum --check
${filename}.tgz.sha256
+
+
+ Windows users can use the built-in CertUtil:
+
+ CertUtil -hashfile ${filename}.tgz
SHA256
+
+ or PowerShell command:
+ Get-FileHash ${filename}.tgz -Algorithm
SHA256 | Format-List
+
If you want to build directly from
source, see the BUILDING.md file in the top-level source directory.
[geode] branch develop updated (115704a -> 0b93946)
This is an automated email from the ASF dual-hosted git repository. dschneider pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from 115704a GEODE-9763: DUnit Test of Concurrent P2P Messaging with TLS Enabled (#6930) add 0b93946 GEODE-9740: enhance redis security permissions (#7029) No new revisions were added by this update. Summary of changes: .../connection/AuthNativeRedisAcceptanceTest.java | 4 +- .../connection/AbstractAuthIntegrationTest.java| 26 ++--- .../executor/connection/AuthIntegrationTest.java | 72 -- .../geode/redis/internal/RedisCommandType.java | 4 + .../internal/netty/ExecutionHandlerContext.java| 45 - .../geode/redis/internal/RedisCommandTypeTest.java | 31 +++--- .../netty/ExecutionHandlerContextTest.java | 110 + 7 files changed, 225 insertions(+), 67 deletions(-) copy geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorLauncherTest.java => geode-for-redis/src/test/java/org/apache/geode/redis/internal/RedisCommandTypeTest.java (53%) create mode 100644 geode-for-redis/src/test/java/org/apache/geode/redis/internal/netty/ExecutionHandlerContextTest.java
[geode] branch develop updated (d759a52 -> 115704a)
This is an automated email from the ASF dual-hosted git repository. burcham pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from d759a52 GEODE-9767: Bump netty from 4.1.67.Final to 4.1.69.Final (#7031) add 115704a GEODE-9763: DUnit Test of Concurrent P2P Messaging with TLS Enabled (#6930) No new revisions were added by this update. Summary of changes: .../internal/P2PMessagingConcurrencyDUnitTest.java | 304 + .../geode/internal/net/ByteBufferVendor.java | 9 + .../internal/net/ByteBufferConcurrencyTest.java| 131 + .../serialization/DataSerializableFixedID.java | 2 +- 4 files changed, 394 insertions(+), 52 deletions(-) create mode 100644 geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/P2PMessagingConcurrencyDUnitTest.java
[geode] 01/02: [GEODE-9775] CI Changes to support CI migration
This is an automated email from the ASF dual-hosted git repository.
smgoller pushed a commit to branch support/1.14
in repository https://gitbox.apache.org/repos/asf/geode.git
commit bba0ebe2401b8ebe04b8c9241ca598585a3dac3b
Author: Sean Goller
AuthorDate: Tue Oct 26 18:48:17 2021 +
[GEODE-9775] CI Changes to support CI migration
* Remove unnecessary environment variables.
* get network information from concourse instead of discovering it
ourselves.
(cherry picked from commit 4248006916a91f6d86976f77aea50a9dec729757)
---
ci/pipelines/geode-build/deploy_pipeline.sh | 10 --
ci/pipelines/geode-build/jinja.template.yml | 3 +++
ci/pipelines/images/jinja.template.yml | 6 ++
ci/scripts/build_image.sh | 16 ++--
ci/scripts/create_instance.sh | 23 ---
5 files changed, 27 insertions(+), 31 deletions(-)
diff --git a/ci/pipelines/geode-build/deploy_pipeline.sh
b/ci/pipelines/geode-build/deploy_pipeline.sh
index f0e38ba..2cf1640 100755
--- a/ci/pipelines/geode-build/deploy_pipeline.sh
+++ b/ci/pipelines/geode-build/deploy_pipeline.sh
@@ -40,16 +40,6 @@ fi
echo "Sanitized Geode Fork = ${SANITIZED_GEODE_FORK}"
echo "Sanitized Geode Branch = ${SANITIZED_GEODE_BRANCH}"
-MY_NAME=$(curl -s
"http://metadata.google.internal/computeMetadata/v1/instance/name; -H
"Metadata-Flavor: Google")
-MY_ZONE=$(curl -s
"http://metadata.google.internal/computeMetadata/v1/instance/zone; -H
"Metadata-Flavor: Google")
-MY_ZONE=${MY_ZONE##*/}
-NETWORK_INTERFACE_INFO="$(gcloud compute instances describe ${MY_NAME} --zone
${MY_ZONE} --format="json(networkInterfaces)")"
-GCP_NETWORK=$(echo ${NETWORK_INTERFACE_INFO} | jq -r
'.networkInterfaces[0].network')
-GCP_NETWORK=${GCP_NETWORK##*/}
-GCP_SUBNETWORK=$(echo ${NETWORK_INTERFACE_INFO} | jq -r
'.networkInterfaces[0].subnetwork')
-GCP_SUBNETWORK=${GCP_SUBNETWORK##*/}
-ENV_ID=$(echo ${GCP_NETWORK} | awk -F- '{ print $1}')
-
#echo "DEBUG INFO *"
#echo "Pipeline prefix = ${PIPELINE_PREFIX}"
#echo "Docker image prefix = ${DOCKER_IMAGE_PREFIX}"
diff --git a/ci/pipelines/geode-build/jinja.template.yml
b/ci/pipelines/geode-build/jinja.template.yml
index 38143bd..b00f254 100644
--- a/ci/pipelines/geode-build/jinja.template.yml
+++ b/ci/pipelines/geode-build/jinja.template.yml
@@ -60,6 +60,9 @@
{% macro common_instance_params(test) -%}
GCP_PROJECT: ((gcp-project))
+GCP_NETWORK: ((gcp-network))
+GCP_SUBNETWORK: ((gcp-subnet))
+GCP_ZONE: ((gcp-zone))
CPUS: {{ test.CPUS }}
RAM: {{ test.RAM }}
DISK: {{ test.DISK }}
diff --git a/ci/pipelines/images/jinja.template.yml
b/ci/pipelines/images/jinja.template.yml
index c5148c9..3c202d2 100644
--- a/ci/pipelines/images/jinja.template.yml
+++ b/ci/pipelines/images/jinja.template.yml
@@ -313,6 +313,9 @@ jobs:
GEODE_DOCKER_IMAGE:
gcr.io/((gcp-project))/((pipeline-prefix))test-container
PIPELINE_PREFIX: ((pipeline-prefix))
GCP_PROJECT: ((gcp-project))
+GCP_NETWORK: ((gcp-network))
+GCP_SUBNETWORK: ((gcp-subnet))
+INTERNAL: "true"
CONCOURSE_GCP_KEY: "((concourse-gcp-key))"
JAVA_BUILD_VERSION: 8
run:
@@ -348,6 +351,9 @@ jobs:
GEODE_DOCKER_IMAGE:
gcr.io/((gcp-project))/((pipeline-prefix))test-container
PIPELINE_PREFIX: ((pipeline-prefix))
GCP_PROJECT: ((gcp-project))
+GCP_NETWORK: ((gcp-network))
+GCP_SUBNETWORK: ((gcp-subnet))
+INTERNAL: "true"
CONCOURSE_GCP_KEY: "((concourse-gcp-key))"
JAVA_BUILD_VERSION: 8
run:
diff --git a/ci/scripts/build_image.sh b/ci/scripts/build_image.sh
index 0db5b48..ab3020f 100755
--- a/ci/scripts/build_image.sh
+++ b/ci/scripts/build_image.sh
@@ -32,20 +32,8 @@ if [[ -n "${CONCOURSE_GCP_KEY}" ]]; then
export GOOGLE_APPLICATION_CREDENTIALS=${PACKERDIR}/credentials.json
fi
-GCP_NETWORK="default"
-GCP_SUBNETWORK="default"
-
-MY_NAME=$(curl -s
"http://metadata.google.internal/computeMetadata/v1/instance/name; -H
"Metadata-Flavor: Google")
-if [[ -n "${MY_NAME}" ]]; then
- MY_ZONE=$(curl -s
"http://metadata.google.internal/computeMetadata/v1/instance/zone; -H
"Metadata-Flavor: Google")
- MY_ZONE=${MY_ZONE##*/}
- NETWORK_INTERFACE_INFO="$(gcloud compute instances describe ${MY_NAME}
--zone ${MY_ZONE} --format="json(networkInterfaces)")"
- GCP_NETWORK=$(echo ${NETWORK_INTERFACE_INFO} | jq -r
'.networkInterfaces[0].network')
- GCP_NETWORK=${GCP_NETWORK##*/}
- GCP_SUBNETWORK=$(echo ${NETWORK_INTERFACE_INFO} | jq -r
'.networkInterfaces[0].subnetwork')
- GCP_SUBNETWORK=${GCP_SUBNETWORK##*/}
- INTERNAL=true
-fi
+GCP_NETWORK="${GCP_NETWORK:-default}"
+GCP_SUBNETWORK="${GCP_SUBNETWORK:-default}"
if [[ -z "${GCP_PROJECT}" ]]; then
echo "GCP_PROJECT is unset. Cowardly refusing to continue."
diff --git a/ci/scripts/create_instance.sh b/ci/scripts/create_instance.sh
index 7332a7a..4ca0895 100755
---
[geode] branch support/1.14 updated (ff81dec -> 33e95ed)
This is an automated email from the ASF dual-hosted git repository. smgoller pushed a change to branch support/1.14 in repository https://gitbox.apache.org/repos/asf/geode.git. from ff81dec GEODE-9714: Add Shiro packages to sanctioned serializables (#7017) new bba0ebe [GEODE-9775] CI Changes to support CI migration new 33e95ed GEODE-9775: fixup missing Concourse variable for PR pipeline (#7047) 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/pipelines/geode-build/deploy_pipeline.sh | 10 -- ci/pipelines/geode-build/jinja.template.yml | 3 +++ ci/pipelines/images/jinja.template.yml | 6 ++ ci/pipelines/pull-request/jinja.template.yml | 6 ++ ci/scripts/build_image.sh| 16 ++-- ci/scripts/create_instance.sh| 23 --- 6 files changed, 33 insertions(+), 31 deletions(-)
[geode] 02/02: GEODE-9775: fixup missing Concourse variable for PR pipeline (#7047)
This is an automated email from the ASF dual-hosted git repository.
smgoller pushed a commit to branch support/1.14
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 33e95ed71e4a40e76097195c98b38a34d5403398
Author: Robert Houghton
AuthorDate: Tue Oct 26 12:30:41 2021 -0700
GEODE-9775: fixup missing Concourse variable for PR pipeline (#7047)
(cherry picked from commit e1fac45368f20896a36a96936f4bc938951b4659)
---
ci/pipelines/pull-request/jinja.template.yml | 6 ++
1 file changed, 6 insertions(+)
diff --git a/ci/pipelines/pull-request/jinja.template.yml
b/ci/pipelines/pull-request/jinja.template.yml
index 188be95..b01f349 100644
--- a/ci/pipelines/pull-request/jinja.template.yml
+++ b/ci/pipelines/pull-request/jinja.template.yml
@@ -147,6 +147,9 @@ jobs:
RAM: {{build_test.RAM}}
DISK: {{build_test.DISK}}
GCP_PROJECT: ((gcp-project))
+ GCP_NETWORK: ((gcp-network))
+ GCP_SUBNETWORK: ((gcp-subnet))
+ GCP_ZONE: ((gcp-zone))
GEODE_BRANCH: {{repository.branch}}
GEODE_FORK: {{repository.fork}}
JAVA_BUILD_VERSION: {{ java_build_version.version }}
@@ -318,6 +321,9 @@ jobs:
GEODE_BRANCH: {{repository.branch}}
GEODE_FORK: {{repository.fork}}
GCP_PROJECT: ((gcp-project))
+ GCP_NETWORK: ((gcp-network))
+ GCP_SUBNETWORK: ((gcp-subnet))
+ GCP_ZONE: ((gcp-zone))
RAM: {{test.RAM}}
JAVA_BUILD_VERSION: {{ java_build_version.version }}
JAVA_TEST_VERSION: {{ java_test_version.version }}
[geode] 02/02: GEODE-9775: fixup missing Concourse variable for PR pipeline (#7047)
This is an automated email from the ASF dual-hosted git repository.
smgoller pushed a commit to branch support/1.13
in repository https://gitbox.apache.org/repos/asf/geode.git
commit f8f9098be63a29ac0b8f5ef2f81395594e143999
Author: Robert Houghton
AuthorDate: Tue Oct 26 12:30:41 2021 -0700
GEODE-9775: fixup missing Concourse variable for PR pipeline (#7047)
(cherry picked from commit e1fac45368f20896a36a96936f4bc938951b4659)
---
ci/pipelines/pull-request/jinja.template.yml | 6 ++
1 file changed, 6 insertions(+)
diff --git a/ci/pipelines/pull-request/jinja.template.yml
b/ci/pipelines/pull-request/jinja.template.yml
index c8d6f6b..0025d36 100644
--- a/ci/pipelines/pull-request/jinja.template.yml
+++ b/ci/pipelines/pull-request/jinja.template.yml
@@ -129,6 +129,9 @@ jobs:
CPUS: {{build_test.CPUS}}
RAM: {{build_test.RAM}}
GCP_PROJECT: ((gcp-project))
+ GCP_NETWORK: ((gcp-network))
+ GCP_SUBNETWORK: ((gcp-subnet))
+ GCP_ZONE: ((gcp-zone))
GEODE_BRANCH: {{repository.branch}}
GEODE_FORK: {{repository.fork}}
JAVA_BUILD_VERSION: 8
@@ -292,6 +295,9 @@ jobs:
GEODE_BRANCH: {{repository.branch}}
GEODE_FORK: {{repository.fork}}
GCP_PROJECT: ((gcp-project))
+ GCP_NETWORK: ((gcp-network))
+ GCP_SUBNETWORK: ((gcp-subnet))
+ GCP_ZONE: ((gcp-zone))
RAM: {{test.RAM}}
JAVA_BUILD_VERSION: {{ java_build_version.version }}
JAVA_TEST_VERSION: {{ java_test_version.version }}
[geode] branch support/1.13 updated (abf3a20 -> f8f9098)
This is an automated email from the ASF dual-hosted git repository. smgoller pushed a change to branch support/1.13 in repository https://gitbox.apache.org/repos/asf/geode.git. from abf3a20 GEODE-9714: Add Shiro packages to sanctioned serializables (#7023) new a04c886 [GEODE-9775] CI Changes to support CI migration new f8f9098 GEODE-9775: fixup missing Concourse variable for PR pipeline (#7047) 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/pipelines/geode-build/deploy_pipeline.sh | 10 -- ci/pipelines/geode-build/jinja.template.yml | 3 +++ ci/pipelines/images/jinja.template.yml | 6 ++ ci/pipelines/pull-request/jinja.template.yml | 6 ++ ci/scripts/build_image.sh| 16 ++-- ci/scripts/create_instance.sh| 26 +++--- 6 files changed, 36 insertions(+), 31 deletions(-)
[geode] 01/02: [GEODE-9775] CI Changes to support CI migration
This is an automated email from the ASF dual-hosted git repository.
smgoller pushed a commit to branch support/1.13
in repository https://gitbox.apache.org/repos/asf/geode.git
commit a04c886b1b8458dd16fcffad08d38490861145fe
Author: Sean Goller
AuthorDate: Tue Oct 26 18:48:17 2021 +
[GEODE-9775] CI Changes to support CI migration
* Remove unnecessary environment variables.
* get network information from concourse instead of discovering it
ourselves.
(cherry picked from commit 4248006916a91f6d86976f77aea50a9dec729757)
---
ci/pipelines/geode-build/deploy_pipeline.sh | 10 --
ci/pipelines/geode-build/jinja.template.yml | 3 +++
ci/pipelines/images/jinja.template.yml | 6 ++
ci/scripts/build_image.sh | 16 ++--
ci/scripts/create_instance.sh | 26 +++---
5 files changed, 30 insertions(+), 31 deletions(-)
diff --git a/ci/pipelines/geode-build/deploy_pipeline.sh
b/ci/pipelines/geode-build/deploy_pipeline.sh
index f0e38ba..2cf1640 100755
--- a/ci/pipelines/geode-build/deploy_pipeline.sh
+++ b/ci/pipelines/geode-build/deploy_pipeline.sh
@@ -40,16 +40,6 @@ fi
echo "Sanitized Geode Fork = ${SANITIZED_GEODE_FORK}"
echo "Sanitized Geode Branch = ${SANITIZED_GEODE_BRANCH}"
-MY_NAME=$(curl -s
"http://metadata.google.internal/computeMetadata/v1/instance/name; -H
"Metadata-Flavor: Google")
-MY_ZONE=$(curl -s
"http://metadata.google.internal/computeMetadata/v1/instance/zone; -H
"Metadata-Flavor: Google")
-MY_ZONE=${MY_ZONE##*/}
-NETWORK_INTERFACE_INFO="$(gcloud compute instances describe ${MY_NAME} --zone
${MY_ZONE} --format="json(networkInterfaces)")"
-GCP_NETWORK=$(echo ${NETWORK_INTERFACE_INFO} | jq -r
'.networkInterfaces[0].network')
-GCP_NETWORK=${GCP_NETWORK##*/}
-GCP_SUBNETWORK=$(echo ${NETWORK_INTERFACE_INFO} | jq -r
'.networkInterfaces[0].subnetwork')
-GCP_SUBNETWORK=${GCP_SUBNETWORK##*/}
-ENV_ID=$(echo ${GCP_NETWORK} | awk -F- '{ print $1}')
-
#echo "DEBUG INFO *"
#echo "Pipeline prefix = ${PIPELINE_PREFIX}"
#echo "Docker image prefix = ${DOCKER_IMAGE_PREFIX}"
diff --git a/ci/pipelines/geode-build/jinja.template.yml
b/ci/pipelines/geode-build/jinja.template.yml
index 0950208..9ab9d4e 100644
--- a/ci/pipelines/geode-build/jinja.template.yml
+++ b/ci/pipelines/geode-build/jinja.template.yml
@@ -59,6 +59,9 @@
{% macro common_instance_params(test) -%}
GCP_PROJECT: ((gcp-project))
+GCP_NETWORK: ((gcp-network))
+GCP_SUBNETWORK: ((gcp-subnet))
+GCP_ZONE: ((gcp-zone))
CPUS: {{ test.CPUS }}
RAM: {{ test.RAM }}
{%- endmacro %}
diff --git a/ci/pipelines/images/jinja.template.yml
b/ci/pipelines/images/jinja.template.yml
index 577c80c..9b3ee7f 100644
--- a/ci/pipelines/images/jinja.template.yml
+++ b/ci/pipelines/images/jinja.template.yml
@@ -272,6 +272,9 @@ jobs:
GEODE_DOCKER_IMAGE:
gcr.io/((gcp-project))/((pipeline-prefix))test-container
PIPELINE_PREFIX: ((pipeline-prefix))
GCP_PROJECT: ((gcp-project))
+GCP_NETWORK: ((gcp-network))
+GCP_SUBNETWORK: ((gcp-subnet))
+INTERNAL: "true"
CONCOURSE_GCP_KEY: "((concourse-gcp-key))"
JAVA_BUILD_VERSION: 8
run:
@@ -307,6 +310,9 @@ jobs:
GEODE_DOCKER_IMAGE:
gcr.io/((gcp-project))/((pipeline-prefix))test-container
PIPELINE_PREFIX: ((pipeline-prefix))
GCP_PROJECT: ((gcp-project))
+GCP_NETWORK: ((gcp-network))
+GCP_SUBNETWORK: ((gcp-subnet))
+INTERNAL: "true"
CONCOURSE_GCP_KEY: "((concourse-gcp-key))"
JAVA_BUILD_VERSION: 8
run:
diff --git a/ci/scripts/build_image.sh b/ci/scripts/build_image.sh
index 0db5b48..ab3020f 100755
--- a/ci/scripts/build_image.sh
+++ b/ci/scripts/build_image.sh
@@ -32,20 +32,8 @@ if [[ -n "${CONCOURSE_GCP_KEY}" ]]; then
export GOOGLE_APPLICATION_CREDENTIALS=${PACKERDIR}/credentials.json
fi
-GCP_NETWORK="default"
-GCP_SUBNETWORK="default"
-
-MY_NAME=$(curl -s
"http://metadata.google.internal/computeMetadata/v1/instance/name; -H
"Metadata-Flavor: Google")
-if [[ -n "${MY_NAME}" ]]; then
- MY_ZONE=$(curl -s
"http://metadata.google.internal/computeMetadata/v1/instance/zone; -H
"Metadata-Flavor: Google")
- MY_ZONE=${MY_ZONE##*/}
- NETWORK_INTERFACE_INFO="$(gcloud compute instances describe ${MY_NAME}
--zone ${MY_ZONE} --format="json(networkInterfaces)")"
- GCP_NETWORK=$(echo ${NETWORK_INTERFACE_INFO} | jq -r
'.networkInterfaces[0].network')
- GCP_NETWORK=${GCP_NETWORK##*/}
- GCP_SUBNETWORK=$(echo ${NETWORK_INTERFACE_INFO} | jq -r
'.networkInterfaces[0].subnetwork')
- GCP_SUBNETWORK=${GCP_SUBNETWORK##*/}
- INTERNAL=true
-fi
+GCP_NETWORK="${GCP_NETWORK:-default}"
+GCP_SUBNETWORK="${GCP_SUBNETWORK:-default}"
if [[ -z "${GCP_PROJECT}" ]]; then
echo "GCP_PROJECT is unset. Cowardly refusing to continue."
diff --git a/ci/scripts/create_instance.sh b/ci/scripts/create_instance.sh
index 775a236..ed72a6a 100755
---
[geode] 02/02: GEODE-9775: fixup missing Concourse variable for PR pipeline (#7047)
This is an automated email from the ASF dual-hosted git repository.
smgoller pushed a commit to branch support/1.12
in repository https://gitbox.apache.org/repos/asf/geode.git
commit a8ad684bcefbf556fe6feef6178d9a7c2a586d9a
Author: Robert Houghton
AuthorDate: Tue Oct 26 12:30:41 2021 -0700
GEODE-9775: fixup missing Concourse variable for PR pipeline (#7047)
(cherry picked from commit e1fac45368f20896a36a96936f4bc938951b4659)
---
ci/pipelines/pull-request/jinja.template.yml | 6 ++
1 file changed, 6 insertions(+)
diff --git a/ci/pipelines/pull-request/jinja.template.yml
b/ci/pipelines/pull-request/jinja.template.yml
index c1598b3..138476b 100644
--- a/ci/pipelines/pull-request/jinja.template.yml
+++ b/ci/pipelines/pull-request/jinja.template.yml
@@ -124,6 +124,9 @@ jobs:
CPUS: {{build_test.CPUS}}
RAM: {{build_test.RAM}}
GCP_PROJECT: ((gcp-project))
+ GCP_NETWORK: ((gcp-network))
+ GCP_SUBNETWORK: ((gcp-subnet))
+ GCP_ZONE: ((gcp-zone))
GEODE_BRANCH: {{repository.branch}}
GEODE_FORK: {{repository.fork}}
JAVA_BUILD_VERSION: 8
@@ -285,6 +288,9 @@ jobs:
GEODE_BRANCH: {{repository.branch}}
GEODE_FORK: {{repository.fork}}
GCP_PROJECT: ((gcp-project))
+ GCP_NETWORK: ((gcp-network))
+ GCP_SUBNETWORK: ((gcp-subnet))
+ GCP_ZONE: ((gcp-zone))
RAM: {{test.RAM}}
JAVA_BUILD_VERSION: {{ java_build_version.version }}
JAVA_TEST_VERSION: {{ java_test_version.version }}
[geode] 01/02: [GEODE-9775] CI Changes to support CI migration
This is an automated email from the ASF dual-hosted git repository.
smgoller pushed a commit to branch support/1.12
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 003f0d93b0910b6aaec95b18890b2e70d1289891
Author: Sean Goller
AuthorDate: Tue Oct 26 18:48:17 2021 +
[GEODE-9775] CI Changes to support CI migration
* Remove unnecessary environment variables.
* get network information from concourse instead of discovering it
ourselves.
(cherry picked from commit 4248006916a91f6d86976f77aea50a9dec729757)
---
ci/pipelines/geode-build/deploy_pipeline.sh | 10 --
ci/pipelines/geode-build/jinja.template.yml | 3 +++
ci/pipelines/images/jinja.template.yml | 6 ++
ci/scripts/build_image.sh | 16 ++--
ci/scripts/create_instance.sh | 26 +++---
5 files changed, 30 insertions(+), 31 deletions(-)
diff --git a/ci/pipelines/geode-build/deploy_pipeline.sh
b/ci/pipelines/geode-build/deploy_pipeline.sh
index f0e38ba..2cf1640 100755
--- a/ci/pipelines/geode-build/deploy_pipeline.sh
+++ b/ci/pipelines/geode-build/deploy_pipeline.sh
@@ -40,16 +40,6 @@ fi
echo "Sanitized Geode Fork = ${SANITIZED_GEODE_FORK}"
echo "Sanitized Geode Branch = ${SANITIZED_GEODE_BRANCH}"
-MY_NAME=$(curl -s
"http://metadata.google.internal/computeMetadata/v1/instance/name; -H
"Metadata-Flavor: Google")
-MY_ZONE=$(curl -s
"http://metadata.google.internal/computeMetadata/v1/instance/zone; -H
"Metadata-Flavor: Google")
-MY_ZONE=${MY_ZONE##*/}
-NETWORK_INTERFACE_INFO="$(gcloud compute instances describe ${MY_NAME} --zone
${MY_ZONE} --format="json(networkInterfaces)")"
-GCP_NETWORK=$(echo ${NETWORK_INTERFACE_INFO} | jq -r
'.networkInterfaces[0].network')
-GCP_NETWORK=${GCP_NETWORK##*/}
-GCP_SUBNETWORK=$(echo ${NETWORK_INTERFACE_INFO} | jq -r
'.networkInterfaces[0].subnetwork')
-GCP_SUBNETWORK=${GCP_SUBNETWORK##*/}
-ENV_ID=$(echo ${GCP_NETWORK} | awk -F- '{ print $1}')
-
#echo "DEBUG INFO *"
#echo "Pipeline prefix = ${PIPELINE_PREFIX}"
#echo "Docker image prefix = ${DOCKER_IMAGE_PREFIX}"
diff --git a/ci/pipelines/geode-build/jinja.template.yml
b/ci/pipelines/geode-build/jinja.template.yml
index 9d0848b..5194355 100644
--- a/ci/pipelines/geode-build/jinja.template.yml
+++ b/ci/pipelines/geode-build/jinja.template.yml
@@ -59,6 +59,9 @@
{% macro common_instance_params(test) -%}
GCP_PROJECT: ((gcp-project))
+GCP_NETWORK: ((gcp-network))
+GCP_SUBNETWORK: ((gcp-subnet))
+GCP_ZONE: ((gcp-zone))
CPUS: {{ test.CPUS }}
RAM: {{ test.RAM }}
{%- endmacro %}
diff --git a/ci/pipelines/images/jinja.template.yml
b/ci/pipelines/images/jinja.template.yml
index 8618bb2..872115a 100644
--- a/ci/pipelines/images/jinja.template.yml
+++ b/ci/pipelines/images/jinja.template.yml
@@ -245,6 +245,9 @@ jobs:
GEODE_DOCKER_IMAGE:
gcr.io/((gcp-project))/((pipeline-prefix))test-container
PIPELINE_PREFIX: ((pipeline-prefix))
GCP_PROJECT: ((gcp-project))
+GCP_NETWORK: ((gcp-network))
+GCP_SUBNETWORK: ((gcp-subnet))
+INTERNAL: "true"
CONCOURSE_GCP_KEY: "((concourse-gcp-key))"
JAVA_BUILD_VERSION: 8
run:
@@ -280,6 +283,9 @@ jobs:
GEODE_DOCKER_IMAGE:
gcr.io/((gcp-project))/((pipeline-prefix))test-container
PIPELINE_PREFIX: ((pipeline-prefix))
GCP_PROJECT: ((gcp-project))
+GCP_NETWORK: ((gcp-network))
+GCP_SUBNETWORK: ((gcp-subnet))
+INTERNAL: "true"
CONCOURSE_GCP_KEY: "((concourse-gcp-key))"
JAVA_BUILD_VERSION: 8
run:
diff --git a/ci/scripts/build_image.sh b/ci/scripts/build_image.sh
index 0db5b48..ab3020f 100755
--- a/ci/scripts/build_image.sh
+++ b/ci/scripts/build_image.sh
@@ -32,20 +32,8 @@ if [[ -n "${CONCOURSE_GCP_KEY}" ]]; then
export GOOGLE_APPLICATION_CREDENTIALS=${PACKERDIR}/credentials.json
fi
-GCP_NETWORK="default"
-GCP_SUBNETWORK="default"
-
-MY_NAME=$(curl -s
"http://metadata.google.internal/computeMetadata/v1/instance/name; -H
"Metadata-Flavor: Google")
-if [[ -n "${MY_NAME}" ]]; then
- MY_ZONE=$(curl -s
"http://metadata.google.internal/computeMetadata/v1/instance/zone; -H
"Metadata-Flavor: Google")
- MY_ZONE=${MY_ZONE##*/}
- NETWORK_INTERFACE_INFO="$(gcloud compute instances describe ${MY_NAME}
--zone ${MY_ZONE} --format="json(networkInterfaces)")"
- GCP_NETWORK=$(echo ${NETWORK_INTERFACE_INFO} | jq -r
'.networkInterfaces[0].network')
- GCP_NETWORK=${GCP_NETWORK##*/}
- GCP_SUBNETWORK=$(echo ${NETWORK_INTERFACE_INFO} | jq -r
'.networkInterfaces[0].subnetwork')
- GCP_SUBNETWORK=${GCP_SUBNETWORK##*/}
- INTERNAL=true
-fi
+GCP_NETWORK="${GCP_NETWORK:-default}"
+GCP_SUBNETWORK="${GCP_SUBNETWORK:-default}"
if [[ -z "${GCP_PROJECT}" ]]; then
echo "GCP_PROJECT is unset. Cowardly refusing to continue."
diff --git a/ci/scripts/create_instance.sh b/ci/scripts/create_instance.sh
index c00a0cf..d6df95c 100755
---
[geode] branch support/1.12 updated (3da8b97 -> a8ad684)
This is an automated email from the ASF dual-hosted git repository. smgoller pushed a change to branch support/1.12 in repository https://gitbox.apache.org/repos/asf/geode.git. from 3da8b97 Bumping version to 1.12.6 new 003f0d9 [GEODE-9775] CI Changes to support CI migration new a8ad684 GEODE-9775: fixup missing Concourse variable for PR pipeline (#7047) 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/pipelines/geode-build/deploy_pipeline.sh | 10 -- ci/pipelines/geode-build/jinja.template.yml | 3 +++ ci/pipelines/images/jinja.template.yml | 6 ++ ci/pipelines/pull-request/jinja.template.yml | 6 ++ ci/scripts/build_image.sh| 16 ++-- ci/scripts/create_instance.sh| 26 +++--- 6 files changed, 36 insertions(+), 31 deletions(-)
[geode-examples] branch support/1.12 updated: Bumping version to 1.12.6
This is an automated email from the ASF dual-hosted git repository. dixie pushed a commit to branch support/1.12 in repository https://gitbox.apache.org/repos/asf/geode-examples.git The following commit(s) were added to refs/heads/support/1.12 by this push: new 0c09484 Bumping version to 1.12.6 0c09484 is described below commit 0c0948417fb73527aa2dbb13063ee7126b7f2354 Author: Dick Cavender AuthorDate: Tue Oct 26 13:58:05 2021 -0700 Bumping version to 1.12.6 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 5449352..a2b301e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # -version = 1.12.5-build.0 +version = 1.12.6-build.0 geodeVersion = 1.12.+ # release properties, set these on the command line to validate against
[geode] branch support/1.12 updated: Bumping version to 1.12.6
This is an automated email from the ASF dual-hosted git repository. dixie pushed a commit to branch support/1.12 in repository https://gitbox.apache.org/repos/asf/geode.git The following commit(s) were added to refs/heads/support/1.12 by this push: new 3da8b97 Bumping version to 1.12.6 3da8b97 is described below commit 3da8b9722702b10eba53a68e776ba410a4b959c2 Author: Dick Cavender AuthorDate: Tue Oct 26 13:58:02 2021 -0700 Bumping version to 1.12.6 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index b3b9c97..257b106 100755 --- a/gradle.properties +++ b/gradle.properties @@ -26,7 +26,7 @@ # - release # # The full version string consists of 'versionNumber + releaseQualifier + releaseType' -version = 1.12.5-build.0 +version = 1.12.6-build.0 # Default Maven targets mavenSnapshotUrl = gcs://maven.apachegeode-ci.info/snapshots
[geode] branch develop updated (e1fac45 -> d759a52)
This is an automated email from the ASF dual-hosted git repository. onichols pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from e1fac45 GEODE-9775: fixup missing Concourse variable for PR pipeline (#7047) add d759a52 GEODE-9767: Bump netty from 4.1.67.Final to 4.1.69.Final (#7031) No new revisions were added by this update. Summary of changes: .../src/test/resources/expected-pom.xml| 27 +- .../gradle/plugins/DependencyConstraints.groovy| 6 - dev-tools/release/license_review.sh| 2 +- .../integrationTest/resources/assembly_content.txt | 9 ++-- .../resources/dependency_classpath.txt | 15 .../integrationTest/resources/expected_jars.txt| 9 ++-- geode-for-redis/build.gradle | 5 +++- .../src/test/resources/expected-pom.xml| 2 +- 8 files changed, 51 insertions(+), 24 deletions(-)
[geode-benchmarks] branch develop updated: GEODE-9773: Update Radish region name
This is an automated email from the ASF dual-hosted git repository.
jensdeppe pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode-benchmarks.git
The following commit(s) were added to refs/heads/develop by this push:
new db2a063 GEODE-9773: Update Radish region name
db2a063 is described below
commit db2a063db226bcbb8cd24f757a10cff85472bc50
Author: Jens Deppe
AuthorDate: Tue Oct 26 12:41:39 2021 -0700
GEODE-9773: Update Radish region name
---
.../main/java/org/apache/geode/benchmark/redis/tasks/InitRegion.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/geode-benchmarks/src/main/java/org/apache/geode/benchmark/redis/tasks/InitRegion.java
b/geode-benchmarks/src/main/java/org/apache/geode/benchmark/redis/tasks/InitRegion.java
index 8210c7a..63cfaf2 100644
---
a/geode-benchmarks/src/main/java/org/apache/geode/benchmark/redis/tasks/InitRegion.java
+++
b/geode-benchmarks/src/main/java/org/apache/geode/benchmark/redis/tasks/InitRegion.java
@@ -28,7 +28,7 @@ import org.apache.geode.perftest.TestContext;
public class InitRegion implements Task {
- public static final String REDIS_DATA_REGION = "REDIS_DATA";
+ public static final String REDIS_DATA_REGION = "GEODE_FOR_REDIS";
@Override
public void run(final TestContext context) throws Exception {
[geode] branch develop updated (4248006 -> e1fac45)
This is an automated email from the ASF dual-hosted git repository. rhoughton pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from 4248006 [GEODE-9775] CI Changes to support CI migration add e1fac45 GEODE-9775: fixup missing Concourse variable for PR pipeline (#7047) No new revisions were added by this update. Summary of changes: ci/pipelines/pull-request/jinja.template.yml | 6 ++ 1 file changed, 6 insertions(+)
[geode-native] branch develop updated: GEODE-9741: Use v142 Toolchain in Visual Studio 2019 CI Pipeline (#884)
This is an automated email from the ASF dual-hosted git repository.
mmartell pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode-native.git
The following commit(s) were added to refs/heads/develop by this push:
new e7ff147 GEODE-9741: Use v142 Toolchain in Visual Studio 2019 CI
Pipeline (#884)
e7ff147 is described below
commit e7ff1475fa9cc03dd1653d31c5ffdea1a1cf638a
Author: Michael Martell
AuthorDate: Tue Oct 26 12:27:06 2021 -0700
GEODE-9741: Use v142 Toolchain in Visual Studio 2019 CI Pipeline (#884)
* Add v142 to VS 2019 and build with it
* Use explicit versions
* Use lowest versions for tools & sdk
---
ci/base/base.yml | 2 +-
packer/windows/install-vs-2019-community.ps1 | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ci/base/base.yml b/ci/base/base.yml
index c336540..a07224e 100644
--- a/ci/base/base.yml
+++ b/ci/base/base.yml
@@ -72,7 +72,7 @@ builds:
with_dot_net: #@ True
#@yaml/map-key-override
params:
- CMAKE_CONFIGURE_FLAGS: "-A x64 -Tv141,version=14.16,host=x64
-DCMAKE_SYSTEM_VERSION=10.0.16299.0"
+ CMAKE_CONFIGURE_FLAGS: "-A x64 -Tv142,version=14.20,host=x64
-DCMAKE_SYSTEM_VERSION=10.0.16299.0"
CMAKE_BUILD_FLAGS: "/m"
CPACK_GENERATORS: "ZIP"
diff --git a/packer/windows/install-vs-2019-community.ps1
b/packer/windows/install-vs-2019-community.ps1
index 460dfd1..7f2580b 100644
--- a/packer/windows/install-vs-2019-community.ps1
+++ b/packer/windows/install-vs-2019-community.ps1
@@ -29,13 +29,14 @@ $args = @('--add
Microsoft.VisualStudio.Component.CoreEditor',
'--add Microsoft.Net.Component.4.5.2.TargetingPack',
'--add Microsoft.VisualStudio.Component.IntelliCode',
'--add Microsoft.VisualStudio.Component.VC.CoreIde',
+ '--add Microsoft.VisualStudio.Component.VC.Tools.x86.x64',
'--add Microsoft.VisualStudio.Component.VC.Redist.14.Latest',
'--add Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core',
'--add Microsoft.VisualStudio.Component.VC.ATL',
'--add Microsoft.VisualStudio.Component.Windows10SDK.16299',
- '--add Microsoft.VisualStudio.Component.VC.v141.x86.x64',
+ '--add Microsoft.VisualStudio.Component.VC.14.20.x86.x64',
'--add Microsoft.VisualStudio.Workload.NativeDesktop',
- '--add Microsoft.VisualStudio.Component.VC.v141.CLI.Support',
+ '--add Microsoft.VisualStudio.Component.VC.14.20.CLI.Support',
'--add Microsoft.Net.Component.4.6.1.SDK',
'--quiet')
[geode] branch develop updated: [GEODE-9775] CI Changes to support CI migration
This is an automated email from the ASF dual-hosted git repository.
smgoller pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 4248006 [GEODE-9775] CI Changes to support CI migration
4248006 is described below
commit 4248006916a91f6d86976f77aea50a9dec729757
Author: Sean Goller
AuthorDate: Tue Oct 26 18:48:17 2021 +
[GEODE-9775] CI Changes to support CI migration
* Remove unnecessary environment variables.
* get network information from concourse instead of discovering it
ourselves.
---
ci/pipelines/geode-build/deploy_pipeline.sh | 10 --
ci/pipelines/geode-build/jinja.template.yml | 3 +++
ci/pipelines/images/jinja.template.yml | 6 ++
ci/scripts/build_image.sh | 16 ++--
ci/scripts/create_instance.sh | 23 ---
5 files changed, 27 insertions(+), 31 deletions(-)
diff --git a/ci/pipelines/geode-build/deploy_pipeline.sh
b/ci/pipelines/geode-build/deploy_pipeline.sh
index f0e38ba..2cf1640 100755
--- a/ci/pipelines/geode-build/deploy_pipeline.sh
+++ b/ci/pipelines/geode-build/deploy_pipeline.sh
@@ -40,16 +40,6 @@ fi
echo "Sanitized Geode Fork = ${SANITIZED_GEODE_FORK}"
echo "Sanitized Geode Branch = ${SANITIZED_GEODE_BRANCH}"
-MY_NAME=$(curl -s
"http://metadata.google.internal/computeMetadata/v1/instance/name; -H
"Metadata-Flavor: Google")
-MY_ZONE=$(curl -s
"http://metadata.google.internal/computeMetadata/v1/instance/zone; -H
"Metadata-Flavor: Google")
-MY_ZONE=${MY_ZONE##*/}
-NETWORK_INTERFACE_INFO="$(gcloud compute instances describe ${MY_NAME} --zone
${MY_ZONE} --format="json(networkInterfaces)")"
-GCP_NETWORK=$(echo ${NETWORK_INTERFACE_INFO} | jq -r
'.networkInterfaces[0].network')
-GCP_NETWORK=${GCP_NETWORK##*/}
-GCP_SUBNETWORK=$(echo ${NETWORK_INTERFACE_INFO} | jq -r
'.networkInterfaces[0].subnetwork')
-GCP_SUBNETWORK=${GCP_SUBNETWORK##*/}
-ENV_ID=$(echo ${GCP_NETWORK} | awk -F- '{ print $1}')
-
#echo "DEBUG INFO *"
#echo "Pipeline prefix = ${PIPELINE_PREFIX}"
#echo "Docker image prefix = ${DOCKER_IMAGE_PREFIX}"
diff --git a/ci/pipelines/geode-build/jinja.template.yml
b/ci/pipelines/geode-build/jinja.template.yml
index 82cee71..59dc0fb 100644
--- a/ci/pipelines/geode-build/jinja.template.yml
+++ b/ci/pipelines/geode-build/jinja.template.yml
@@ -60,6 +60,9 @@
{% macro common_instance_params(test) -%}
GCP_PROJECT: ((gcp-project))
+GCP_NETWORK: ((gcp-network))
+GCP_SUBNETWORK: ((gcp-subnet))
+GCP_ZONE: ((gcp-zone))
CPUS: {{ test.CPUS }}
RAM: {{ test.RAM }}
DISK: {{ test.DISK }}
diff --git a/ci/pipelines/images/jinja.template.yml
b/ci/pipelines/images/jinja.template.yml
index c5148c9..3c202d2 100644
--- a/ci/pipelines/images/jinja.template.yml
+++ b/ci/pipelines/images/jinja.template.yml
@@ -313,6 +313,9 @@ jobs:
GEODE_DOCKER_IMAGE:
gcr.io/((gcp-project))/((pipeline-prefix))test-container
PIPELINE_PREFIX: ((pipeline-prefix))
GCP_PROJECT: ((gcp-project))
+GCP_NETWORK: ((gcp-network))
+GCP_SUBNETWORK: ((gcp-subnet))
+INTERNAL: "true"
CONCOURSE_GCP_KEY: "((concourse-gcp-key))"
JAVA_BUILD_VERSION: 8
run:
@@ -348,6 +351,9 @@ jobs:
GEODE_DOCKER_IMAGE:
gcr.io/((gcp-project))/((pipeline-prefix))test-container
PIPELINE_PREFIX: ((pipeline-prefix))
GCP_PROJECT: ((gcp-project))
+GCP_NETWORK: ((gcp-network))
+GCP_SUBNETWORK: ((gcp-subnet))
+INTERNAL: "true"
CONCOURSE_GCP_KEY: "((concourse-gcp-key))"
JAVA_BUILD_VERSION: 8
run:
diff --git a/ci/scripts/build_image.sh b/ci/scripts/build_image.sh
index 0db5b48..ab3020f 100755
--- a/ci/scripts/build_image.sh
+++ b/ci/scripts/build_image.sh
@@ -32,20 +32,8 @@ if [[ -n "${CONCOURSE_GCP_KEY}" ]]; then
export GOOGLE_APPLICATION_CREDENTIALS=${PACKERDIR}/credentials.json
fi
-GCP_NETWORK="default"
-GCP_SUBNETWORK="default"
-
-MY_NAME=$(curl -s
"http://metadata.google.internal/computeMetadata/v1/instance/name; -H
"Metadata-Flavor: Google")
-if [[ -n "${MY_NAME}" ]]; then
- MY_ZONE=$(curl -s
"http://metadata.google.internal/computeMetadata/v1/instance/zone; -H
"Metadata-Flavor: Google")
- MY_ZONE=${MY_ZONE##*/}
- NETWORK_INTERFACE_INFO="$(gcloud compute instances describe ${MY_NAME}
--zone ${MY_ZONE} --format="json(networkInterfaces)")"
- GCP_NETWORK=$(echo ${NETWORK_INTERFACE_INFO} | jq -r
'.networkInterfaces[0].network')
- GCP_NETWORK=${GCP_NETWORK##*/}
- GCP_SUBNETWORK=$(echo ${NETWORK_INTERFACE_INFO} | jq -r
'.networkInterfaces[0].subnetwork')
- GCP_SUBNETWORK=${GCP_SUBNETWORK##*/}
- INTERNAL=true
-fi
+GCP_NETWORK="${GCP_NETWORK:-default}"
+GCP_SUBNETWORK="${GCP_SUBNETWORK:-default}"
if [[ -z "${GCP_PROJECT}" ]]; then
echo "GCP_PROJECT is unset. Cowardly refusing to continue."
diff --git a/ci/scripts/create_instance.sh
[geode] 01/01: GEODE-9425: debug messages.
This is an automated email from the ASF dual-hosted git repository.
mhanson pushed a commit to branch bugfix/GEODE-9425
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 3d49be9aa2f77439c1d4864761bdff117688b063
Author: Mark Hanson
AuthorDate: Tue Oct 26 09:53:58 2021 -0700
GEODE-9425: debug messages.
---
.../internal/AutoConnectionSourceDUnitTest.java| 73 +++---
.../cache/client/internal/LocatorTestBase.java | 20 +
.../membership/gms/fd/GMSHealthMonitor.java| 88 +++---
.../tcpserver/AdvancedSocketCreatorImpl.java | 3 +-
4 files changed, 127 insertions(+), 57 deletions(-)
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/cache/client/internal/AutoConnectionSourceDUnitTest.java
b/geode-core/src/distributedTest/java/org/apache/geode/cache/client/internal/AutoConnectionSourceDUnitTest.java
index eebbde3..6bfff2b 100644
---
a/geode-core/src/distributedTest/java/org/apache/geode/cache/client/internal/AutoConnectionSourceDUnitTest.java
+++
b/geode-core/src/distributedTest/java/org/apache/geode/cache/client/internal/AutoConnectionSourceDUnitTest.java
@@ -30,6 +30,7 @@ import java.util.Comparator;
import java.util.HashSet;
import java.util.List;
+import org.apache.logging.log4j.Logger;
import org.awaitility.core.ConditionTimeoutException;
import org.junit.After;
import org.junit.Assert;
@@ -43,9 +44,11 @@ import org.apache.geode.cache.client.Pool;
import org.apache.geode.cache.client.PoolManager;
import org.apache.geode.cache.server.CacheServer;
import org.apache.geode.distributed.internal.ServerLocationAndMemberId;
+import org.apache.geode.logging.internal.log4j.api.LogService;
import org.apache.geode.management.membership.ClientMembership;
import org.apache.geode.management.membership.ClientMembershipEvent;
import org.apache.geode.management.membership.ClientMembershipListenerAdapter;
+import org.apache.geode.test.dunit.AsyncInvocation;
import org.apache.geode.test.dunit.RMIException;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.junit.categories.ClientServerTest;
@@ -60,6 +63,7 @@ public class AutoConnectionSourceDUnitTest extends
LocatorTestBase {
private static final String VALUE = "value";
private static final Object BRIDGE_LISTENER = "BRIDGE_LISTENER";
private static final long MAX_WAIT = 6;
+ private Logger logger;
@Override
public final void postSetUp() {
@@ -189,24 +193,23 @@ public class AutoConnectionSourceDUnitTest extends
LocatorTestBase {
final String hostName = getServerHostName();
VM locator0VM = VM.getVM(0);
VM locator1VM = VM.getVM(1);
-VM clientVM = VM.getVM(2);
+VM locator2VM = VM.getVM(2);
VM serverVM = VM.getVM(3);
+VM serverVM2 = VM.getVM(4);
+VM clientVM2 = VM.getVM(5);
+logger = LogService.getLogger();
final int locator0Port = locator0VM.invoke("Start Locator1 ", () ->
startLocator(hostName, ""));
final int locator1Port = locator1VM.invoke("Start Locator2 ",
() -> startLocator(hostName, getLocatorString(hostName,
locator0Port)));
assertThat(locator0Port).isGreaterThan(0);
assertThat(locator1Port).isGreaterThan(0);
+logger.info("MLH starting client Locator 0 = " + locator0Port + " Locator
1 = " + locator1Port);
startBridgeClient(null, hostName, locator0Port);
InetSocketAddress locatorToWaitFor = new InetSocketAddress(hostName,
locator1Port);
-MyLocatorCallback callback = (MyLocatorCallback)
remoteObjects.get(CALLBACK_KEY);
-boolean discovered = callback.waitForDiscovery(locatorToWaitFor, MAX_WAIT);
-Assert.assertTrue(
-"Waited " + MAX_WAIT + " for " + locatorToWaitFor
-+ " to be discovered on client. List is now: " +
callback.getDiscovered(),
-discovered);
+waitForLocatorDiscovery(VM.getVM(-1), locatorToWaitFor);
InetSocketAddress[] initialLocators =
new InetSocketAddress[] {new InetSocketAddress(hostName,
locator0Port)};
@@ -221,20 +224,58 @@ public class AutoConnectionSourceDUnitTest extends
LocatorTestBase {
verifyLocatorsMatched(expectedLocators, pool.getOnlineLocators());
-// stop one of the locators and ensure that the client can find and use a
server
-locator0VM.invoke("Stop Locator", this::stopLocator);
+logger.info("MLH Locators = " + pool.getLocators().size() + " online
locators = "
++ pool.getOnlineLocators().size());
-await().until(() -> pool.getOnlineLocators().size() == 1);
+await().until(() -> pool.getOnlineLocators().size() == 2);
+logger.info("MLH Starting the server");
int serverPort = serverVM.invoke("Start BridgeServer",
-() -> startBridgeServer(null, getLocatorString(hostName,
locator1Port)));
+() -> startPartitionedRegionServer(getLocatorString(hostName,
locator0Port), REGION_NAME));
+logger.info("MLH Server port is " + serverPort);
[geode] branch bugfix/GEODE-9425 created (now 3d49be9)
This is an automated email from the ASF dual-hosted git repository. mhanson pushed a change to branch bugfix/GEODE-9425 in repository https://gitbox.apache.org/repos/asf/geode.git. at 3d49be9 GEODE-9425: debug messages. This branch includes the following new commits: new 3d49be9 GEODE-9425: debug messages. The 1 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.
[geode] branch develop updated (80bd441 -> 647e4b4)
This is an automated email from the ASF dual-hosted git repository. echobravo pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from 80bd441 move RedisPropertiesTest to match the location of the source class (#7043) add 647e4b4 Update codeowners (#7045) No new revisions were added by this update. Summary of changes: CODEOWNERS | 32 1 file changed, 16 insertions(+), 16 deletions(-)
[geode] branch develop updated (4b7fe0a -> 80bd441)
This is an automated email from the ASF dual-hosted git repository.
heybales pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git.
from 4b7fe0a GEODE-9670: fix ignored test to have the correct expectations
(#7042)
add 80bd441 move RedisPropertiesTest to match the location of the source
class (#7043)
No new revisions were added by this update.
Summary of changes:
.../org/apache/geode/redis/internal/{data => }/RedisPropertiesTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename geode-for-redis/src/test/java/org/apache/geode/redis/internal/{data =>
}/RedisPropertiesTest.java (99%)
[geode] branch develop updated (4675991 -> 4b7fe0a)
This is an automated email from the ASF dual-hosted git repository. dschneider pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from 4675991 GEODE-9721: renamed the constant names to begin with GEODE_FOR_REDIS_ (#7038) add 4b7fe0a GEODE-9670: fix ignored test to have the correct expectations (#7042) No new revisions were added by this update. Summary of changes: .../data/PartitionedRegionStatsUpdateTest.java | 46 +++--- 1 file changed, 23 insertions(+), 23 deletions(-)
