[geode] branch develop updated: GEODE-10369 part 2 Fix hardcoded gcp project reference and adjust windows unit test cpu/ram usage. (#7798)

[smgoller]

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 e2ac1113f8 GEODE-10369 part 2 Fix hardcoded gcp project reference and 
adjust windows unit test cpu/ram usage. (#7798)
e2ac1113f8 is described below

commit e2ac1113f8f6819095785be556bef8e080ab6988
Author: Sean Goller <s...@goller.net>
AuthorDate: Mon Jun 13 11:56:38 2022 -0700

    GEODE-10369 part 2 Fix hardcoded gcp project reference and adjust windows 
unit test cpu/ram usage. (#7798)
    
    * Fix hardcoded reference to gcp project.
    
    * Fix windows unit test ram and cpu settings.
---
 ci/pipelines/shared/jinja.variables.yml | 4 ++--
 ci/scripts/delete_instance.sh           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ci/pipelines/shared/jinja.variables.yml 
b/ci/pipelines/shared/jinja.variables.yml
index 398ed93c06..40fc16b9c6 100644
--- a/ci/pipelines/shared/jinja.variables.yml
+++ b/ci/pipelines/shared/jinja.variables.yml
@@ -215,7 +215,7 @@ tests:
   RAM: '24'
   name: windows-core-integration
 - ARTIFACT_SLUG: windows-unittestfiles
-  CPUS: '10'
+  CPUS: '8'
   DISK: '200GB'
   DUNIT_PARALLEL_FORKS: '0'
   EXECUTE_TEST_TIMEOUT: 1h
@@ -225,7 +225,7 @@ tests:
   PARALLEL_DUNIT: 'false'
   PARALLEL_GRADLE: 'true'
   PLATFORM: windows
-  RAM: '10'
+  RAM: '8'
   name: windows-unit
 - ARTIFACT_SLUG: apicheck
   CALL_STACK_TIMEOUT: '20700'
diff --git a/ci/scripts/delete_instance.sh b/ci/scripts/delete_instance.sh
index 56ccf4a043..2e9bebc766 100755
--- a/ci/scripts/delete_instance.sh
+++ b/ci/scripts/delete_instance.sh
@@ -51,7 +51,7 @@ while read BLAH ; do
     else
         START_TIMESTAMP=${BLAH}
     fi
-done < <(gcloud logging read "resource.type=gce_instance AND 
resource.labels.instance_id=${INSTANCE_ID} AND 
logName=projects/apachegeode-ci/logs/cloudaudit.googleapis.com%2Factivity" 
--format=json | jq -r '.[].timestamp')
+done < <(gcloud logging read "resource.type=gce_instance AND 
resource.labels.instance_id=${INSTANCE_ID} AND 
logName=projects/${GCP_PROJECT}/logs/cloudaudit.googleapis.com%2Factivity" 
--format=json | jq -r '.[].timestamp')
 
 START_SECONDS=$(date -d "${START_TIMESTAMP}" +%s)
 END_SECONDS=$(date -d "${END_TIMESTAMP}" +%s)