You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ig...@apache.org on 2020/04/24 07:30:23 UTC
[geode] branch mass-test-run updated (d5b30e0 -> 51a6897)
This is an automated email from the ASF dual-hosted git repository.
igodwin pushed a change to branch mass-test-run
in repository https://gitbox.apache.org/repos/asf/geode.git.
discard d5b30e0 remove meta-* jobs that we won't use for mass-test-run
discard 8e18317 Mass-test-run branch, no windows or publication jobs
add 509240f GEODE-7989: Improve backup exceptions logging (#4967)
add f9d9479 GEODE-7851: Pulse logout requests end of OAuth session
add 410ffca Change 'End-User' to 'end user' in docs
add d09b26a Merge pull request #4966 from demery-pivotal/geode-7851/logout
add e1c17e1 Revert "GEODE-7565: Allow gateway receivers with same host and port (#4824)" (#4974)
add a3f3594 GEODE-7996 Create DUNIT tests for Redis SADD (#4971)
add ecadaf7 GEODE-7982: Close the client first in rolling upgrade test
add 54bfcae GEODE-7852: test SNI with proxy restart (#4959)
add bc36f29 GEODE-7997: Document needed location of parallel gateway sender disk … (#4976)
add 7dbd970 GEODE-8002: Extract common concurrent execution test code into LoopingThreads class (#4973)
add 33a890e GEODE-7994: Refactor naming for Native Redis Acceptance Tests (#4964)
add 471f49e GEODE-8010: change redis log message from info to debug (#4983)
add d6c8c8c GEODE-7981: have redis default to PARTITION_REDUNDANT (#4981)
add 9b1d652 GEODE-8006 Add .asf.yaml to control notifications
add 1ddd7de GEODE-7957: query results toData will write to correct output stream (#4922)
add 65dd63e GEODE-7935: Awaiting for verification steps. (#4982)
add 6d08055 GEODE-7864: Removing null checks that are not required.(Part 1) (#4880)
add ee60677 GEODE-8013: Logging documentation fixes (#4975)
add 0f512f0 GEODE-7851: Add slf4j implementation to Pulse (#4988)
new a4d211d Mass-test-run branch, no windows or publication jobs
new 51a6897 remove meta-* jobs that we won't use for mass-test-run
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (d5b30e0)
\
N -- N -- N refs/heads/mass-test-run (51a6897)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
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:
.asf.yaml | 14 +
.../sni/ClientSNIDropProxyAcceptanceTest.java | 199 +++++++++++++
.../apache/geode/tools/pulse/PulseLoggingTest.java | 44 +++
...MultiServerPartitionedRegionQueryDUnitTest.java | 190 +++++++++++++
.../geode/internal/cache/GridAdvisorDUnitTest.java | 25 +-
.../LocatorLoadSnapshotIntegrationTest.java | 7 +-
.../codeAnalysis/sanctionedDataSerializables.txt | 8 +-
.../client/internal/CacheServerLoadMessage.java | 4 +-
.../client/internal/ClientMetadataService.java | 9 +-
.../cache/client/internal/LiveServerPinger.java | 2 +-
.../apache/geode/cache/client/internal/PingOp.java | 21 +-
.../geode/cache/client/internal/ServerProxy.java | 10 +
.../internal/CumulativeNonDistinctResults.java | 3 +-
.../cache/query/internal/NWayMergeResults.java | 2 +-
.../internal/AbstractDistributionConfig.java | 4 +-
.../distributed/internal/LocatorLoadSnapshot.java | 177 +++---------
.../internal/ServerLocationAndMemberId.java | 72 -----
.../geode/distributed/internal/ServerLocator.java | 14 +-
.../org/apache/geode/internal/DSFIDFactory.java | 2 -
.../org/apache/geode/internal/SystemAdmin.java | 180 ++++++------
.../geode/internal/cache/AbstractRegion.java | 3 +
.../internal/cache/DistributedPingMessage.java | 79 ------
.../apache/geode/internal/cache/GridAdvisor.java | 10 +-
.../internal/cache/InitialImageOperation.java | 3 +-
.../apache/geode/internal/cache/LocalRegion.java | 6 -
.../geode/internal/cache/PoolManagerImpl.java | 3 -
.../geode/internal/cache/backup/BackupService.java | 1 +
.../internal/cache/tier/sockets/command/Ping.java | 48 +---
.../internal/LocatorLoadSnapshotJUnitTest.java | 72 +++--
.../disk_storage/using_disk_stores.html.md.erb | 9 +-
.../logging/configuring_log4j2.html.md.erb | 3 +-
.../gfsh/command-pages/change.html.md.erb | 4 +-
.../gfsh/command-pages/create.html.md.erb | 2 +-
.../tools_modules/pulse/pulse-auth.html.md.erb | 5 +
geode-docs/tools_modules/redis_adapter.html.md.erb | 2 +-
.../multisite_overview.html.md.erb | 5 +
.../sockets/ClientServerMiscDUnitTestBase.java | 19 --
.../logging/internal/log4j/api/FastLogger.java | 8 +-
...ntAndServersAreRolledOverAllBucketsCreated.java | 2 +-
.../internal/membership/gms/GMSMembershipView.java | 4 +-
.../membership/gms/locator/GMSLocator.java | 9 -
.../membership/gms/membership/GMSJoinLeave.java | 3 +-
geode-pulse/build.gradle | 7 +-
.../tools/pulse/internal/data/Repository.java | 11 +-
.../internal/security/CustomSecurityConfig.java | 16 +-
.../internal/security/DefaultSecurityConfig.java | 17 +-
.../internal/security/GemFireAuthentication.java | 5 +-
.../security/GemFireAuthenticationProvider.java | 12 +-
.../internal/security/GemfireSecurityConfig.java | 15 +-
...hSecurityConfig.java => OAuthClientConfig.java} | 89 +++---
.../internal/security/OAuthSecurityConfig.java | 82 +-----
...utHandler.java => RepositoryLogoutHandler.java} | 36 +--
geode-pulse/src/main/resources/pulse.properties | 4 +
...rTest.java => RepositoryLogoutHandlerTest.java} | 42 +--
...java => ExpireAtNativeRedisAcceptanceTest.java} | 2 +-
...t.java => ExpireNativeRedisAcceptanceTest.java} | 2 +-
...Test.java => GeoNativeRedisAcceptanceTest.java} | 2 +-
...t.java => HashesNativeRedisAcceptanceTest.java} | 2 +-
...st.java => ListsNativeRedisAcceptanceTest.java} | 2 +-
....java => PersistNativeRedisAcceptanceTest.java} | 7 +-
....java => PexpireNativeRedisAcceptanceTest.java} | 6 +-
...t.java => PubSubNativeRedisAcceptanceTest.java} | 2 +-
...t.java => RenameNativeRedisAcceptanceTest.java} | 2 +-
...est.java => SetsNativeRedisAcceptanceTest.java} | 2 +-
...ava => SortedSetNativeRedisAcceptanceTest.java} | 2 +-
....java => StringsNativeRedisAcceptanceTest.java} | 2 +-
.../org/apache/geode/redis/SaddDistDunitTest.java | 305 ++++++++++++++++++++
.../apache/geode/redis/HashesIntegrationTest.java | 315 ++++++---------------
.../geode/redis/RedisServerIntegrationTest.java | 30 +-
.../apache/geode/redis/StringsIntegrationTest.java | 83 ++----
.../redis/general/ConcurrentLoopingThreads.java | 88 ++++++
.../geode/redis/general/ExistsIntegrationTest.java | 72 ++---
.../redis/general/PersistIntegrationTest.java | 1 +
.../org/apache/geode/redis/GeodeRedisServer.java | 2 +-
.../redis/internal/ExecutionHandlerContext.java | 4 +-
.../serialization/DataSerializableFixedID.java | 2 -
76 files changed, 1378 insertions(+), 1180 deletions(-)
create mode 100644 .asf.yaml
create mode 100644 geode-assembly/src/acceptanceTest/java/org/apache/geode/client/sni/ClientSNIDropProxyAcceptanceTest.java
create mode 100644 geode-assembly/src/integrationTest/java/org/apache/geode/tools/pulse/PulseLoggingTest.java
create mode 100644 geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/MultiServerPartitionedRegionQueryDUnitTest.java
delete mode 100644 geode-core/src/main/java/org/apache/geode/distributed/internal/ServerLocationAndMemberId.java
delete mode 100644 geode-core/src/main/java/org/apache/geode/internal/cache/DistributedPingMessage.java
copy geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/security/{OAuthSecurityConfig.java => OAuthClientConfig.java} (69%)
rename geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/security/{LogoutHandler.java => RepositoryLogoutHandler.java} (52%)
rename geode-pulse/src/test/java/org/apache/geode/tools/pulse/internal/security/{LogoutHandlerTest.java => RepositoryLogoutHandlerTest.java} (57%)
rename geode-redis/src/acceptanceTest/java/org/apache/geode/redis/{ExpireAtDockerAcceptanceTest.java => ExpireAtNativeRedisAcceptanceTest.java} (95%)
rename geode-redis/src/acceptanceTest/java/org/apache/geode/redis/{ExpireDockerAcceptanceTest.java => ExpireNativeRedisAcceptanceTest.java} (96%)
rename geode-redis/src/acceptanceTest/java/org/apache/geode/redis/{GeoDockerAcceptanceTest.java => GeoNativeRedisAcceptanceTest.java} (97%)
rename geode-redis/src/acceptanceTest/java/org/apache/geode/redis/{HashesDockerAcceptanceTest.java => HashesNativeRedisAcceptanceTest.java} (96%)
rename geode-redis/src/acceptanceTest/java/org/apache/geode/redis/{ListsDockerAcceptanceTest.java => ListsNativeRedisAcceptanceTest.java} (96%)
rename geode-redis/src/acceptanceTest/java/org/apache/geode/redis/{PersistDockerAcceptanceTest.java => PersistNativeRedisAcceptanceTest.java} (90%)
rename geode-redis/src/acceptanceTest/java/org/apache/geode/redis/{PexpireDockerAcceptanceTest.java => PexpireNativeRedisAcceptanceTest.java} (89%)
rename geode-redis/src/acceptanceTest/java/org/apache/geode/redis/{PubSubDockerAcceptanceTest.java => PubSubNativeRedisAcceptanceTest.java} (96%)
rename geode-redis/src/acceptanceTest/java/org/apache/geode/redis/{RenameDockerAcceptanceTest.java => RenameNativeRedisAcceptanceTest.java} (96%)
rename geode-redis/src/acceptanceTest/java/org/apache/geode/redis/{SetsDockerAcceptanceTest.java => SetsNativeRedisAcceptanceTest.java} (96%)
rename geode-redis/src/acceptanceTest/java/org/apache/geode/redis/{SortedSetsDockerAcceptanceTest.java => SortedSetNativeRedisAcceptanceTest.java} (95%)
rename geode-redis/src/acceptanceTest/java/org/apache/geode/redis/{StringsDockerAcceptanceTest.java => StringsNativeRedisAcceptanceTest.java} (96%)
create mode 100644 geode-redis/src/distributedTest/java/org/apache/geode/redis/SaddDistDunitTest.java
create mode 100644 geode-redis/src/integrationTest/java/org/apache/geode/redis/general/ConcurrentLoopingThreads.java
[geode] 02/02: remove meta-* jobs that we won't use for
mass-test-run
Posted by ig...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
igodwin pushed a commit to branch mass-test-run
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 51a68979a81b89ab1eafcd80fb5505a83444b549
Author: Mark Hanson <mh...@pivotal.io>
AuthorDate: Mon Jan 27 15:27:19 2020 -0800
remove meta-* jobs that we won't use for mass-test-run
---
ci/pipelines/meta/jinja.template.yml | 206 +----------------------------------
1 file changed, 1 insertion(+), 205 deletions(-)
diff --git a/ci/pipelines/meta/jinja.template.yml b/ci/pipelines/meta/jinja.template.yml
index 792254f..a67e377 100644
--- a/ci/pipelines/meta/jinja.template.yml
+++ b/ci/pipelines/meta/jinja.template.yml
@@ -51,13 +51,7 @@ resources:
branch: ((!geode-build-branch))
paths:
- ci/pipelines/images/*
-- name: geode-reaper-pipeline
- type: git
- source:
- {{ github_access() | indent(4) }}
- branch: ((!geode-build-branch))
- paths:
- - ci/pipelines/reaper/*
+
- name: meta-mini-dockerfile
type: git
source:
@@ -71,35 +65,6 @@ resources:
username: ((!docker-username))
password: ((!docker-password))
repository: gcr.io/((!gcp-project))/((!sanitized-geode-fork))-((!sanitized-geode-build-branch))-meta-img
-{% if repository.fork == repository.upstream_fork %}
-- name: geode-examples-pipeline
- type: git
- source:
- {{ github_access() | indent(4) }}
- branch: ((!geode-build-branch))
- paths:
- - ci/pipelines/examples/*
- - ci/pipelines/shared/*
- - ci/pipelines/render.py
- - ci/pipelines/meta/meta.properties
-- name: geode-pr-pipeline
- type: git
- source:
- {{ github_access() | indent(4) }}
- branch: ((!geode-build-branch))
- paths:
- - ci/pipelines/pull-request/*
- - ci/pipelines/shared/*
- - 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
@@ -187,175 +152,6 @@ jobs:
- results/pipeline-vars.yml
-{% if repository.fork == repository.upstream_fork %}
-- name: set-examples-pipeline
- serial: true
- public: ((!public-pipelines))
- plan:
- - get: geode-examples-pipeline
- trigger: true
- - get: meta-mini-image
- trigger: true
- passed: [build-meta-mini-docker-image]
- - task: deploy-build
- image: meta-mini-image
- config:
- platform: linux
- inputs:
- - name: geode-examples-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))
- SEMVER_PRERELEASE_TOKEN: ((semver-prerelease-token))
- run:
- path: geode-examples-pipeline/ci/pipelines/examples/deploy_pipeline.sh
- - put: concourse
- params:
- pipelines:
- - name: ((!pipeline-prefix))examples
- team: ((!concourse-team))
- config_file: results/generated-pipeline.yml
- vars_files:
- - results/pipeline-vars.yml
-
-- name: set-pr-pipeline
- serial: true
- public: ((!public-pipelines))
- plan:
- - get: geode-pr-pipeline
- trigger: true
- - get: meta-mini-image
- trigger: true
- passed: [build-meta-mini-docker-image]
- - task: deploy-pr
- image: meta-mini-image
- config:
- platform: linux
- inputs:
- - name: geode-pr-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))
- GCP_PROJECT: ((gcp-project))
- PUBLIC_PIPELINES: ((public-pipelines))
- GRADLE_GLOBAL_ARGS: ((gradle-global-args))
- run:
- path: geode-pr-pipeline/ci/pipelines/pull-request/deploy_pr_pipeline.sh
- - put: concourse
- params:
- pipelines:
- - name: ((!pipeline-prefix))pr
- team: ((!concourse-team))
- config_file: results/generated-pipeline.yml
- vars_files:
- - results/pipeline-vars.yml
-
-{% 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
- - put: concourse
- params:
- pipelines:
- - name: ((!pipeline-prefix))metrics
- team: ((!concourse-team))
- config_file: results/generated-pipeline.yml
- vars_files:
- - results/pipeline-vars.yml
-
-- name: set-reaper-pipeline
- serial: true
- public: ((!public-pipelines))
- plan:
- - get: geode-reaper-pipeline
- trigger: true
- - get: meta-mini-image
- trigger: true
- passed: [build-meta-mini-docker-image]
- - task: create-image-yml
- image: meta-mini-image
- config:
- platform: linux
- inputs:
- - name: geode-reaper-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 }}
- 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))
- run:
- path: geode-reaper-pipeline/ci/pipelines/reaper/deploy_reaper_pipeline.sh
- - put: concourse
- params:
- pipelines:
- - name: ((!pipeline-prefix))reaper
- team: ((!concourse-team))
- config_file: results/generated-pipeline.yml
- vars_files:
- - results/pipeline-vars.yml
-
- name: build-meta-mini-docker-image
public: ((!public-pipelines))
serial: true
[geode] 01/02: Mass-test-run branch, no windows or publication jobs
Posted by ig...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
igodwin pushed a commit to branch mass-test-run
in repository https://gitbox.apache.org/repos/asf/geode.git
commit a4d211d01280ea007029424b357d12af6d886f4f
Author: Robert Houghton <rh...@pivotal.io>
AuthorDate: Mon Jan 27 15:20:46 2020 -0800
Mass-test-run branch, no windows or publication jobs
Co-authored-by: Robert Houghton <rh...@pivotal.io>
Co-authored-by: Mark Hanson <mh...@pivotal.io>
---
ci/pipelines/geode-build/jinja.template.yml | 305 +---------------------------
ci/pipelines/shared/jinja.variables.yml | 77 +------
2 files changed, 13 insertions(+), 369 deletions(-)
diff --git a/ci/pipelines/geode-build/jinja.template.yml b/ci/pipelines/geode-build/jinja.template.yml
index b797759..e4b65b0 100644
--- a/ci/pipelines/geode-build/jinja.template.yml
+++ b/ci/pipelines/geode-build/jinja.template.yml
@@ -92,66 +92,6 @@ GRADLE_GLOBAL_ARGS: ((gradle-global-args))
{%- endfor -%}
{% endmacro %}
-groups:
-- name: main
- jobs:
- - {{ build_test.name }}
- {{- all_gating_jobs() | indent(2) }}
- - UpdatePassingTokens
- {%- if repository.upstream_fork != "apache" or repository.branch == "develop" %}
- - PublishArtifacts
- {%- endif %}
- {%- for flavor in (benchmarks.flavors) %}
- - Benchmark{{flavor.title}}
- {%- endfor %}
-- name: complete
- jobs:
- - {{ build_test.name }}
- {%- for test in (tests) if not test.name=="StressNew" -%}
- {%- for java_test_version in (java_test_versions) %}
- - {{test.name}}Test{{java_test_version.name}}
- {%- endfor -%}
- {%- endfor %}
- - UpdatePassingTokens
- {%- if repository.upstream_fork != "apache" or repository.branch == "develop" %}
- - PublishArtifacts
- {%- endif %}
- {%- for flavor in (benchmarks.flavors) %}
- - Benchmark{{flavor.title}}
- {%- endfor %}
-- name: linux
- jobs:
- - {{ build_test.name }}
- {%- for test in (tests) if test.PLATFORM=="linux" and not test.name=="StressNew" -%}
- {% for java_test_version in (java_test_versions) %}
- - {{test.name}}Test{{java_test_version.name}}
- {%- endfor -%}
- {%- endfor %}
- {%- for flavor in (benchmarks.flavors) %}
- - Benchmark{{flavor.title}}
- {%- endfor %}
-- name: windows
- jobs:
- - {{ build_test.name }}
- {%- for test in (tests) if test.PLATFORM=="windows" -%}
- {% for java_test_version in (java_test_versions) %}
- - {{test.name}}Test{{java_test_version.name}}
- {%- endfor -%}
- {%- endfor %}
-{%- for java_test_version in (java_test_versions) %}
-- name: {{java_test_version.name}}
- jobs:
- - {{ build_test.name }}
- {%- for test in (tests) if not test.name=="StressNew" %}
- - {{test.name}}Test{{java_test_version.name}}
- {%- endfor -%}
-{%- endfor %}
-- name: Semver Management
- jobs:
- {%- for semverPiece in ['major', 'minor', 'patch'] %}
- - Bump{{ semverPiece.title() }}
- {%- endfor %}
-
resources:
- name: concourse-metadata-resource
type: concourse-metadata-resource
@@ -173,12 +113,7 @@ resources:
paths:
- ci/*
{{ github_access() | indent(4) }}
-- name: geode-benchmarks
- type: git
- source:
- branch: {{benchmarks.benchmark_branch}}
- depth: 1
- uri: https://github.com/apache/geode-benchmarks.git
+
- name: geode-build-version
type: semver
source:
@@ -186,13 +121,8 @@ resources:
driver: gcs
initial_version: {{ metadata.initial_version }}
json_key: ((!concourse-gcp-key))
- key: semvers/((pipeline-prefix))((geode-build-branch))/number
-- name: geode-passing-tokens
- type: gcs-resource
- source:
- bucket: ((artifact-bucket))
- json_key: ((concourse-gcp-key))
- versioned_file: semvers/((pipeline-prefix))((geode-build-branch))/passing-build-tokens.json
+ key: semvers/((pipeline-prefix))((geode-build-branch))/version
+
- name: alpine-tools-image
type: docker-image
source:
@@ -201,12 +131,6 @@ resources:
repository: gcr.io/((gcp-project))/((pipeline-prefix))alpine-tools
tag: latest
-- name: windows-builder-image-family
- type: gci
- source:
- key: ((concourse-gcp-key))
- family_project: ((gcp-project))
- family: ((pipeline-prefix))windows-geode-builder
- name: linux-builder-image-family
type: gci
@@ -233,6 +157,7 @@ resource_types:
source:
repository: frodenas/gcs-resource
jobs:
+<<<<<<< HEAD
{% for semverPiece in ['major', 'minor', 'patch'] -%}
- name: Bump{{ semverPiece.title() }}
serial: true
@@ -245,6 +170,10 @@ jobs:
params:
file: geode-build-version/number
{% endfor %}
+=======
+
+
+>>>>>>> Mass-test-run branch, no windows or publication jobs
- name: {{build_test.name}}
public: true
max_in_flight: {{build_test.MAX_IN_FLIGHT}}
@@ -390,224 +319,6 @@ jobs:
- name: instance-data
timeout: 1h
-- name: UpdatePassingTokens
- public: true
- serial: true
- plan:
- - aggregate:
- - get: alpine-tools-image
- - get: geode
- passed: &update-token-passed-anchor
-{%- if repository.upstream_fork != "apache" or repository.branch == "develop" %}
- - PublishArtifacts
-{% else %}
- {% for flavor in (benchmarks.flavors) %}
- - Benchmark{{flavor.title}}
- {% endfor %}
-{% endif %}
- trigger: true
- - get: geode-build-version
- trigger: true
- passed: *update-token-passed-anchor
- - task: couple-sha-and-build-id
- image: alpine-tools-image
- config:
- platform: linux
- inputs:
- - name: geode
- - name: geode-build-version
- outputs:
- - name: geode-passing-tokens
- run:
- path: bash
- args:
- - -cx
- - |
- pushd geode
- GEODE_SHA=$(git rev-parse HEAD)
- popd
- GEODE_SEMVER=$(cat geode-build-version/number)
-
- GS_PATH=gs://((artifact-bucket))/semvers/((pipeline-prefix))((geode-build-branch))/passing-build-tokens.json
- CURRENT_PASSING_SHA=$(gsutil cat ${GS_PATH} | jq -r .ref)
- set -e
- # Check that the incoming GEODE_SHA is a descendent of the currently stored value.
- # Keeps us from winding back the repository in the case of an out-of-order pipeline pass
- if [ -z "${CURRENT_PASSING_SHA}" ] || (cd geode; git merge-base --is-ancestor ${CURRENT_PASSING_SHA} ${GEODE_SHA}); then
- cat > geode-passing-tokens/passing-build-tokens.json <<JSON
- {
- "ref": "${GEODE_SHA}",
- "semver": "${GEODE_SEMVER}"
- }
- JSON
- fi
- - aggregate:
- - put: geode-passing-tokens
- params:
- file: geode-passing-tokens/passing-build-tokens.json
-
-{% for run_var in (benchmarks.flavors) %}
-- name: Benchmark{{ run_var.title }}
- public: true
- max_in_flight: 3
- plan:
- - get: geode-ci
- passed:
- {{ all_gating_jobs() | indent(4) }}
- - get: alpine-tools-image
- - aggregate:
- - get: geode
- passed:
- {{ all_gating_jobs() | indent(6) }}
- trigger: true
- - get: geode-benchmarks
- - get: geode-build-version
- trigger: true
- passed:
- {{ all_gating_jobs() | indent(6) }}
- - put: concourse-metadata-resource
- - do:
- - task: run_benchmarks{{ run_var.title }}
- image: alpine-tools-image
- config:
- platform: linux
- params:
- AWS_ACCESS_KEY_ID: ((benchmarks-access-key-id))
- AWS_SECRET_ACCESS_KEY: ((benchmarks-secret-access-key))
- AWS_DEFAULT_REGION: us-west-2
- AWS_REGION: us-west-2
- ARTIFACT_BUCKET: ((artifact-bucket))
- BENCHMARKS_BRANCH: {{benchmarks.benchmark_branch}}
- BASELINE_BRANCH: {{benchmarks.baseline_branch}}
- BASELINE_VERSION: {{benchmarks.baseline_version}}
- FLAGS: {{ run_var.flag }}
- TAG_POSTFIX: {{ run_var.title }}
- TEST_OPTIONS: {{ run_var.options }}
- run:
- path: geode-ci/ci/scripts/run_benchmarks.sh
- inputs:
- - name: geode
- - name: geode-ci
- - name: geode-benchmarks
- - name: concourse-metadata-resource
- outputs:
- - name: results
- timeout: 8h
- ensure:
- do:
- - task: cleanup_benchmarks
- image: alpine-tools-image
- config:
- platform: linux
- params:
- AWS_ACCESS_KEY_ID: ((benchmarks-access-key-id))
- AWS_SECRET_ACCESS_KEY: ((benchmarks-secret-access-key))
- AWS_DEFAULT_REGION: us-west-2
- AWS_REGION: us-west-2
- ARTIFACT_BUCKET: ((artifact-bucket))
- BASELINE_BRANCH: {{benchmarks.baseline_branch}}
- BASELINE_VERSION: {{benchmarks.baseline_version}}
- FLAGS: {{ run_var.flag }}
- TAG_POSTFIX: {{ run_var.title }}
- TEST_OPTIONS: {{ run_var.options }}
- run:
- path: geode-ci/ci/scripts/cleanup_benchmarks.sh
- inputs:
- - name: geode
- - name: geode-ci
- - name: geode-benchmarks
- - name: concourse-metadata-resource
- - name: results
-{% endfor %}
-{% if repository.upstream_fork != "apache" or repository.branch == "develop" %}
-- name: PublishArtifacts
- public: true
- plan:
- - aggregate:
- - get: geode-ci
- passed: &publish-passed-inputs
- {% for flavor in (benchmarks.flavors) %}
- - Benchmark{{flavor.title}}
- {% endfor %}
- - get: alpine-tools-image
- - get: geode
- passed: *publish-passed-inputs
- trigger: true
- - get: linux-builder-image-family
- - aggregate:
- - get: geode-build-version
- trigger: true
- passed: *publish-passed-inputs
- - put: concourse-metadata-resource
- {{ init_retry()|indent(4) }}
- - task: create_instance
- image: alpine-tools-image
- config:
- platform: linux
- params:
- {{ common_instance_params(publish_artifacts) | indent(8) }}
- GEODE_BRANCH: {{repository.branch}}
- GEODE_FORK: {{repository.fork}}
- JAVA_BUILD_VERSION: {{ java_build_version.version }}
- IMAGE_FAMILY_NAME: ((pipeline-prefix))linux-geode-builder
- run:
- path: geode-ci/ci/scripts/create_instance.sh
- inputs:
- - name: concourse-metadata-resource
- - name: geode-ci
- - name: geode
- - name: attempts-log
- path: old
- outputs:
- - name: instance-data
- - name: attempts-log
- path: new
- timeout: 20m
- attempts: 5
- - task: rsync_code_up
- image: alpine-tools-image
- config:
- platform: linux
- run:
- path: geode-ci/ci/scripts/rsync_code_up.sh
- inputs:
- - name: geode-ci
- - name: geode
- - name: instance-data
- timeout: 5m
- - task: publish
- image: alpine-tools-image
- config:
- platform: linux
- params:
- MAINTENANCE_VERSION: ((geode-build-branch))
- ARTIFACT_BUCKET: ((artifact-bucket))
- SERVICE_ACCOUNT: ((!concourse-gcp-account))
- JAVA_BUILD_VERSION: {{ java_build_version.version }}
- MAVEN_SNAPSHOT_BUCKET: ((maven-snapshot-bucket))
- GRADLE_GLOBAL_ARGS: ((gradle-global-args))
- run:
- path: geode-ci/ci/scripts/execute_publish.sh
- inputs:
- - name: instance-data
- - name: geode
- - name: geode-ci
- - name: geode-build-version
- ensure:
- do:
- - task: delete_instance
- image: alpine-tools-image
- config:
- platform: linux
- run:
- path: geode-ci/ci/scripts/delete_instance.sh
- inputs:
- - name: geode-ci
- - name: instance-data
- timeout: 1h
-
-{% endif %}
-
{%- for test in tests if not test.name=="StressNew" %}
{%- set parameters = {} %}
{%- do deep_merge(parameters, test) %}
diff --git a/ci/pipelines/shared/jinja.variables.yml b/ci/pipelines/shared/jinja.variables.yml
index c666fc7..74c183d 100644
--- a/ci/pipelines/shared/jinja.variables.yml
+++ b/ci/pipelines/shared/jinja.variables.yml
@@ -84,7 +84,7 @@ tests:
DUNIT_PARALLEL_FORKS: '0'
EXECUTE_TEST_TIMEOUT: 30m
GRADLE_TASK: test
- MAX_IN_FLIGHT: 1
+ MAX_IN_FLIGHT: 5
PARALLEL_DUNIT: 'false'
PARALLEL_GRADLE: 'true'
PLATFORM: linux
@@ -96,7 +96,7 @@ tests:
DUNIT_PARALLEL_FORKS: '0'
EXECUTE_TEST_TIMEOUT: 1h30m
GRADLE_TASK: acceptanceTest
- MAX_IN_FLIGHT: 2
+ MAX_IN_FLIGHT: 5
PARALLEL_DUNIT: 'false'
PARALLEL_GRADLE: 'false'
PLATFORM: linux
@@ -108,7 +108,7 @@ tests:
DUNIT_PARALLEL_FORKS: '24'
EXECUTE_TEST_TIMEOUT: 3h00m
GRADLE_TASK: distributedTest
- MAX_IN_FLIGHT: 3
+ MAX_IN_FLIGHT: 5
PARALLEL_DUNIT: 'true'
PLATFORM: linux
RAM: '250'
@@ -119,7 +119,7 @@ tests:
DUNIT_PARALLEL_FORKS: '48'
EXECUTE_TEST_TIMEOUT: 40m
GRADLE_TASK: integrationTest
- MAX_IN_FLIGHT: 1
+ MAX_IN_FLIGHT: 5
PARALLEL_DUNIT: 'true'
PLATFORM: linux
RAM: '90'
@@ -130,75 +130,8 @@ tests:
DUNIT_PARALLEL_FORKS: '48'
EXECUTE_TEST_TIMEOUT: 1h
GRADLE_TASK: upgradeTest
- MAX_IN_FLIGHT: 2
+ MAX_IN_FLIGHT: 5
PARALLEL_DUNIT: 'true'
PLATFORM: linux
RAM: '210'
name: Upgrade
-- ARTIFACT_SLUG: stressnewtestfiles
- CALL_STACK_TIMEOUT: '20700'
- CPUS: '96'
- DUNIT_PARALLEL_FORKS: '24'
- EXECUTE_TEST_TIMEOUT: 6h
- GRADLE_TASK: repeatTest
- PARALLEL_DUNIT: 'true'
- PARALLEL_GRADLE: 'false'
- PLATFORM: linux
- RAM: '280'
- name: StressNew
-- ARTIFACT_SLUG: windows-acceptancetestfiles
- CPUS: '16'
- DUNIT_PARALLEL_FORKS: '0'
- EXECUTE_TEST_TIMEOUT: 6h
- GRADLE_TASK: :geode-assembly:acceptanceTest
- MAX_IN_FLIGHT: 3
- PARALLEL_DUNIT: 'false'
- PARALLEL_GRADLE: 'false'
- PLATFORM: windows
- RAM: '64'
- name: WindowsAcceptance
-- ARTIFACT_SLUG: windows-gfshdistributedtest
- CPUS: '16'
- DUNIT_PARALLEL_FORKS: '0'
- EXECUTE_TEST_TIMEOUT: 6h
- GRADLE_TASK: distributedTest
- GRADLE_TASK_OPTIONS: -PtestCategory=org.apache.geode.test.junit.categories.GfshTest
- MAX_IN_FLIGHT: 5
- PARALLEL_DUNIT: 'false'
- PARALLEL_GRADLE: 'false'
- PLATFORM: windows
- RAM: '64'
- name: WindowsGfshDistributed
-- ARTIFACT_SLUG: windows-integrationtestfiles
- CPUS: '16'
- DUNIT_PARALLEL_FORKS: '0'
- EXECUTE_TEST_TIMEOUT: 6h
- GRADLE_TASK: integrationTest
- GRADLE_TASK_OPTIONS: -x geode-core:integrationTest
- MAX_IN_FLIGHT: 2
- PARALLEL_DUNIT: 'false'
- PARALLEL_GRADLE: 'false'
- PLATFORM: windows
- RAM: '64'
- name: WindowsIntegration
-- ARTIFACT_SLUG: windows-coreintegrationtestfiles
- CPUS: '16'
- DUNIT_PARALLEL_FORKS: '0'
- EXECUTE_TEST_TIMEOUT: 6h
- GRADLE_TASK: geode-core:integrationTest
- MAX_IN_FLIGHT: 6
- PARALLEL_DUNIT: 'false'
- PARALLEL_GRADLE: 'false'
- PLATFORM: windows
- RAM: '64'
- name: WindowsCoreIntegration
-- ARTIFACT_SLUG: windows-unittestfiles
- CPUS: '16'
- DUNIT_PARALLEL_FORKS: '0'
- EXECUTE_TEST_TIMEOUT: 6h
- GRADLE_TASK: test
- MAX_IN_FLIGHT: 1
- PARALLEL_DUNIT: 'false'
- PLATFORM: windows
- RAM: '64'
- name: WindowsUnit