Merge pull request #9640 from hjiawei/sem-2204

Build with semaphore Ubuntu 22.04
projectcalico · Dec 27, 2024 · 810091a · 810091a
2 parents 0420350 + 3699e49
commit 810091a
Show file tree

Hide file tree

Showing 29 changed files with 30 additions and 480 deletions.
diff --git a/.semaphore/cleanup.yml b/.semaphore/cleanup.yml
@@ -3,7 +3,7 @@ name: Felix
 agent:
   machine:
     type: f1-standard-2
-    os_image: ubuntu2004
+    os_image: ubuntu2204
 
 execution_time_limit:
   minutes: 10

diff --git a/.semaphore/license-scanning/fossa-scan.yml b/.semaphore/license-scanning/fossa-scan.yml
@@ -4,7 +4,7 @@ name: Run Fossa Scan
 agent:
   machine:
     type: f1-standard-2
-    os_image: ubuntu2004
+    os_image: ubuntu2204
 
 execution_time_limit:
   minutes: 30

diff --git a/.semaphore/push-images/alp.yml b/.semaphore/push-images/alp.yml
@@ -3,7 +3,7 @@ name: Publish ALP images
 agent:
   machine:
     type: f1-standard-2
-    os_image: ubuntu2004
+    os_image: ubuntu2204
 
 execution_time_limit:
   minutes: 60

diff --git a/.semaphore/push-images/apiserver.yml b/.semaphore/push-images/apiserver.yml
@@ -3,7 +3,7 @@ name: Publish apiserver images
 agent:
   machine:
     type: f1-standard-2
-    os_image: ubuntu2004
+    os_image: ubuntu2204
 
 execution_time_limit:
   minutes: 60

diff --git a/.semaphore/push-images/calicoctl.yml b/.semaphore/push-images/calicoctl.yml
@@ -3,7 +3,7 @@ name: Publish calicoctl images
 agent:
   machine:
     type: f1-standard-2
-    os_image: ubuntu2004
+    os_image: ubuntu2204
 
 execution_time_limit:
   minutes: 60

diff --git a/.semaphore/push-images/cni-plugin.yml b/.semaphore/push-images/cni-plugin.yml
@@ -3,7 +3,7 @@ name: Publish cni-plugin images
 agent:
   machine:
     type: f1-standard-2
-    os_image: ubuntu2004
+    os_image: ubuntu2204
 
 execution_time_limit:
   minutes: 60

diff --git a/.semaphore/push-images/key-cert-provisioner.yml b/.semaphore/push-images/key-cert-provisioner.yml
@@ -3,7 +3,7 @@ name: Publish key-cert-provisioner images
 agent:
   machine:
     type: f1-standard-2
-    os_image: ubuntu2004
+    os_image: ubuntu2204
 
 execution_time_limit:
   minutes: 60

diff --git a/.semaphore/push-images/kube-controllers.yml b/.semaphore/push-images/kube-controllers.yml
@@ -3,7 +3,7 @@ name: Publish kube-controllers images
 agent:
   machine:
     type: f1-standard-2
-    os_image: ubuntu2004
+    os_image: ubuntu2204
 
 execution_time_limit:
   minutes: 60

diff --git a/.semaphore/push-images/node.yml b/.semaphore/push-images/node.yml
@@ -3,7 +3,7 @@ name: Publish node images
 agent:
   machine:
     type: f1-standard-2
-    os_image: ubuntu2004
+    os_image: ubuntu2204
 
 execution_time_limit:
   minutes: 60

diff --git a/.semaphore/push-images/pod2daemon.yml b/.semaphore/push-images/pod2daemon.yml
@@ -3,7 +3,7 @@ name: Publish pod2daemon images
 agent:
   machine:
     type: f1-standard-2
-    os_image: ubuntu2004
+    os_image: ubuntu2204
 
 execution_time_limit:
   minutes: 60

diff --git a/.semaphore/push-images/typha.yml b/.semaphore/push-images/typha.yml
@@ -3,7 +3,7 @@ name: Publish typha images
 agent:
   machine:
     type: f1-standard-2
-    os_image: ubuntu2004
+    os_image: ubuntu2204
 
 execution_time_limit:
   minutes: 60

diff --git a/.semaphore/release/cut-branch.yml b/.semaphore/release/cut-branch.yml
@@ -3,7 +3,7 @@ name: Create new release branch
 agent:
   machine:
     type: f1-standard-2
-    os_image: ubuntu2004
+    os_image: ubuntu2204
 execution_time_limit:
   minutes: 30
 

diff --git a/.semaphore/release/hashrelease.yml b/.semaphore/release/hashrelease.yml
@@ -3,7 +3,7 @@ name: Publish hashrelease
 agent:
   machine:
     type: f1-standard-4
-    os_image: ubuntu2004
+    os_image: ubuntu2204
 execution_time_limit:
   hours: 4
 

diff --git a/.semaphore/release/release.yml b/.semaphore/release/release.yml
@@ -3,7 +3,7 @@ name: Publish official release
 agent:
   machine:
     type: f1-standard-4
-    os_image: ubuntu2004
+    os_image: ubuntu2204
 execution_time_limit:
   minutes: 800
 blocks:

diff --git a/.semaphore/semaphore-scheduled-builds.yml b/.semaphore/semaphore-scheduled-builds.yml
diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml
diff --git a/.semaphore/semaphore.yml.d/01-preamble.yml b/.semaphore/semaphore.yml.d/01-preamble.yml
@@ -5,7 +5,7 @@ execution_time_limit:
 agent:
   machine:
     type: f1-standard-2
-    os_image: ubuntu2004
+    os_image: ubuntu2204
 auto_cancel:
   running:
     when: "branch != 'master'"

diff --git a/.semaphore/semaphore.yml.d/blocks/20-apiserver.yml b/.semaphore/semaphore.yml.d/blocks/20-apiserver.yml
@@ -6,10 +6,6 @@
   dependencies:
     - Prerequisites
   task:
-    agent:
-      machine:
-        type: f1-standard-2
-        os_image: ubuntu2004
     prologue:
       commands:
         - cd apiserver

diff --git a/.semaphore/semaphore.yml.d/blocks/20-felix.yml b/.semaphore/semaphore.yml.d/blocks/20-felix.yml
@@ -4,10 +4,6 @@
   dependencies:
     - Prerequisites
   task:
-    agent:
-      machine:
-        type: f1-standard-2
-        os_image: ubuntu2004
     prologue:
       commands:
         - cd felix
@@ -130,6 +126,10 @@
   dependencies:
     - "Felix: Build"
   task:
+    agent:
+      machine:
+        type: f1-standard-4
+        os_image: ubuntu2004
     prologue:
       commands:
         - cd felix

diff --git a/.semaphore/semaphore.yml.d/blocks/20-kube-controllers.yml b/.semaphore/semaphore.yml.d/blocks/20-kube-controllers.yml
@@ -4,10 +4,6 @@
   dependencies:
     - Prerequisites
   task:
-    agent:
-      machine:
-        type: f1-standard-2
-        os_image: ubuntu2004
     prologue:
       commands:
         - cd kube-controllers

diff --git a/.semaphore/semaphore.yml.d/blocks/20-node.yml b/.semaphore/semaphore.yml.d/blocks/20-node.yml
@@ -21,10 +21,6 @@
   dependencies:
     - "Node: Build"
   task:
-    agent:
-      machine:
-        type: f1-standard-2
-        os_image: ubuntu2004
     prologue:
       commands:
         - cd node

diff --git a/.semaphore/semaphore.yml.d/blocks/20-typha.yml b/.semaphore/semaphore.yml.d/blocks/20-typha.yml
@@ -4,10 +4,6 @@
   dependencies:
     - Prerequisites
   task:
-    agent:
-      machine:
-        type: f1-standard-2
-        os_image: ubuntu2004
     prologue:
       commands:
         - cd typha

diff --git a/.semaphore/semaphore.yml.d/blocks/30-key-cert-provisioner.yml b/.semaphore/semaphore.yml.d/blocks/30-key-cert-provisioner.yml
@@ -4,10 +4,6 @@
   dependencies:
     - Prerequisites
   task:
-    agent:
-      machine:
-        type: f1-standard-2
-        os_image: ubuntu2004
     prologue:
       commands:
         - cd key-cert-provisioner