Add ISA support for buildstream (#1681)

palfrey · web-flow · commit 4b42fecd3a25 · 2025-04-18T17:09:26.000+02:00
diff --git a/deployment-examples/docker-compose/scheduler.json5 b/deployment-examples/docker-compose/scheduler.json5
@@ -30,7 +30,8 @@
           "cpu_count": "minimum",
           "OSFamily": "priority",
           "container-image": "priority",
-          "lre-rs": "priority"
+          "lre-rs": "priority",
+          "ISA": "exact",
         }
       }
     }
diff --git a/deployment-examples/docker-compose/worker.json5 b/deployment-examples/docker-compose/worker.json5
@@ -63,7 +63,10 @@
         },
         "lre-rs": {
           "values": [""]
-        }
+        },
+        "ISA": {
+          values: ["x86-64"]
+        },
       }
     }
   }],
diff --git a/kubernetes/components/worker/worker.json5 b/kubernetes/components/worker/worker.json5
@@ -79,7 +79,10 @@
           "values": [
             "${NATIVELINK_WORKER_LRE_RS:-undefined}"
           ]
-        }
+        },
+        "ISA": {
+          values: ["x86-64"]
+        },
       }
     }
   }],
diff --git a/kubernetes/nativelink/nativelink-config.json5 b/kubernetes/nativelink/nativelink-config.json5
@@ -66,7 +66,8 @@
           "kernel_version": "priority",
           "OSFamily": "priority",
           "container-image": "priority",
-          "lre-rs": "priority"
+          "lre-rs": "priority",
+          "ISA": "exact",
         }
       }
     }
diff --git a/nativelink-config/examples/basic_cas.json5 b/nativelink-config/examples/basic_cas.json5
@@ -57,7 +57,8 @@
           "kernel_version": "exact",
           "OSFamily": "priority",
           "container-image": "priority",
-          "lre-rs": "priority"
+          "lre-rs": "priority",
+          "ISA": "exact",
         }
       }
     }
@@ -93,7 +94,10 @@
         },
         "lre-rs": {
           "values": [""]
-        }
+        },
+        "ISA": {
+          values: ["x86-64"]
+        },
       }
     }
   }],
diff --git a/nativelink-config/examples/filesystem_cas.json5 b/nativelink-config/examples/filesystem_cas.json5
@@ -111,7 +111,8 @@
           "cpu_model": "exact",
           "kernel_version": "exact",
           "docker_image": "priority",
-          "lre-rs": "priority"
+          "lre-rs": "priority",
+          "ISA": "exact",
         }
       }
     }
diff --git a/nativelink-config/examples/s3_backend_with_local_fast_cas.json5 b/nativelink-config/examples/s3_backend_with_local_fast_cas.json5
@@ -130,7 +130,8 @@
           "cpu_model": "exact",
           "kernel_version": "exact",
           "docker_image": "priority",
-          "lre-rs": "priority"
+          "lre-rs": "priority",
+          "ISA": "exact",
         }
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,8 @@`
`30`	`30`	`"cpu_count": "minimum",`
`31`	`31`	`"OSFamily": "priority",`
`32`	`32`	`"container-image": "priority",`
`33`		`- "lre-rs": "priority"`
	`33`	`+ "lre-rs": "priority",`
	`34`	`+ "ISA": "exact",`
`34`	`35`	`}`
`35`	`36`	`}`
`36`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,10 @@`
`63`	`63`	`},`
`64`	`64`	`"lre-rs": {`
`65`	`65`	`"values": [""]`
`66`		`- }`
	`66`	`+ },`
	`67`	`+ "ISA": {`
	`68`	`+ values: ["x86-64"]`
	`69`	`+ },`
`67`	`70`	`}`
`68`	`71`	`}`
`69`	`72`	`}],`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,10 @@`
`79`	`79`	`"values": [`
`80`	`80`	`"${NATIVELINK_WORKER_LRE_RS:-undefined}"`
`81`	`81`	`]`
`82`		`- }`
	`82`	`+ },`
	`83`	`+ "ISA": {`
	`84`	`+ values: ["x86-64"]`
	`85`	`+ },`
`83`	`86`	`}`
`84`	`87`	`}`
`85`	`88`	`}],`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,8 @@`
`66`	`66`	`"kernel_version": "priority",`
`67`	`67`	`"OSFamily": "priority",`
`68`	`68`	`"container-image": "priority",`
`69`		`- "lre-rs": "priority"`
	`69`	`+ "lre-rs": "priority",`
	`70`	`+ "ISA": "exact",`
`70`	`71`	`}`
`71`	`72`	`}`
`72`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,8 @@`
`57`	`57`	`"kernel_version": "exact",`
`58`	`58`	`"OSFamily": "priority",`
`59`	`59`	`"container-image": "priority",`
`60`		`- "lre-rs": "priority"`
	`60`	`+ "lre-rs": "priority",`
	`61`	`+ "ISA": "exact",`
`61`	`62`	`}`
`62`	`63`	`}`
`63`	`64`	`}`
`@@ -93,7 +94,10 @@`
`93`	`94`	`},`
`94`	`95`	`"lre-rs": {`
`95`	`96`	`"values": [""]`
`96`		`- }`
	`97`	`+ },`
	`98`	`+ "ISA": {`
	`99`	`+ values: ["x86-64"]`
	`100`	`+ },`
`97`	`101`	`}`
`98`	`102`	`}`
`99`	`103`	`}],`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,8 @@`
`111`	`111`	`"cpu_model": "exact",`
`112`	`112`	`"kernel_version": "exact",`
`113`	`113`	`"docker_image": "priority",`
`114`		`- "lre-rs": "priority"`
	`114`	`+ "lre-rs": "priority",`
	`115`	`+ "ISA": "exact",`
`115`	`116`	`}`
`116`	`117`	`}`
`117`	`118`	`}`
Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,8 @@`
`130`	`130`	`"cpu_model": "exact",`
`131`	`131`	`"kernel_version": "exact",`
`132`	`132`	`"docker_image": "priority",`
`133`		`- "lre-rs": "priority"`
	`133`	`+ "lre-rs": "priority",`
	`134`	`+ "ISA": "exact",`
`134`	`135`	`}`
`135`	`136`	`}`
`136`	`137`	`}`