Skip to content

Commit e2ac111

Browse files
authored
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.
1 parent d7ff22c commit e2ac111

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

ci/pipelines/shared/jinja.variables.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ tests:
215215
RAM: '24'
216216
name: windows-core-integration
217217
- ARTIFACT_SLUG: windows-unittestfiles
218-
CPUS: '10'
218+
CPUS: '8'
219219
DISK: '200GB'
220220
DUNIT_PARALLEL_FORKS: '0'
221221
EXECUTE_TEST_TIMEOUT: 1h
@@ -225,7 +225,7 @@ tests:
225225
PARALLEL_DUNIT: 'false'
226226
PARALLEL_GRADLE: 'true'
227227
PLATFORM: windows
228-
RAM: '10'
228+
RAM: '8'
229229
name: windows-unit
230230
- ARTIFACT_SLUG: apicheck
231231
CALL_STACK_TIMEOUT: '20700'

ci/scripts/delete_instance.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ while read BLAH ; do
5151
else
5252
START_TIMESTAMP=${BLAH}
5353
fi
54-
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')
54+
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')
5555

5656
START_SECONDS=$(date -d "${START_TIMESTAMP}" +%s)
5757
END_SECONDS=$(date -d "${END_TIMESTAMP}" +%s)

0 commit comments

Comments
 (0)