This is an automated email from the ASF dual-hosted git repository.
onichols pushed a commit to branch support/1.14
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/support/1.14 by this push:
new 6d9ae76 Parameterize heavy lifter instace storage. (#6309)
6d9ae76 is described below
commit 6d9ae765fb69be0d71d5c448e6cbe7103a70f02f
Author: Sean Goller <[email protected]>
AuthorDate: Mon Apr 12 16:16:10 2021 -0700
Parameterize heavy lifter instace storage. (#6309)
(cherry picked from commit aac03623e76fd8a246b2690f757f916050179396)
---
ci/pipelines/examples/jinja.template.yml | 1 +
ci/pipelines/geode-build/jinja.template.yml | 1 +
ci/pipelines/mass-test-run/jinja.template.yml | 1 +
ci/pipelines/pull-request/jinja.template.yml | 2 ++
ci/pipelines/shared/jinja.variables.yml | 16 ++++++++++++++++
ci/scripts/create_instance.sh | 2 +-
6 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/ci/pipelines/examples/jinja.template.yml
b/ci/pipelines/examples/jinja.template.yml
index 6c04aff..4f3f55b 100644
--- a/ci/pipelines/examples/jinja.template.yml
+++ b/ci/pipelines/examples/jinja.template.yml
@@ -22,6 +22,7 @@
GCP_PROJECT: ((gcp-project))
CPUS: {{ test.CPUS }}
RAM: {{ test.RAM }}
+DISK: {{ test.DISK }}
{%- endmacro %}
{% macro common_test_params(test) -%}
diff --git a/ci/pipelines/geode-build/jinja.template.yml
b/ci/pipelines/geode-build/jinja.template.yml
index 6e835ec..23cf086 100644
--- a/ci/pipelines/geode-build/jinja.template.yml
+++ b/ci/pipelines/geode-build/jinja.template.yml
@@ -62,6 +62,7 @@
GCP_PROJECT: ((gcp-project))
CPUS: {{ test.CPUS }}
RAM: {{ test.RAM }}
+DISK: {{ test.DISK }}
{%- endmacro %}
{% macro common_test_params(test) -%}
diff --git a/ci/pipelines/mass-test-run/jinja.template.yml
b/ci/pipelines/mass-test-run/jinja.template.yml
index dda490b..44bbb71 100644
--- a/ci/pipelines/mass-test-run/jinja.template.yml
+++ b/ci/pipelines/mass-test-run/jinja.template.yml
@@ -60,6 +60,7 @@
GCP_PROJECT: ((gcp-project))
CPUS: {{ test.CPUS }}
RAM: {{ test.RAM }}
+DISK: {{ test.DISK }}
{%- endmacro %}
{% macro common_test_params(test) -%}
diff --git a/ci/pipelines/pull-request/jinja.template.yml
b/ci/pipelines/pull-request/jinja.template.yml
index a154495..188be95 100644
--- a/ci/pipelines/pull-request/jinja.template.yml
+++ b/ci/pipelines/pull-request/jinja.template.yml
@@ -145,6 +145,7 @@ jobs:
params:
CPUS: {{build_test.CPUS}}
RAM: {{build_test.RAM}}
+ DISK: {{build_test.DISK}}
GCP_PROJECT: ((gcp-project))
GEODE_BRANCH: {{repository.branch}}
GEODE_FORK: {{repository.fork}}
@@ -313,6 +314,7 @@ jobs:
platform: linux
params:
CPUS: {{test.CPUS}}
+ DISK: {{test.DISK}}
GEODE_BRANCH: {{repository.branch}}
GEODE_FORK: {{repository.fork}}
GCP_PROJECT: ((gcp-project))
diff --git a/ci/pipelines/shared/jinja.variables.yml
b/ci/pipelines/shared/jinja.variables.yml
index 48b7b97..7373f52 100644
--- a/ci/pipelines/shared/jinja.variables.yml
+++ b/ci/pipelines/shared/jinja.variables.yml
@@ -40,6 +40,7 @@ build_test:
ARTIFACT_SLUG: build
CALL_STACK_TIMEOUT: '600'
CPUS: '8'
+ DISK: '200GB'
DUNIT_PARALLEL_FORKS: '4'
EXECUTE_TEST_TIMEOUT: 20m
GRADLE_TASK: build
@@ -54,6 +55,7 @@ examples_test:
ARTIFACT_SLUG: examples
CALL_STACK_TIMEOUT: '1800'
CPUS: '8'
+ DISK: '200GB'
DUNIT_PARALLEL_FORKS: '4'
EXECUTE_TEST_TIMEOUT: 30m
GRADLE_TASK: runAll
@@ -77,6 +79,7 @@ metadata:
publish_artifacts:
CPUS: '8'
+ DISK: '200GB'
EXECUTE_TEST_TIMEOUT: 10m
RAM: '16'
name: publish-artifacts
@@ -88,6 +91,7 @@ tests:
- ARTIFACT_SLUG: unittestfiles
CALL_STACK_TIMEOUT: '1200'
CPUS: '8'
+ DISK: '200GB'
DUNIT_PARALLEL_FORKS: '0'
EXECUTE_TEST_TIMEOUT: 30m
GRADLE_TASK: test
@@ -101,6 +105,7 @@ tests:
- ARTIFACT_SLUG: acceptancetestfiles
CALL_STACK_TIMEOUT: '6300'
CPUS: '8'
+ DISK: '200GB'
DUNIT_PARALLEL_FORKS: '0'
EXECUTE_TEST_TIMEOUT: 2h
GRADLE_TASK: acceptanceTest
@@ -113,6 +118,7 @@ tests:
- ARTIFACT_SLUG: distributedtestfiles
CALL_STACK_TIMEOUT: '9900'
CPUS: '96'
+ DISK: '200GB'
DUNIT_PARALLEL_FORKS: '24'
EXECUTE_TEST_TIMEOUT: 3h00m
GRADLE_TASK: distributedTest
@@ -124,6 +130,7 @@ tests:
- ARTIFACT_SLUG: integrationtestfiles
CALL_STACK_TIMEOUT: '1500'
CPUS: '96'
+ DISK: '200GB'
DUNIT_PARALLEL_FORKS: '48'
EXECUTE_TEST_TIMEOUT: 40m
GRADLE_TASK: integrationTest
@@ -135,6 +142,7 @@ tests:
- ARTIFACT_SLUG: upgradetestfiles
CALL_STACK_TIMEOUT: '4800'
CPUS: '96'
+ DISK: '200GB'
DUNIT_PARALLEL_FORKS: '48'
EXECUTE_TEST_TIMEOUT: 90m
GRADLE_TASK: upgradeTest
@@ -146,6 +154,7 @@ tests:
- ARTIFACT_SLUG: redistests
CALL_STACK_TIMEOUT: '1200'
CPUS: '4'
+ DISK: '200GB'
DUNIT_PARALLEL_FORKS: '0'
EXECUTE_TEST_TIMEOUT: 30m
GRADLE_TASK: ':geode-apis-compatible-with-redis:redisAPITest'
@@ -159,6 +168,7 @@ tests:
- ARTIFACT_SLUG: stressnewtestfiles
CALL_STACK_TIMEOUT: '20700'
CPUS: '96'
+ DISK: '200GB'
DUNIT_PARALLEL_FORKS: '24'
EXECUTE_TEST_TIMEOUT: 10h
GRADLE_TASK: repeatTest
@@ -169,6 +179,7 @@ tests:
name: stress-new
- ARTIFACT_SLUG: windows-acceptancetestfiles
CPUS: '16'
+ DISK: '200GB'
DUNIT_PARALLEL_FORKS: '0'
EXECUTE_TEST_TIMEOUT: 6h
GRADLE_TASK: :geode-assembly:acceptanceTest
@@ -180,6 +191,7 @@ tests:
name: windows-acceptance
- ARTIFACT_SLUG: windows-gfshdistributedtest
CPUS: '16'
+ DISK: '200GB'
DUNIT_PARALLEL_FORKS: '0'
EXECUTE_TEST_TIMEOUT: 6h
GRADLE_TASK: distributedTest
@@ -192,6 +204,7 @@ tests:
name: windows-gfsh-distributed
- ARTIFACT_SLUG: windows-integrationtestfiles
CPUS: '16'
+ DISK: '200GB'
DUNIT_PARALLEL_FORKS: '0'
EXECUTE_TEST_TIMEOUT: 6h
GRADLE_TASK: integrationTest
@@ -204,6 +217,7 @@ tests:
name: windows-integration
- ARTIFACT_SLUG: windows-coreintegrationtestfiles
CPUS: '16'
+ DISK: '200GB'
DUNIT_PARALLEL_FORKS: '0'
EXECUTE_TEST_TIMEOUT: 6h
GRADLE_TASK: geode-core:integrationTest
@@ -215,6 +229,7 @@ tests:
name: windows-core-integration
- ARTIFACT_SLUG: windows-unittestfiles
CPUS: '16'
+ DISK: '200GB'
DUNIT_PARALLEL_FORKS: '0'
EXECUTE_TEST_TIMEOUT: 6h
GRADLE_TASK: test
@@ -226,6 +241,7 @@ tests:
- ARTIFACT_SLUG: apicheck
CALL_STACK_TIMEOUT: '20700'
CPUS: '4'
+ DISK: '200GB'
DUNIT_PARALLEL_FORKS: '0'
EXECUTE_TEST_TIMEOUT: 1h
GRADLE_TASK: geode-assembly:japicmp
diff --git a/ci/scripts/create_instance.sh b/ci/scripts/create_instance.sh
index 68156a6..7332a7a 100755
--- a/ci/scripts/create_instance.sh
+++ b/ci/scripts/create_instance.sh
@@ -133,7 +133,7 @@ INSTANCE_INFORMATION=$(gcloud compute
--project=${GCP_PROJECT} instances create
--network="${GCP_NETWORK}" \
--subnet="${GCP_SUBNETWORK}" \
--image="${IMAGE_NAME}" \
- --boot-disk-size=100GB \
+ --boot-disk-size="${DISK}" \
--boot-disk-type=pd-ssd \
--labels="${LABELS}" \
--tags="heavy-lifter" \
