CI: run Linux containers on our own workers

duckinator · Aug 10, 2024 · 1feda12 · 1feda12
1 parent 2767399
commit 1feda12
Showing 1 changed file with 22 additions and 23 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -1,8 +1,11 @@
 Lint_task:
-  container:
-    cpu: 1
-    memory: 512Mi
-    image: python:3.12-slim
+  persistent_worker: &linux
+    isolation:
+      container:
+        image: python:3.12-slim
+        cpu: 1
+        memory: 512Mi
+
   install_script:
     - pip install -U --upgrade-strategy eager pip 'setuptools>61'
     - pip install .
@@ -14,14 +17,16 @@ Lint_task:
 
 Zipapp_bootstrap_task:
   alias: Zipapp bootstraps
-  container:
-    cpu: 1
-    memory: 512Mi
-    matrix:
-      image: python:3.10-slim
-      image: python:3.11-slim
-      image: python:3.12-slim
-      image: python:3.13-rc-slim
+  persistent_worker: &linuxes
+    isolation:
+      container:
+        cpu: 1
+        memory: 512Mi
+        matrix:
+          - image: python:3.10-slim
+          - image: python:3.11-slim
+          - image: python:3.12-slim
+          - image: python:3.13-rc-slim
   setup_script:
     - pip install -U --upgrade-strategy eager pip 'setuptools>61'
     - cp -r . /tmp/bork-pristine
@@ -50,14 +55,7 @@ Zipapp_bootstrap_task:
 
 Linux_task:
   alias: Linux tests
-  container:
-    cpu: 1
-    memory: 512Mi
-    matrix:
-      - image: python:3.10-slim
-      - image: python:3.11-slim
-      - image: python:3.12-slim
-      - image: python:3.13-rc-slim
+  persistent_worker: *linuxes
   install_script:
     - apt-get update
     - apt-get install -y git
@@ -149,7 +147,9 @@ Windows_task:
 
 success_task:
   name: CI success
-  container: {image: "busybox"}
+  persistent_worker:
+    isolation:
+      container: {image: "busybox"}
   depends_on:
     - FreeBSD tests
     - Linux tests
@@ -160,14 +160,13 @@ success_task:
 
 # If bork/version.py is modified on the main branch, make a release.
 Release_task:
+  persistent_worker: *linux
   only_if: "changesInclude('bork/version.py') && $BRANCH == 'main' && $CIRRUS_CRON == ''"
   depends_on: [CI success]
   env:
     BORK_PYPI_USERNAME: "__token__"
     BORK_PYPI_PASSWORD: ENCRYPTED[00007524e18bea7b59efea288653efa57b1dbd235ed8af00cc325febfc9076631a2bf58ed330d8fa7ca057adb81579b0]
     BORK_GITHUB_TOKEN: ENCRYPTED[29eac4d276e1e86020bbc415c04ce91136508e5bdeacd756310c32ebdd3fb7f910c6ed3159f08765915d9e656964e8f5]
-  container:
-    image: python:3.12-slim
   install_script:
     - apt-get update
     - apt-get install -y git