infra/config: remove goma property

goma property is not necessary anymore as libyuv builders use reclient
now.

Bug: b/239908030
Change-Id: I8bcf25e4c047569c2272b0f9fdfb5eb936698955
Reviewed-on: https://chromium-review.googlesource.com/c/libyuv/libyuv/+/4787829
Commit-Queue: Mirko Bonadei <mbonadei@chromium.org>
Reviewed-by: Mirko Bonadei <mbonadei@chromium.org>

3 files changed, 4 insertions, 296 deletions

diff --git a/infra/config/cr-buildbucket.cfg b/infra/config/cr-buildbucket.cfg
index be9d1d28..7415851b 100644
--- a/infra/config/cr-buildbucket.cfg
+++ b/infra/config/cr-buildbucket.cfg
@@ -29,11 +29,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$build/reclient": {'
         '    "instance": "rbe-webrtc-trusted",'
         '    "metrics_project": "chromium-reclient-metrics"'
@@ -64,11 +59,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$build/reclient": {'
         '    "instance": "rbe-webrtc-trusted",'
         '    "metrics_project": "chromium-reclient-metrics"'
@@ -99,11 +89,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$build/reclient": {'
         '    "instance": "rbe-webrtc-trusted",'
         '    "metrics_project": "chromium-reclient-metrics"'
@@ -132,10 +117,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$build/reclient": {'
         '    "instance": "rbe-webrtc-trusted",'
         '    "metrics_project": "chromium-reclient-metrics"'
@@ -164,10 +145,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$build/reclient": {'
         '    "instance": "rbe-webrtc-trusted",'
         '    "metrics_project": "chromium-reclient-metrics"'
@@ -196,10 +173,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$build/reclient": {'
         '    "instance": "rbe-webrtc-trusted",'
         '    "metrics_project": "chromium-reclient-metrics"'
@@ -230,11 +203,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$build/reclient": {'
         '    "instance": "rbe-webrtc-trusted",'
         '    "metrics_project": "chromium-reclient-metrics"'
@@ -265,11 +233,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$build/reclient": {'
         '    "instance": "rbe-webrtc-trusted",'
         '    "metrics_project": "chromium-reclient-metrics"'
@@ -300,11 +263,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$build/reclient": {'
         '    "instance": "rbe-webrtc-trusted",'
         '    "metrics_project": "chromium-reclient-metrics"'
@@ -335,11 +293,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$build/reclient": {'
         '    "instance": "rbe-webrtc-trusted",'
         '    "metrics_project": "chromium-reclient-metrics"'
@@ -370,11 +323,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$build/reclient": {'
         '    "instance": "rbe-webrtc-trusted",'
         '    "metrics_project": "chromium-reclient-metrics"'
@@ -405,11 +353,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$build/reclient": {'
         '    "instance": "rbe-webrtc-trusted",'
         '    "metrics_project": "chromium-reclient-metrics"'
@@ -440,11 +383,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$build/reclient": {'
         '    "instance": "rbe-webrtc-trusted",'
         '    "metrics_project": "chromium-reclient-metrics"'
@@ -475,11 +413,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$build/reclient": {'
         '    "instance": "rbe-webrtc-trusted",'
         '    "metrics_project": "chromium-reclient-metrics"'
@@ -510,11 +443,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$build/reclient": {'
         '    "instance": "rbe-webrtc-trusted",'
         '    "metrics_project": "chromium-reclient-metrics"'
@@ -545,11 +473,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$build/reclient": {'
         '    "instance": "rbe-webrtc-trusted",'
         '    "metrics_project": "chromium-reclient-metrics"'
@@ -580,11 +503,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$build/reclient": {'
         '    "instance": "rbe-webrtc-trusted",'
         '    "metrics_project": "chromium-reclient-metrics"'
@@ -614,10 +532,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$build/reclient": {'
         '    "instance": "rbe-webrtc-trusted",'
         '    "metrics_project": "chromium-reclient-metrics"'
@@ -647,10 +561,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$build/reclient": {'
         '    "instance": "rbe-webrtc-trusted",'
         '    "metrics_project": "chromium-reclient-metrics"'
@@ -680,10 +590,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$build/reclient": {'
         '    "instance": "rbe-webrtc-trusted",'
         '    "metrics_project": "chromium-reclient-metrics"'
@@ -714,11 +620,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$build/reclient": {'
         '    "instance": "rbe-webrtc-trusted",'
         '    "metrics_project": "chromium-reclient-metrics"'
@@ -749,11 +650,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$build/reclient": {'
         '    "instance": "rbe-webrtc-trusted",'
         '    "metrics_project": "chromium-reclient-metrics"'
@@ -784,11 +680,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$build/reclient": {'
         '    "instance": "rbe-webrtc-trusted",'
         '    "metrics_project": "chromium-reclient-metrics"'
@@ -819,11 +710,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$build/reclient": {'
         '    "instance": "rbe-webrtc-trusted",'
         '    "metrics_project": "chromium-reclient-metrics"'
@@ -854,11 +740,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$build/reclient": {'
         '    "instance": "rbe-webrtc-trusted",'
         '    "metrics_project": "chromium-reclient-metrics"'
@@ -889,11 +770,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$build/reclient": {'
         '    "instance": "rbe-webrtc-trusted",'
         '    "metrics_project": "chromium-reclient-metrics"'
@@ -924,11 +800,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$build/reclient": {'
         '    "instance": "rbe-webrtc-trusted",'
         '    "metrics_project": "chromium-reclient-metrics"'
@@ -959,11 +830,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$build/reclient": {'
         '    "instance": "rbe-webrtc-trusted",'
         '    "metrics_project": "chromium-reclient-metrics"'
@@ -993,10 +859,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$build/reclient": {'
         '    "instance": "rbe-webrtc-trusted",'
         '    "metrics_project": "chromium-reclient-metrics"'
@@ -1026,10 +888,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$build/reclient": {'
         '    "instance": "rbe-webrtc-trusted",'
         '    "metrics_project": "chromium-reclient-metrics"'
@@ -1114,10 +972,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$build/reclient": {'
         '    "instance": "rbe-webrtc-untrusted",'
         '    "metrics_project": "chromium-reclient-metrics"'
@@ -1146,10 +1000,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$build/reclient": {'
         '    "instance": "rbe-webrtc-untrusted",'
         '    "metrics_project": "chromium-reclient-metrics"'
@@ -1178,10 +1028,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$build/reclient": {'
         '    "instance": "rbe-webrtc-untrusted",'
         '    "metrics_project": "chromium-reclient-metrics"'
@@ -1212,11 +1058,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$build/reclient": {'
         '    "instance": "rbe-webrtc-untrusted",'
         '    "metrics_project": "chromium-reclient-metrics"'
@@ -1247,11 +1088,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$build/reclient": {'
         '    "instance": "rbe-webrtc-untrusted",'
         '    "metrics_project": "chromium-reclient-metrics"'
@@ -1281,10 +1117,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$build/reclient": {'
         '    "instance": "rbe-webrtc-untrusted",'
         '    "metrics_project": "chromium-reclient-metrics"'
@@ -1314,10 +1146,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$build/reclient": {'
         '    "instance": "rbe-webrtc-untrusted",'
         '    "metrics_project": "chromium-reclient-metrics"'
@@ -1348,11 +1176,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$build/reclient": {'
         '    "instance": "rbe-webrtc-untrusted",'
         '    "metrics_project": "chromium-reclient-metrics"'
@@ -1383,11 +1206,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$build/reclient": {'
         '    "instance": "rbe-webrtc-untrusted",'
         '    "metrics_project": "chromium-reclient-metrics"'
@@ -1418,11 +1236,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$build/reclient": {'
         '    "instance": "rbe-webrtc-untrusted",'
         '    "metrics_project": "chromium-reclient-metrics"'
@@ -1453,11 +1266,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$build/reclient": {'
         '    "instance": "rbe-webrtc-untrusted",'
         '    "metrics_project": "chromium-reclient-metrics"'
@@ -1488,11 +1296,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$build/reclient": {'
         '    "instance": "rbe-webrtc-untrusted",'
         '    "metrics_project": "chromium-reclient-metrics"'
@@ -1523,11 +1326,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$build/reclient": {'
         '    "instance": "rbe-webrtc-untrusted",'
         '    "metrics_project": "chromium-reclient-metrics"'
@@ -1558,11 +1356,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$build/reclient": {'
         '    "instance": "rbe-webrtc-untrusted",'
         '    "metrics_project": "chromium-reclient-metrics"'
@@ -1593,11 +1386,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$build/reclient": {'
         '    "instance": "rbe-webrtc-untrusted",'
         '    "metrics_project": "chromium-reclient-metrics"'
@@ -1627,10 +1415,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$build/reclient": {'
         '    "instance": "rbe-webrtc-untrusted",'
         '    "metrics_project": "chromium-reclient-metrics"'
@@ -1660,10 +1444,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$build/reclient": {'
         '    "instance": "rbe-webrtc-untrusted",'
         '    "metrics_project": "chromium-reclient-metrics"'
@@ -1693,10 +1473,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$build/reclient": {'
         '    "instance": "rbe-webrtc-untrusted",'
         '    "metrics_project": "chromium-reclient-metrics"'
@@ -1727,11 +1503,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$build/reclient": {'
         '    "instance": "rbe-webrtc-untrusted",'
         '    "metrics_project": "chromium-reclient-metrics"'
@@ -1764,11 +1535,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$build/reclient": {'
         '    "instance": "rbe-webrtc-untrusted",'
         '    "metrics_project": "chromium-reclient-metrics"'
@@ -1799,11 +1565,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$build/reclient": {'
         '    "instance": "rbe-webrtc-untrusted",'
         '    "metrics_project": "chromium-reclient-metrics"'
@@ -1834,11 +1595,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$build/reclient": {'
         '    "instance": "rbe-webrtc-untrusted",'
         '    "metrics_project": "chromium-reclient-metrics"'
@@ -1869,11 +1625,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$build/reclient": {'
         '    "instance": "rbe-webrtc-untrusted",'
         '    "metrics_project": "chromium-reclient-metrics"'
@@ -1904,11 +1655,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$build/reclient": {'
         '    "instance": "rbe-webrtc-untrusted",'
         '    "metrics_project": "chromium-reclient-metrics"'
@@ -1939,11 +1685,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$build/reclient": {'
         '    "instance": "rbe-webrtc-untrusted",'
         '    "metrics_project": "chromium-reclient-metrics"'
diff --git a/infra/config/main.star b/infra/config/main.star
index 7490a599..e83afe4f 100755
--- a/infra/config/main.star
+++ b/infra/config/main.star
@@ -8,24 +8,6 @@ lucicfg.check_version("1.30.9")
 LIBYUV_GIT = "https://chromium.googlesource.com/libyuv/libyuv"
 LIBYUV_GERRIT = "https://chromium-review.googlesource.com/libyuv/libyuv"
 
-GOMA_BACKEND_RBE_PROD = {
-    "server_host": "goma.chromium.org",
-    "use_luci_auth": True,
-}
-
-GOMA_BACKEND_RBE_ATS_PROD = {
-    "server_host": "goma.chromium.org",
-    "use_luci_auth": True,
-    "enable_ats": True,
-}
-
-# Disable ATS on Windows CQ/try.
-GOMA_BACKEND_RBE_NO_ATS_PROD = {
-    "server_host": "goma.chromium.org",
-    "use_luci_auth": True,
-    "enable_ats": False,
-}
-
 RECLIENT_CI = {
     "instance": "rbe-webrtc-trusted",
     "metrics_project": "chromium-reclient-metrics",
@@ -80,7 +62,7 @@ luci.project(
     ],
     bindings = [
         luci.binding(
-            roles = "role/swarming.taskTriggerer", # for LED tasks.
+            roles = "role/swarming.taskTriggerer",  # for LED tasks.
             groups = "project-libyuv-admins",
         ),
         luci.binding(
@@ -218,19 +200,6 @@ def get_os_dimensions(os):
         return {"os": "Ubuntu-18.04", "cores": "8", "cpu": "x86-64"}
     return {}
 
-def get_os_properties(os, try_builder = False):
-    if os == "android":
-        return {"$build/goma": GOMA_BACKEND_RBE_PROD}
-    elif os in ("ios", "mac"):
-        return {"$build/goma": GOMA_BACKEND_RBE_PROD}
-    elif os == "win" and try_builder:
-        return {"$build/goma": GOMA_BACKEND_RBE_NO_ATS_PROD}
-    elif os == "win":
-        return {"$build/goma": GOMA_BACKEND_RBE_ATS_PROD}
-    elif os == "linux":
-        return {"$build/goma": GOMA_BACKEND_RBE_ATS_PROD}
-    return {}
-
 def libyuv_ci_builder(name, dimensions, properties, triggered_by):
     return luci.builder(
         name = name,
@@ -268,8 +237,7 @@ def libyuv_try_builder(name, dimensions, properties, recipe_name = "libyuv/libyu
 
 def ci_builder(name, os, category, short_name = None):
     dimensions = get_os_dimensions(os)
-    properties = get_os_properties(os)
-    properties["$build/reclient"] = RECLIENT_CI
+    properties = {"$build/reclient": RECLIENT_CI}
 
     dimensions["pool"] = "luci.flex.ci"
     properties["builder_group"] = "client.libyuv"
@@ -280,8 +248,7 @@ def ci_builder(name, os, category, short_name = None):
 
 def try_builder(name, os, experiment_percentage = None):
     dimensions = get_os_dimensions(os)
-    properties = get_os_properties(os, try_builder = True)
-    properties["$build/reclient"] = RECLIENT_CQ
+    properties = {"$build/reclient": RECLIENT_CQ}
 
     dimensions["pool"] = "luci.flex.try"
     properties["builder_group"] = "tryserver.libyuv"
diff --git a/infra/config/project.cfg b/infra/config/project.cfg
index af79cfb2..3c327118 100644
--- a/infra/config/project.cfg
+++ b/infra/config/project.cfg
@@ -7,7 +7,7 @@
 name: "libyuv"
 access: "group:all"
 lucicfg {
-  version: "1.39.8"
+  version: "1.39.14"
   package_dir: "."
   config_dir: "."
   entry_point: "main.star"