From 30f8275ef49e3089d1231f38dade5f3eb8c3e328 Mon Sep 17 00:00:00 2001 From: Jake Hunsaker Date: Thu, 13 May 2021 10:27:23 -0400 Subject: [cirrus] Enable auto-cancellation of jobs and specify type for GCE Modifies the cirrus configuration to enable auto-cancellation of jobs for the master branch (it is already enabled for PR branches by default). This will prevent batch merges from kicking off a test job for each merge. While it may arise that two or more independent commits that pass testing on their own branches combine to form an unexpected failure, this possibility seems remote for sos. This is a cost saving decision - currently for each commit to master we are spinning up a minimum of 13 VMs, which can very quickly snowball if we do multiple merges in a short amount of time (which is historically how the project does merges). Second, modify the `gce_instance` fields in the cirrus config to use pre-defined machine types, as these match our current "custom" specifications already, and are cheaper to run. Resolves: #2541 Signed-off-by: Jake Hunsaker --- .cirrus.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to '.cirrus.yml') diff --git a/.cirrus.yml b/.cirrus.yml index 34f6b10c..c32b04d1 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -3,6 +3,10 @@ # Main environment vars to set for all tasks env: + # enable auto cancelling concurrent builds on master when multiple PRs are + # merged at once + auto_cancellation: true + FEDORA_VER: "33" FEDORA_PRIOR_VER: "32" FEDORA_NAME: "fedora-${FEDORA_VER}" @@ -73,8 +77,7 @@ report_stageone_task: gce_instance: &standardvm image_project: "${PROJECT}" image_name: "${VM_IMAGE_NAME}" - cpu: 2 - memory: "4Gb" + type: e2-medium # minimum disk size is 20 disk: 20 matrix: @@ -140,7 +143,7 @@ report_foreman_task: depends_on: stageone_report gce_instance: &bigvm <<: *standardvm - memory: "8Gb" + type: e2-standard-2 matrix: - env: PROJECT: ${SOS_PROJECT} -- cgit