Fix sem timeouts and priorities again

projectcalico · Jun 18, 2021 · e968f4b · e968f4b
1 parent 3290fca
commit e968f4b
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 1 deletion.
diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml
@@ -2,7 +2,7 @@ version: v1.0
 name: Felix
 
 execution_time_limit:
-  hours: 2
+  hours: 4
 
 agent:
   machine:
@@ -48,6 +48,8 @@ blocks:
         os_image: ubuntu1804
     jobs:
     - name: Build
+      execution_time_limit:
+        minutes: 20
       commands:
       - checkout
       - cache restore go-pkg-cache
@@ -86,6 +88,8 @@ blocks:
       - sudo modprobe ipip
     jobs:
     - name: FV Test matrix
+      execution_time_limit:
+        minutes: 120
       commands:
       - make check-wireguard
       - make fv FV_BATCHES_TO_RUN="${SEMAPHORE_JOB_INDEX}" FV_NUM_BATCHES=${SEMAPHORE_JOB_COUNT}
@@ -111,10 +115,14 @@ blocks:
       - ./.semaphore/create-test-vm ${VM_NAME}
     jobs:
     - name: UT and Wireguard non-BPF FV on newer kernel
+      execution_time_limit:
+        minutes: 120
       commands:
       - ./.semaphore/on-test-vm make --directory=${REPO_NAME} ut-bpf
       - ./.semaphore/on-test-vm make --directory=${REPO_NAME} check-wireguard
     - name: FV on newer kernel
+      execution_time_limit:
+        minutes: 120
       commands:
       - ./.semaphore/on-test-vm make --directory=${REPO_NAME} fv-bpf GINKGO_FOCUS=BPF-SAFE FV_NUM_BATCHES=${SEMAPHORE_JOB_COUNT} FV_BATCHES_TO_RUN="${SEMAPHORE_JOB_INDEX}"
       parallelism: 8
@@ -142,6 +150,8 @@ blocks:
       - cache restore go-mod-cache
     jobs:
     - name: Static checks
+      execution_time_limit:
+        minutes: 15
       commands:
       - make static-checks
 - name: Multi-arch builds, UT, k8sfv-tests
@@ -154,15 +164,23 @@ blocks:
       - cache restore go-mod-cache
     jobs:
     - name: Build All
+      execution_time_limit:
+        minutes: 60
       commands:
         - make image-all
     - name: UT
+      execution_time_limit:
+        minutes: 60
       commands:
         - make ut
     - name: K8sfv with Typha
+      execution_time_limit:
+        minutes: 60
       commands:
         - make k8sfv-test JUST_A_MINUTE=true USE_TYPHA=true
     - name: K8sfv without Typha
+      execution_time_limit:
+        minutes: 60
       commands:
         - make k8sfv-test JUST_A_MINUTE=true USE_TYPHA=false
 - name: Trigger pin updates
@@ -174,6 +192,8 @@ blocks:
       - name: semaphore-api
     jobs:
       - name: Trigger pin updates
+        execution_time_limit:
+          minutes: 5
         commands:
           - checkout
           - make semaphore-run-auto-pin-update-workflows
diff --git a/.semaphore/update_pins.yml b/.semaphore/update_pins.yml
@@ -1,5 +1,9 @@
 version: v1.0
 name: Trigger Pin Updates
+
+execution_time_limit:
+  hours: 4
+
 agent:
   machine:
     type: e1-standard-2
@@ -30,6 +34,11 @@ blocks:
         - name: marvin-github-token
       jobs:
         - name: 'Auto pin update'
+          execution_time_limit:
+            minutes: 10
+          priority:
+            - value: 40
+              when: true
           commands:
             - CONFIRM=true make git-config
             - CONFIRM=true GITHUB_TOKEN=${MARVIN_GITHUB_TOKEN} make trigger-auto-pin-update-process