[geode] branch develop updated (88140fa -> 040c7ec)
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 88140fa GEODE-8915: - update CI pipelines for concourse 6.x (#6002) add 040c7ec fix concourse yaml for registry_mirror (#6004) No new revisions were added by this update. Summary of changes: ci/pipelines/pull-request/jinja.template.yml | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-)
[geode] branch develop updated (67cf334 -> 88140fa)
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 67cf334 GEODE-8904: Redis - hexists tests (#5988) add 88140fa GEODE-8915: - update CI pipelines for concourse 6.x (#6002) No new revisions were added by this update. Summary of changes: ci/pipelines/examples/jinja.template.yml | 12 ++- ci/pipelines/geode-build/jinja.template.yml | 11 ++- ci/pipelines/images/jinja.template.yml| 2 + ci/pipelines/mass-test-run/jinja.template.yml | 4 + ci/pipelines/meta/jinja.template.yml | 123 +- ci/pipelines/pull-request/jinja.template.yml | 12 +-- ci/pipelines/reaper/jinja.template.yml| 6 +- 7 files changed, 73 insertions(+), 97 deletions(-)
[geode] branch support/1.13 updated: GEODE-8915: pipeline changes to support concourse 6.
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 The following commit(s) were added to refs/heads/support/1.13 by this push: new 1ba15c0 GEODE-8915: pipeline changes to support concourse 6. 1ba15c0 is described below commit 1ba15c0dde5b7ac0cbb137f0ae765344db153cd4 Author: Sean Goller AuthorDate: Wed Feb 3 11:42:30 2021 -0800 GEODE-8915: pipeline changes to support concourse 6. * Remove all references to ((! * Use set_pipeline step instead of external resource types to deploy pipelines internally * use registry_mirror to pull from dockerhub --- ci/pipelines/examples/jinja.template.yml | 12 ++- ci/pipelines/geode-build/jinja.template.yml | 11 ++- ci/pipelines/images/jinja.template.yml | 2 + ci/pipelines/meta/jinja.template.yml | 111 +-- ci/pipelines/pull-request/jinja.template.yml | 14 ++-- ci/pipelines/reaper/jinja.template.yml | 6 +- 6 files changed, 66 insertions(+), 90 deletions(-) diff --git a/ci/pipelines/examples/jinja.template.yml b/ci/pipelines/examples/jinja.template.yml index cd9ff8e..fb53e7b 100644 --- a/ci/pipelines/examples/jinja.template.yml +++ b/ci/pipelines/examples/jinja.template.yml @@ -29,7 +29,7 @@ RAM: {{ test.RAM }} GRADLE_TASK_OPTIONS: {{ test.GRADLE_TASK_OPTIONS }} {%- endif %} MAINTENANCE_VERSION: ((geode-build-branch )) -SERVICE_ACCOUNT: ((!concourse-gcp-account)) +SERVICE_ACCOUNT: ((concourse-gcp-account)) {%- endmacro %} --- @@ -38,22 +38,28 @@ resource_types: - name: gci type: registry-image source: +registry_mirror: + host: mirror.gcr.io repository: smgoller/gci-resource - name: maven-resource type: registry-image source: +registry_mirror: + host: mirror.gcr.io repository: nulldriver/maven-resource tag: latest - name: concourse-metadata-resource type: registry-image source: -password: ((!docker-password)) +password: ((docker-password)) repository: gcr.io/((gcp-project))/((pipeline-prefix))concourse-metadata-resource tag: latest -username: ((!docker-username)) +username: ((docker-username)) - name: gcs-resource type: registry-image source: +registry_mirror: + host: mirror.gcr.io repository: frodenas/gcs-resource - name: json-gcs-resource type: docker-image diff --git a/ci/pipelines/geode-build/jinja.template.yml b/ci/pipelines/geode-build/jinja.template.yml index d19eb33..b673e57 100644 --- a/ci/pipelines/geode-build/jinja.template.yml +++ b/ci/pipelines/geode-build/jinja.template.yml @@ -191,7 +191,7 @@ resources: bucket: ((artifact-bucket)) driver: gcs initial_version: {{ metadata.initial_version }} -json_key: ((!concourse-gcp-key)) +json_key: ((concourse-gcp-key)) key: semvers/((pipeline-prefix))((geode-build-branch))/number - name: geode-passing-tokens type: gcs-resource @@ -226,6 +226,8 @@ resource_types: - name: gci type: registry-image source: +registry_mirror: + host: mirror.gcr.io repository: smgoller/gci-resource - name: concourse-metadata-resource type: docker-image @@ -237,6 +239,7 @@ resource_types: - name: gcs-resource type: docker-image source: +registry_mirror: mirror.gcr.io repository: frodenas/gcs-resource jobs: {% for semverPiece in ['major', 'minor', 'patch'] -%} @@ -379,7 +382,7 @@ jobs: GRADLE_TASK: {{build_test.GRADLE_TASK}} MAINTENANCE_VERSION: ((geode-build-branch)) ARTIFACT_BUCKET: ((artifact-bucket)) -SERVICE_ACCOUNT: ((!concourse-gcp-account)) +SERVICE_ACCOUNT: ((concourse-gcp-account)) TAR_GEODE_BUILD_ARTIFACTS: true run: path: geode-ci/ci/scripts/archive_results.sh @@ -591,7 +594,7 @@ jobs: params: MAINTENANCE_VERSION: ((geode-build-branch)) ARTIFACT_BUCKET: ((artifact-bucket)) -SERVICE_ACCOUNT: ((!concourse-gcp-account)) +SERVICE_ACCOUNT: ((concourse-gcp-account)) JAVA_BUILD_VERSION: {{ java_build_version.version }} MAVEN_SNAPSHOT_BUCKET: ((maven-snapshot-bucket)) GRADLE_GLOBAL_ARGS: ((gradle-global-args)) @@ -727,7 +730,7 @@ jobs: GRADLE_TASK: {{test.GRADLE_TASK}} MAINTENANCE_VERSION: ((geode-build-branch)) ARTIFACT_BUCKET: ((artifact-bucket)) -SERVICE_ACCOUNT: ((!concourse-gcp-account)) +SERVICE_ACCOUNT: ((concourse-gcp-account)) run: path: geode-ci/ci/scripts/archive_results.sh inputs: diff --git a/ci/pipelines/images/jinja.template.yml b/ci/pipelines/images/jinja.template.yml index ec29682..5b58834 100644 --- a/ci/pipelines/images/jinja.template.yml +++ b/ci/pipelin
[geode] branch develop updated (7b058d5 -> 67cf334)
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 7b058d5 GEODE-8908: support STRLEN command (#5994) add 67cf334 GEODE-8904: Redis - hexists tests (#5988) No new revisions were added by this update. Summary of changes: .../{HMgetDUnitTest.java => HExistsDUnitTest.java} | 44 - .../hash/AbstractHashesIntegrationTest.java| 108 - .../geode/redis/internal/RedisCommandType.java | 2 +- .../redis/internal/SupportedCommandsJUnitTest.java | 2 +- 4 files changed, 103 insertions(+), 53 deletions(-) copy geode-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/hash/{HMgetDUnitTest.java => HExistsDUnitTest.java} (72%)
[geode] branch develop updated (aeb214c -> 7b058d5)
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 aeb214c GEODE-8914: remove defunct metrics pipeline from ci (#5999) add 7b058d5 GEODE-8908: support STRLEN command (#5994) No new revisions were added by this update. Summary of changes: .../internal/executor/string/StringsDUnitTest.java | 75 ++ .../geode/redis/internal/RedisCommandType.java | 2 +- .../redis/internal/SupportedCommandsJUnitTest.java | 2 +- 3 files changed, 51 insertions(+), 28 deletions(-)
[geode] branch support/1.12 updated: Fix merge issue.
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 The following commit(s) were added to refs/heads/support/1.12 by this push: new 2dd6684 Fix merge issue. 2dd6684 is described below commit 2dd668402c77bf49aa38aac0ab179e042b98947a Author: Sean Goller AuthorDate: Wed Feb 3 13:31:24 2021 -0800 Fix merge issue. --- ci/pipelines/meta/jinja.template.yml | 40 1 file changed, 40 deletions(-) diff --git a/ci/pipelines/meta/jinja.template.yml b/ci/pipelines/meta/jinja.template.yml index 12a16ad..5dbae3b 100644 --- a/ci/pipelines/meta/jinja.template.yml +++ b/ci/pipelines/meta/jinja.template.yml @@ -234,46 +234,6 @@ jobs: {% endif %} -- name: set-metrics-pipeline - serial: true - public: ((public-pipelines)) - plan: -- get: geode-metrics-pipeline - trigger: true -- get: meta-mini-image - trigger: true - passed: [build-meta-mini-docker-image] -- task: create-metrics-pipeline-yml - image: meta-mini-image - config: -platform: linux -inputs: - - name: geode-metrics-pipeline -outputs: - - name: results -params: - OUTPUT_DIRECTORY: results - GEODE_BRANCH: ((geode-build-branch)) - GEODE_FORK: ((geode-fork)) - GEODE_REPO_NAME: ((geode-repo-name)) - REPOSITORY_PUBLIC: {{ repository.public }} - ARTIFACT_BUCKET: ((artifact-bucket)) - UPSTREAM_FORK: {{ repository.upstream_fork }} - PIPELINE_PREFIX: ((pipeline-prefix)) - SANITIZED_GEODE_BRANCH: ((sanitized-geode-build-branch)) - SANITIZED_GEODE_FORK: ((sanitized-geode-fork)) - GCP_PROJECT: ((gcp-project)) - PUBLIC_PIPELINES: ((public-pipelines)) - CONCOURSE_URL: ((concourse-url)) - CONCOURSE_HOST: ((concourse-host)) - CONCOURSE_TEAM: ((concourse-team)) -run: - path: geode-metrics-pipeline/ci/pipelines/metrics/deploy_metrics_pipeline.sh -- set_pipeline: ((pipeline-prefix))metrics - file: results/generated-pipeline.yml - var_files: - - results/pipeline-vars.yml - - name: set-reaper-pipeline serial: true public: ((public-pipelines))
[geode] branch support/1.12 updated: GEODE-8915: pipeline changes to support concourse 6.
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 The following commit(s) were added to refs/heads/support/1.12 by this push: new d1543d2 GEODE-8915: pipeline changes to support concourse 6. d1543d2 is described below commit d1543d2562cc590b3b42640c455d5484c2ee5083 Author: Sean Goller AuthorDate: Wed Feb 3 11:42:30 2021 -0800 GEODE-8915: pipeline changes to support concourse 6. * Remove all references to ((! * Use set_pipeline step instead of external resource types to deploy pipelines internally * use registry_mirror to pull from dockerhub --- ci/pipelines/examples/jinja.template.yml | 12 ++- ci/pipelines/geode-build/jinja.template.yml | 11 +- ci/pipelines/images/jinja.template.yml | 2 + ci/pipelines/meta/jinja.template.yml | 151 ++- ci/pipelines/pull-request/jinja.template.yml | 14 +-- ci/pipelines/reaper/jinja.template.yml | 6 +- 6 files changed, 106 insertions(+), 90 deletions(-) diff --git a/ci/pipelines/examples/jinja.template.yml b/ci/pipelines/examples/jinja.template.yml index cd9ff8e..fb53e7b 100644 --- a/ci/pipelines/examples/jinja.template.yml +++ b/ci/pipelines/examples/jinja.template.yml @@ -29,7 +29,7 @@ RAM: {{ test.RAM }} GRADLE_TASK_OPTIONS: {{ test.GRADLE_TASK_OPTIONS }} {%- endif %} MAINTENANCE_VERSION: ((geode-build-branch )) -SERVICE_ACCOUNT: ((!concourse-gcp-account)) +SERVICE_ACCOUNT: ((concourse-gcp-account)) {%- endmacro %} --- @@ -38,22 +38,28 @@ resource_types: - name: gci type: registry-image source: +registry_mirror: + host: mirror.gcr.io repository: smgoller/gci-resource - name: maven-resource type: registry-image source: +registry_mirror: + host: mirror.gcr.io repository: nulldriver/maven-resource tag: latest - name: concourse-metadata-resource type: registry-image source: -password: ((!docker-password)) +password: ((docker-password)) repository: gcr.io/((gcp-project))/((pipeline-prefix))concourse-metadata-resource tag: latest -username: ((!docker-username)) +username: ((docker-username)) - name: gcs-resource type: registry-image source: +registry_mirror: + host: mirror.gcr.io repository: frodenas/gcs-resource - name: json-gcs-resource type: docker-image diff --git a/ci/pipelines/geode-build/jinja.template.yml b/ci/pipelines/geode-build/jinja.template.yml index 79ae842..a5be565 100644 --- a/ci/pipelines/geode-build/jinja.template.yml +++ b/ci/pipelines/geode-build/jinja.template.yml @@ -191,7 +191,7 @@ resources: bucket: ((artifact-bucket)) driver: gcs initial_version: {{ metadata.initial_version }} -json_key: ((!concourse-gcp-key)) +json_key: ((concourse-gcp-key)) key: semvers/((pipeline-prefix))((geode-build-branch))/number - name: geode-passing-tokens type: gcs-resource @@ -226,6 +226,8 @@ resource_types: - name: gci type: registry-image source: +registry_mirror: + host: mirror.gcr.io repository: smgoller/gci-resource - name: concourse-metadata-resource type: docker-image @@ -237,6 +239,7 @@ resource_types: - name: gcs-resource type: docker-image source: +registry_mirror: mirror.gcr.io repository: frodenas/gcs-resource jobs: {% for semverPiece in ['major', 'minor', 'patch'] -%} @@ -379,7 +382,7 @@ jobs: GRADLE_TASK: {{build_test.GRADLE_TASK}} MAINTENANCE_VERSION: ((geode-build-branch)) ARTIFACT_BUCKET: ((artifact-bucket)) -SERVICE_ACCOUNT: ((!concourse-gcp-account)) +SERVICE_ACCOUNT: ((concourse-gcp-account)) TAR_GEODE_BUILD_ARTIFACTS: true run: path: geode-ci/ci/scripts/archive_results.sh @@ -591,7 +594,7 @@ jobs: params: MAINTENANCE_VERSION: ((geode-build-branch)) ARTIFACT_BUCKET: ((artifact-bucket)) -SERVICE_ACCOUNT: ((!concourse-gcp-account)) +SERVICE_ACCOUNT: ((concourse-gcp-account)) JAVA_BUILD_VERSION: {{ java_build_version.version }} MAVEN_SNAPSHOT_BUCKET: ((maven-snapshot-bucket)) GRADLE_GLOBAL_ARGS: ((gradle-global-args)) @@ -727,7 +730,7 @@ jobs: GRADLE_TASK: {{test.GRADLE_TASK}} MAINTENANCE_VERSION: ((geode-build-branch)) ARTIFACT_BUCKET: ((artifact-bucket)) -SERVICE_ACCOUNT: ((!concourse-gcp-account)) +SERVICE_ACCOUNT: ((concourse-gcp-account)) run: path: geode-ci/ci/scripts/archive_results.sh inputs: diff --git a/ci/pipelines/images/jinja.template.yml b/ci/pipelines/images/jinja.template.yml index d0c6b7a..aebecd4 100644 --- a/ci/pipelines/images/jinja.template.yml +++ b/ci/pipeline
[geode] branch feature/GEODE-8916 created (now 3dc1e7b)
This is an automated email from the ASF dual-hosted git repository. boglesby pushed a change to branch feature/GEODE-8916 in repository https://gitbox.apache.org/repos/asf/geode.git. at 3dc1e7b GEODE-8916: Added locators to the export stack traces command No new revisions were added by this update.
[geode] branch support/1.12 updated: GEODE-8914: remove defunct metrics pipeline from ci (#5999)
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 The following commit(s) were added to refs/heads/support/1.12 by this push: new 39565bb GEODE-8914: remove defunct metrics pipeline from ci (#5999) 39565bb is described below commit 39565bba639c4ab8c02916dd51d8e2cbb447442d Author: Owen Nichols <34043438+onichols-pivo...@users.noreply.github.com> AuthorDate: Wed Feb 3 11:21:31 2021 -0800 GEODE-8914: remove defunct metrics pipeline from ci (#5999) (cherry picked from commit aeb214c66d53aa68766f2772cdf4c0c46f36b638) (cherry picked from commit 7eab046a1fc64e69462a6f06517a3d3874730358) --- ci/pipelines/meta/deploy_meta.sh| 6 +- ci/pipelines/meta/destroy_pipelines.sh | 2 +- ci/pipelines/meta/jinja.template.yml| 51 ci/pipelines/metrics/deploy_metrics_pipeline.sh | 84 ci/pipelines/metrics/jinja.template.yml | 101 5 files changed, 3 insertions(+), 241 deletions(-) diff --git a/ci/pipelines/meta/deploy_meta.sh b/ci/pipelines/meta/deploy_meta.sh index 4fc4bd6..ba47076 100755 --- a/ci/pipelines/meta/deploy_meta.sh +++ b/ci/pipelines/meta/deploy_meta.sh @@ -256,15 +256,14 @@ set +x if [[ "${GEODE_FORK}" != "${UPSTREAM_FORK}" ]]; then echo "Disabling unnecessary jobs for forks." pauseJobs ${META_PIPELINE} set-reaper-pipeline - pauseNewJobs ${META_PIPELINE} set-metrics-pipeline elif [[ "$GEODE_FORK" == "${UPSTREAM_FORK}" ]] && [[ "$GEODE_BRANCH" == "develop" ]]; then echo "Disabling optional jobs for develop" - pauseNewJobs ${META_PIPELINE} set-pr-pipeline set-metrics-pipeline set-examples-pipeline + pauseNewJobs ${META_PIPELINE} set-pr-pipeline set-examples-pipeline else echo "Disabling unnecessary jobs for release branches." echo "*** DO NOT RE-ENABLE THESE META-JOBS ***" pauseJobs ${META_PIPELINE} set-images-pipeline set-reaper-pipeline - pauseNewJobs ${META_PIPELINE} set-pr-pipeline set-metrics-pipeline set-examples-pipeline + pauseNewJobs ${META_PIPELINE} set-pr-pipeline set-examples-pipeline fi unpausePipeline ${META_PIPELINE} @@ -279,7 +278,6 @@ unpausePipeline ${PIPELINE_PREFIX}main if [[ "$GEODE_FORK" == "${UPSTREAM_FORK}" ]]; then exposePipelines ${PIPELINE_PREFIX}main ${PIPELINE_PREFIX}images if [[ "${PUBLIC}" == "true" ]]; then -enableFeature metrics enableFeature examples fi if [[ "$GEODE_BRANCH" == "develop" ]]; then diff --git a/ci/pipelines/meta/destroy_pipelines.sh b/ci/pipelines/meta/destroy_pipelines.sh index 7203a85..3c6f761 100755 --- a/ci/pipelines/meta/destroy_pipelines.sh +++ b/ci/pipelines/meta/destroy_pipelines.sh @@ -80,5 +80,5 @@ function destroyPipelines { done } -destroyPipelines ${PIPELINE_PREFIX}main ${PIPELINE_PREFIX}pr ${PIPELINE_PREFIX}images ${PIPELINE_PREFIX}reaper ${PIPELINE_PREFIX}metrics ${PIPELINE_PREFIX}examples ${PIPELINE_PREFIX}meta ${PIPELINE_PREFIX}rc +destroyPipelines ${PIPELINE_PREFIX}main ${PIPELINE_PREFIX}pr ${PIPELINE_PREFIX}images ${PIPELINE_PREFIX}reaper ${PIPELINE_PREFIX}examples ${PIPELINE_PREFIX}meta ${PIPELINE_PREFIX}rc echo "Destroyed ${CONCOURSE_URL}/teams/${CONCOURSE_TEAM}/pipelines/${PIPELINE_PREFIX}main and all related pipelines" diff --git a/ci/pipelines/meta/jinja.template.yml b/ci/pipelines/meta/jinja.template.yml index 5fd8ee3..f342f1a 100644 --- a/ci/pipelines/meta/jinja.template.yml +++ b/ci/pipelines/meta/jinja.template.yml @@ -94,13 +94,6 @@ resources: - ci/pipelines/render.py - ci/pipelines/meta/meta.properties {% endif %} -- name: geode-metrics-pipeline - type: git - source: -{{ github_access() | indent(4) }} -branch: ((!geode-build-branch)) -paths: -- ci/pipelines/metrics/* jobs: - name: set-images-pipeline @@ -274,50 +267,6 @@ jobs: {% endif %} -- name: set-metrics-pipeline - serial: true - public: ((!public-pipelines)) - plan: -- get: geode-metrics-pipeline - trigger: true -- get: meta-mini-image - trigger: true - passed: [build-meta-mini-docker-image] -- task: create-metrics-pipeline-yml - image: meta-mini-image - config: -platform: linux -inputs: - - name: geode-metrics-pipeline -outputs: - - name: results -params: - OUTPUT_DIRECTORY: results - GEODE_BRANCH: ((geode-build-branch)) - GEODE_FORK: ((geode-fork)) - GEODE_REPO_NAME: ((geode-repo-name)) - REPOSITORY_PUBLIC: {{ repository.public }} - ARTIFACT_BUCKET: ((artifact-bucket)) - UPSTREAM_FORK: {{ repository.upstream_fork }} - PIPELINE_PREFIX: ((pipeline-prefix)) - SANITIZED_GEODE_BRANCH: ((sanitized-geode-build-branch)) - SANITIZED_GEODE_FORK: ((sanitized-geode-fork)) - GCP_PROJECT: ((gcp-project)) - PUBLIC_PIPELINES: ((public-
[geode] branch support/1.13 updated: GEODE-8914: remove defunct metrics pipeline from ci (#5999)
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 The following commit(s) were added to refs/heads/support/1.13 by this push: new 7eab046 GEODE-8914: remove defunct metrics pipeline from ci (#5999) 7eab046 is described below commit 7eab046a1fc64e69462a6f06517a3d3874730358 Author: Owen Nichols <34043438+onichols-pivo...@users.noreply.github.com> AuthorDate: Wed Feb 3 11:21:31 2021 -0800 GEODE-8914: remove defunct metrics pipeline from ci (#5999) (cherry picked from commit aeb214c66d53aa68766f2772cdf4c0c46f36b638) --- ci/pipelines/meta/deploy_meta.sh| 6 +- ci/pipelines/meta/destroy_pipelines.sh | 2 +- ci/pipelines/meta/jinja.template.yml| 51 ci/pipelines/metrics/deploy_metrics_pipeline.sh | 84 ci/pipelines/metrics/jinja.template.yml | 101 5 files changed, 3 insertions(+), 241 deletions(-) diff --git a/ci/pipelines/meta/deploy_meta.sh b/ci/pipelines/meta/deploy_meta.sh index b093f08..0240327 100755 --- a/ci/pipelines/meta/deploy_meta.sh +++ b/ci/pipelines/meta/deploy_meta.sh @@ -256,15 +256,14 @@ set +x if [[ "${GEODE_FORK}" != "${UPSTREAM_FORK}" ]]; then echo "Disabling unnecessary jobs for forks." pauseJobs ${META_PIPELINE} set-reaper-pipeline - pauseNewJobs ${META_PIPELINE} set-metrics-pipeline elif [[ "$GEODE_FORK" == "${UPSTREAM_FORK}" ]] && [[ "$GEODE_BRANCH" == "develop" ]]; then echo "Disabling optional jobs for develop" - pauseNewJobs ${META_PIPELINE} set-pr-pipeline set-metrics-pipeline set-examples-pipeline + pauseNewJobs ${META_PIPELINE} set-pr-pipeline set-examples-pipeline else echo "Disabling unnecessary jobs for support branches." echo "*** DO NOT RE-ENABLE THESE META-JOBS ***" pauseJobs ${META_PIPELINE} set-images-pipeline set-reaper-pipeline - pauseNewJobs ${META_PIPELINE} set-pr-pipeline set-metrics-pipeline set-examples-pipeline + pauseNewJobs ${META_PIPELINE} set-pr-pipeline set-examples-pipeline fi unpausePipeline ${META_PIPELINE} @@ -279,7 +278,6 @@ unpausePipeline ${PIPELINE_PREFIX}main if [[ "$GEODE_FORK" == "${UPSTREAM_FORK}" ]]; then if [[ "${PUBLIC}" == "true" ]]; then exposePipelines ${PIPELINE_PREFIX}main ${PIPELINE_PREFIX}images -enableFeature metrics enableFeature examples fi if [[ "$GEODE_BRANCH" == "develop" ]]; then diff --git a/ci/pipelines/meta/destroy_pipelines.sh b/ci/pipelines/meta/destroy_pipelines.sh index 7203a85..3c6f761 100755 --- a/ci/pipelines/meta/destroy_pipelines.sh +++ b/ci/pipelines/meta/destroy_pipelines.sh @@ -80,5 +80,5 @@ function destroyPipelines { done } -destroyPipelines ${PIPELINE_PREFIX}main ${PIPELINE_PREFIX}pr ${PIPELINE_PREFIX}images ${PIPELINE_PREFIX}reaper ${PIPELINE_PREFIX}metrics ${PIPELINE_PREFIX}examples ${PIPELINE_PREFIX}meta ${PIPELINE_PREFIX}rc +destroyPipelines ${PIPELINE_PREFIX}main ${PIPELINE_PREFIX}pr ${PIPELINE_PREFIX}images ${PIPELINE_PREFIX}reaper ${PIPELINE_PREFIX}examples ${PIPELINE_PREFIX}meta ${PIPELINE_PREFIX}rc echo "Destroyed ${CONCOURSE_URL}/teams/${CONCOURSE_TEAM}/pipelines/${PIPELINE_PREFIX}main and all related pipelines" diff --git a/ci/pipelines/meta/jinja.template.yml b/ci/pipelines/meta/jinja.template.yml index 5fd8ee3..f342f1a 100644 --- a/ci/pipelines/meta/jinja.template.yml +++ b/ci/pipelines/meta/jinja.template.yml @@ -94,13 +94,6 @@ resources: - ci/pipelines/render.py - ci/pipelines/meta/meta.properties {% endif %} -- name: geode-metrics-pipeline - type: git - source: -{{ github_access() | indent(4) }} -branch: ((!geode-build-branch)) -paths: -- ci/pipelines/metrics/* jobs: - name: set-images-pipeline @@ -274,50 +267,6 @@ jobs: {% endif %} -- name: set-metrics-pipeline - serial: true - public: ((!public-pipelines)) - plan: -- get: geode-metrics-pipeline - trigger: true -- get: meta-mini-image - trigger: true - passed: [build-meta-mini-docker-image] -- task: create-metrics-pipeline-yml - image: meta-mini-image - config: -platform: linux -inputs: - - name: geode-metrics-pipeline -outputs: - - name: results -params: - OUTPUT_DIRECTORY: results - GEODE_BRANCH: ((geode-build-branch)) - GEODE_FORK: ((geode-fork)) - GEODE_REPO_NAME: ((geode-repo-name)) - REPOSITORY_PUBLIC: {{ repository.public }} - ARTIFACT_BUCKET: ((artifact-bucket)) - UPSTREAM_FORK: {{ repository.upstream_fork }} - PIPELINE_PREFIX: ((pipeline-prefix)) - SANITIZED_GEODE_BRANCH: ((sanitized-geode-build-branch)) - SANITIZED_GEODE_FORK: ((sanitized-geode-fork)) - GCP_PROJECT: ((gcp-project)) - PUBLIC_PIPELINES: ((public-pipelines)) - CONCOURSE_URL: ((concourse-url)) - CONC
[geode] branch develop updated (d44c07f -> aeb214c)
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 d44c07f GEODE-8913: Add ability for ConcurrentLoopingThreads to run in lockstep (#5997) add aeb214c GEODE-8914: remove defunct metrics pipeline from ci (#5999) No new revisions were added by this update. Summary of changes: ci/pipelines/meta/deploy_meta.sh| 5 +- ci/pipelines/meta/destroy_pipelines.sh | 2 +- ci/pipelines/meta/jinja.template.yml| 51 ci/pipelines/metrics/deploy_metrics_pipeline.sh | 84 ci/pipelines/metrics/jinja.template.yml | 101 5 files changed, 3 insertions(+), 240 deletions(-) delete mode 100755 ci/pipelines/metrics/deploy_metrics_pipeline.sh delete mode 100644 ci/pipelines/metrics/jinja.template.yml
[geode] branch develop updated (4988d83 -> d44c07f)
This is an automated email from the ASF dual-hosted git repository. jensdeppe pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from 4988d83 GEODE-8910: Add test of hashcode generation. (#5996) add d44c07f GEODE-8913: Add ability for ConcurrentLoopingThreads to run in lockstep (#5997) No new revisions were added by this update. Summary of changes: .../geode/redis/ConcurrentLoopingThreads.java | 39 +- 1 file changed, 30 insertions(+), 9 deletions(-)
[geode] branch develop updated (48a733a -> 4988d83)
This is an automated email from the ASF dual-hosted git repository. jbarrett pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from 48a733a Feature/geode 8768 (#5843) add 4988d83 GEODE-8910: Add test of hashcode generation. (#5996) No new revisions were added by this update. Summary of changes: .../org/apache/geode/cache/util/ObjectsTest.java | 355 + 1 file changed, 355 insertions(+) create mode 100644 geode-core/src/test/java/org/apache/geode/cache/util/ObjectsTest.java
[geode] branch develop updated (d6ec360 -> 48a733a)
This is an automated email from the ASF dual-hosted git repository. mivanac pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from d6ec360 GEODE-8906: capture additional gradle log artifacts (#5992) add 48a733a Feature/geode 8768 (#5843) No new revisions were added by this update. Summary of changes: .../admin/remote/DistributionLocatorId.java| 104 +++- .../sanctioned-geode-core-serializables.txt| 2 +- .../cache/wan/misc/WanAutoDiscoveryDUnitTest.java | 24 +++- .../wan/misc/WanLocatorDiscoveryDUnitTest.java | 131 + .../client/internal/locator/wan/LocatorHelper.java | 33 ++ .../locator/wan/LocatorMembershipListenerImpl.java | 12 +- .../locator/wan/WanLocatorDiscovererImpl.java | 24 +++- 7 files changed, 313 insertions(+), 17 deletions(-) create mode 100644 geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/misc/WanLocatorDiscoveryDUnitTest.java
[geode-native] branch develop updated: GEODE-8910: Corrects hashing between .NET and Java (#740)
This is an automated email from the ASF dual-hosted git repository. jbarrett 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 798aafb GEODE-8910: Corrects hashing between .NET and Java (#740) 798aafb is described below commit 798aafb8e43536a07a809940a05cdd846d94cc93 Author: Jacob Barrett AuthorDate: Wed Feb 3 08:59:36 2021 -0800 GEODE-8910: Corrects hashing between .NET and Java (#740) * Adds Objects util similar to Java's Objects util. * Adds test to validate consistency with Java. --- clicache/integration-test2/PositionKey.cs | 4 +- clicache/src/CMakeLists.txt | 2 + clicache/src/CacheableDate.cpp| 6 +- clicache/src/Objects.cpp | 162 +++ clicache/src/Objects.hpp | 178 + clicache/test2/CMakeLists.txt | 11 +- clicache/test2/ObjectsTests.cs| 316 ++ tests/javaobject/cli/PositionKey.java | 7 +- 8 files changed, 669 insertions(+), 17 deletions(-) diff --git a/clicache/integration-test2/PositionKey.cs b/clicache/integration-test2/PositionKey.cs index 02c6163..3c1c21b 100644 --- a/clicache/integration-test2/PositionKey.cs +++ b/clicache/integration-test2/PositionKey.cs @@ -92,9 +92,7 @@ namespace Apache.Geode.Client.IntegrationTests public override int GetHashCode() { - int hash = 11; - hash = 31 * hash + (int)m_positionId; - return hash; + return Objects.Hash(m_positionId); } } } diff --git a/clicache/src/CMakeLists.txt b/clicache/src/CMakeLists.txt index 8ad3b32..eddf595 100644 --- a/clicache/src/CMakeLists.txt +++ b/clicache/src/CMakeLists.txt @@ -152,6 +152,8 @@ add_library(Apache.Geode SHARED native_conditional_unique_ptr.hpp native_shared_ptr.hpp native_unique_ptr.hpp + Objects.cpp + Objects.hpp PdxIdentityFieldAttribute.hpp Pool.cpp Pool.hpp diff --git a/clicache/src/CacheableDate.cpp b/clicache/src/CacheableDate.cpp index c2f2064..9421489 100644 --- a/clicache/src/CacheableDate.cpp +++ b/clicache/src/CacheableDate.cpp @@ -20,6 +20,7 @@ #include "DataInput.hpp" #include "DataOutput.hpp" #include "Log.hpp" +#include "Objects.hpp" using namespace System; @@ -82,10 +83,7 @@ namespace Apache System::Int32 CacheableDate::GetHashCode() { if (m_hashcode == 0) { - TimeSpan epochSpan = m_dateTime - EpochTime; - System::Int64 millitime = -epochSpan.Ticks / TimeSpan::TicksPerMillisecond; - m_hashcode = (int)millitime ^ (int)((System::Int64)millitime >> 32); + m_hashcode = Objects::GetHashCode(m_dateTime); } return m_hashcode; } diff --git a/clicache/src/Objects.cpp b/clicache/src/Objects.cpp new file mode 100644 index 000..ee587df --- /dev/null +++ b/clicache/src/Objects.cpp @@ -0,0 +1,162 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "Objects.hpp" + +#include "CacheableDate.hpp" +#include "ICacheableKey.hpp" + +using namespace System; +using namespace System::Collections; +using namespace Apache::Geode::Client; + +namespace Apache { +namespace Geode { + +Int32 Objects::Hash(... array^ values) { + return Objects::GetHashCode(values); +} + +Int32 Objects::GetHashCode(Object^ value) { + if (nullptr == value) { +return 0; + } else if (auto s = dynamic_cast(value)) { +return GetHashCode(s); + } else if (auto i = dynamic_cast(value)) { +return GetHashCode(*i); + } else if (auto l = dynamic_cast(value)) { +return GetHashCode(*l); + } else if (auto s = dynamic_cast(value)) { +return GetHashCode(*s); + } else if (auto s = dynamic_cast(value)) { +return GetHashCode(*s); + } else if (auto d = dynamic_cast(value)) { +return GetHashCode(*d); + } else if (auto b = dynamic_cast(value)) { +return GetHashCode(*b); + } else if (auto s = dynamic_cast(value)) { +return GetHashCode(*s); + } else if (auto d = dynamic_cast(value)) { +return GetHashCode(*d); + } else if (auto b = dynamic_cast(value)) { +return Ge