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 d7cfc50 GEODE-9298: remove concourse deprecation warnings
d7cfc50 is described below
commit d7cfc506a69680f90ab1a91c226a227f029d5ad1
Author: Owen Nichols <[email protected]>
AuthorDate: Thu May 27 17:32:17 2021 -0700
GEODE-9298: remove concourse deprecation warnings
---
ci/pipelines/pull-request/jinja.template.yml | 4 ++--
ci/pipelines/shared/jinja.variables.yml | 1 -
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/ci/pipelines/pull-request/jinja.template.yml
b/ci/pipelines/pull-request/jinja.template.yml
index b515f09..c1598b3 100644
--- a/ci/pipelines/pull-request/jinja.template.yml
+++ b/ci/pipelines/pull-request/jinja.template.yml
@@ -24,7 +24,7 @@ groups:
- {{ build_test.name }}
{%- for test in tests if test.PLATFORM=="linux" %}
{%- for java_test_version in (java_test_versions) if not
java_test_version.name.endswith("jdk8") or test.name == "unit" %}
- - {{test.name}}Test{{java_test_version.name}}
+ - {{test.name}}-test-{{java_test_version.name}}
{%- endfor %}
{%- endfor %}
resources:
@@ -251,7 +251,7 @@ jobs:
{% for test in tests if test.PLATFORM=="linux"%}
{%- for java_test_version in (java_test_versions) if not
java_test_version.name.endswith("jdk8") or test.name == "unit" %}
-- name: {{test.name}}Test{{java_test_version.name}}
+- name: {{test.name}}-test-{{java_test_version.name}}
public: true
plan:
- do:
diff --git a/ci/pipelines/shared/jinja.variables.yml
b/ci/pipelines/shared/jinja.variables.yml
index 5e3a69b..91f5fc0 100644
--- a/ci/pipelines/shared/jinja.variables.yml
+++ b/ci/pipelines/shared/jinja.variables.yml
@@ -29,7 +29,6 @@ benchmarks:
options: '--tests=*GetBenchmark --tests=*PutBenchmark'
max_in_flight: 1
- title: 'with-security-manager'
->>>>>>> f03a577f21... GEODE-9298: remove concourse deprecation warnings
flag: '-PwithSecurityManager'
options: '--tests=Partitioned*'
max_in_flight: 2
