feat(server): match optenv32 ABHOST packages to amd64 builders

Author: MingcongBai

server/src/api.rs

@@ -356,6 +356,10 @@ pub async fn pipeline_status(pool: DbPool) -> anyhow::Result<Vec<PipelineStatus>
     *pending.entry("amd64".to_string()).or_default() += pending_noarch;
     let running_noarch = *running.get("noarch").unwrap_or(&0);
     *running.entry("amd64".to_string()).or_default() += running_noarch;
+    let pending_noarch = *pending.get("optenv32").unwrap_or(&0);
+    *pending.entry("amd64".to_string()).or_default() += pending_noarch;
+    let running_noarch = *running.get("optenv32").unwrap_or(&0);
+    *running.entry("amd64".to_string()).or_default() += running_noarch;
 
     let mut res = vec![];
     for a in ALL_ARCH {

server/src/routes/mod.rs

@@ -188,7 +188,7 @@ pub async fn dashboard_status(
                 ))
                 .load::<(String, i64)>(conn)?
             {
-                let arch = if arch == "noarch" {
+                let arch = if arch == "noarch" || arch == "optenv32" {
                     "amd64".to_string()
                 } else {
                     arch
@@ -205,7 +205,7 @@ pub async fn dashboard_status(
                 ))
                 .load::<(String, i64)>(conn)?
             {
-                let arch = if arch == "noarch" {
+                let arch = if arch == "noarch" || arch == "optenv32" {
                     "amd64".to_string()
                 } else {
                     arch
@@ -222,7 +222,7 @@ pub async fn dashboard_status(
                 ))
                 .load::<(String, i64)>(conn)?
             {
-                let arch = if arch == "noarch" {
+                let arch = if arch == "noarch" || arch == "optenv32" {
                     "amd64".to_string()
                 } else {
                     arch

server/src/routes/worker.rs

@@ -223,7 +223,11 @@ pub async fn worker_poll(
             .into_boxed();
         if payload.arch == "amd64" {
             // route noarch to amd64
-            sql = sql.filter(arch.eq(&payload.arch).or(arch.eq("noarch")));
+            sql = sql.filter(
+                arch.eq(&payload.arch)
+                    .or(arch.eq("noarch"))
+                    .or(arch.eq("optenv32")),
+            );
         } else {
             sql = sql.filter(arch.eq(&payload.arch));
         }