From 8380a75e8f5dfa344e70da8858a0a0387bfd581c Mon Sep 17 00:00:00 2001 From: phlax Date: Mon, 21 Oct 2024 18:14:20 +0100 Subject: [PATCH 01/41] ci/rbe: Switch backend RBE cluster (#36730) Signed-off-by: Ryan Northey --- .bazelrc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.bazelrc b/.bazelrc index 31f2d502a7..5f042f2d25 100644 --- a/.bazelrc +++ b/.bazelrc @@ -526,14 +526,14 @@ build:common-envoy-engflow --google_default_credentials=false build:common-envoy-engflow --credential_helper=*.engflow.com=%workspace%/bazel/engflow-bazel-credential-helper.sh build:common-envoy-engflow --grpc_keepalive_time=30s -build:cache-envoy-engflow --remote_cache=grpcs://morganite.cluster.engflow.com +build:cache-envoy-engflow --remote_cache=grpcs://mordenite.cluster.engflow.com build:cache-envoy-engflow --remote_timeout=3600s -build:bes-envoy-engflow --bes_backend=grpcs://morganite.cluster.engflow.com/ -build:bes-envoy-engflow --bes_results_url=https://morganite.cluster.engflow.com/invocation/ +build:bes-envoy-engflow --bes_backend=grpcs://mordenite.cluster.engflow.com/ +build:bes-envoy-engflow --bes_results_url=https://mordenite.cluster.engflow.com/invocation/ build:bes-envoy-engflow --bes_timeout=3600s build:bes-envoy-engflow --bes_upload_mode=fully_async build:bes-envoy-engflow --nolegacy_important_outputs -build:rbe-envoy-engflow --remote_executor=grpcs://morganite.cluster.engflow.com +build:rbe-envoy-engflow --remote_executor=grpcs://mordenite.cluster.engflow.com build:rbe-envoy-engflow --remote_default_exec_properties=container-image=docker://gcr.io/envoy-ci/envoy-build@sha256:7adc40c09508f957624c4d2e0f5aeecb73a59207ee6ded53b107eac828c091b2 build:rbe-envoy-engflow --jobs=200 build:rbe-envoy-engflow --define=engflow_rbe=true From c3e548fcc407407fde74a5cabe8bbb86af59423a Mon Sep 17 00:00:00 2001 From: phlax Date: Tue, 22 Oct 2024 16:00:33 +0100 Subject: [PATCH 02/41] test/ocsp: Renew certificates (#36755) Signed-off-by: Ryan Northey --- test/common/tls/ocsp/test_data/README.md | 2 + test/common/tls/ocsp/test_data/ca_cert.pem | 42 ++--- test/common/tls/ocsp/test_data/ca_key.pem | 50 +++--- test/common/tls/ocsp/test_data/ecdsa_cert.pem | 18 +- test/common/tls/ocsp/test_data/ecdsa_key.pem | 6 +- .../tls/ocsp/test_data/ecdsa_ocsp_req.der | Bin 106 -> 106 bytes .../tls/ocsp/test_data/ecdsa_ocsp_resp.der | Bin 1559 -> 1548 bytes test/common/tls/ocsp/test_data/good_cert.pem | 26 +-- test/common/tls/ocsp/test_data/good_key.pem | 50 +++--- .../tls/ocsp/test_data/good_ocsp_req.der | Bin 106 -> 106 bytes .../tls/ocsp/test_data/good_ocsp_resp.der | Bin 1579 -> 1568 bytes .../ocsp/test_data/good_ocsp_resp_details.txt | 168 +++++++++--------- .../ocsp/test_data/intermediate_ca_cert.pem | 46 ++--- .../ocsp/test_data/intermediate_ca_key.pem | 50 +++--- .../ocsp/test_data/multiple_cert_ocsp_req.der | Bin 171 -> 171 bytes .../test_data/multiple_cert_ocsp_resp.der | Bin 1660 -> 1649 bytes .../test_data/responder_key_hash_ocsp_req.der | Bin 106 -> 106 bytes .../responder_key_hash_ocsp_resp.der | Bin 1466 -> 1455 bytes .../tls/ocsp/test_data/revoked_cert.pem | 28 +-- .../common/tls/ocsp/test_data/revoked_key.pem | 50 +++--- .../tls/ocsp/test_data/revoked_ocsp_req.der | Bin 106 -> 106 bytes .../tls/ocsp/test_data/revoked_ocsp_resp.der | Bin 1577 -> 1566 bytes .../tls/ocsp/test_data/unknown_ocsp_req.der | Bin 106 -> 106 bytes .../tls/ocsp/test_data/unknown_ocsp_resp.der | Bin 1686 -> 1675 bytes 24 files changed, 269 insertions(+), 267 deletions(-) diff --git a/test/common/tls/ocsp/test_data/README.md b/test/common/tls/ocsp/test_data/README.md index ad1c6777eb..87a450f480 100644 --- a/test/common/tls/ocsp/test_data/README.md +++ b/test/common/tls/ocsp/test_data/README.md @@ -28,3 +28,5 @@ There are 8 identities: will cause all files to be regenerated. So if you want to regenerate a particular file, please copy the corresponding commands from certs.sh and execute them in command line. + +NOTE: This requires openssl 1.1 diff --git a/test/common/tls/ocsp/test_data/ca_cert.pem b/test/common/tls/ocsp/test_data/ca_cert.pem index c5c98f7d17..64cabbaf80 100644 --- a/test/common/tls/ocsp/test_data/ca_cert.pem +++ b/test/common/tls/ocsp/test_data/ca_cert.pem @@ -1,23 +1,23 @@ -----BEGIN CERTIFICATE----- -MIID0zCCArugAwIBAgIUGIR6NlZ17lyrZ5N9uK2g0QLW5TIwDQYJKoZIhvcNAQEL -BQAwcTELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM -DVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5n -aW5lZXJpbmcxCzAJBgNVBAMMAmNhMB4XDTIyMTAyMzAyMjQyOVoXDTI0MTAyMjAy -MjQyOVowcTELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNV -BAcMDVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQg -RW5naW5lZXJpbmcxCzAJBgNVBAMMAmNhMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A -MIIBCgKCAQEAvXEqixfAmuBA47KSQuSJ4aQ1+o1VvwGMIPmy3oeYbj1Wvfs36YOq -ON9tFtOzjM5u8gCkv/FQUnALMswi2F+l44f7i7KFb7iUxR5qCw2kVWCgyyqWRH/p -MZue9HBFWYNpXNaryf26vOYmeKzlSgJuKA8RRuF4sAtPQ/OQmm5B/WntWZUWZUNG -CAO46wcKKEU0SiJD4HNjfu7yId2nZikXfXo5jjvqiXoeG/zVSOkn/B0IDEiTYX/A -bUqIlDUdIDWg1xU27Rfzkc8Fy6x4f7of6ZT0YzYbaLEAShTNDRc0aaIBGzcjW1rR -zBgOANy24wreP6Nh2HN3tvKWuHi/oDFaawIDAQABo2MwYTAdBgNVHQ4EFgQUnMwf -jZCg7pLeJOgYYEk/vsPVVokwHwYDVR0jBBgwFoAUnMwfjZCg7pLeJOgYYEk/vsPV -VokwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAYYwDQYJKoZIhvcNAQEL -BQADggEBAAT0vnyixkk53PYiYRT3GmNK5oHocdTDLHhCWeHIHTw+bLo0TTJR7NtF -1VWY0ar+xS3Gsx5aLxSVsMKqLLD1jMGHmQxiHqh90La+HzjlOOnxCzcGrTiWMr5N -L7mrzEIHnKoC5/130zlBhgFhA/kMNQOejJRPOChpCDlz25Oc6RK+hP/BLFz1+VFd -3XEDgTdsp3LNA8hf/nSuv1dsdzuH9oq1hXKjHEUhWnQEmWXh8wNB9qYu/dGAjikU -WGotBR4ROciz6Vwl5MMb+67ls3/J0hSeZ8XlXVP8DWnY4maUCd286QPEkjuvTgQW -Zkup1o6TL+5NQSoujamT6D/C9rynHGc= +MIIDyDCCArCgAwIBAgIJANYQM2akDsuvMA0GCSqGSIb3DQEBCwUAMHExCzAJBgNV +BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNp +c2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2luZWVyaW5nMQsw +CQYDVQQDDAJjYTAeFw0yNDEwMjIxNDUwMzBaFw0yNjEwMjIxNDUwMzBaMHExCzAJ +BgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJh +bmNpc2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2luZWVyaW5n +MQswCQYDVQQDDAJjYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALeC +iroYk1XQ6zI8/qVWqX+0XEUxuIP/vmUffA81xT1xDJf9QFLmM8ObXjIWn/vQo3Mr +gpQU1NuFwM9YJWtYGBIa2QVBW7udH26cGb8AC/KUrxE+ZU1eg9bQf/aoeh0WFl9a +XwgzwoxePP+QH/p2Ed+HsmUGm0N/aimy7Jjo2UBcZ/LwaCerUaFgtQitqUeljZDa +abQ9i1sjIDFn2S1C1gobchXq8aDTeQqUIBpeBYi41GTXW0IcnWs3iJEDoEc6nwQO +e3SEQB0aN8gqhlffOYP9aNO3SibnzsGn/d0Jlxnl6s65BlWTrPOYySvHx2QjkUib +37Rp/xYtIGO64a/RRgkCAwEAAaNjMGEwHQYDVR0OBBYEFEi3D6ji+Yvie4Ly3jif +Miz8+BzLMB8GA1UdIwQYMBaAFEi3D6ji+Yvie4Ly3jifMiz8+BzLMA8GA1UdEwEB +/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEBCwUAA4IBAQCppp9i +Q7ClrtBFDNrH1n5kRFAPZhpNSmZUg5Qv91fVpQstpH0BOLTsTAQIOJzHZJh7xCau +syqXhemBFIgObbiZGFtKmwAWUkEWFpRMqCmlng6W6OIvUVMHxiyFEk2xTB6DrNHG +xEuLLaZu0Pu4Cd9CWOzcxFabeZVISU03OVrbhGgXsAG9n7/7GOkFaCks/76MWSDM +a/A6jO+YSV+hEz/7eWBsZzwMtJPi6Ynh03+GrJEgTZPglP+ArY3bbUePQBtHkl43 +fOuPPVFzksYy3KuLgQytZaWEXoukyDa/TomjgdQEavmg+1SZ/8qbo0dF9lqwDuUy +N0y3c/Nk7Lc0t9yP -----END CERTIFICATE----- diff --git a/test/common/tls/ocsp/test_data/ca_key.pem b/test/common/tls/ocsp/test_data/ca_key.pem index 7ed25605fe..a95e74219a 100644 --- a/test/common/tls/ocsp/test_data/ca_key.pem +++ b/test/common/tls/ocsp/test_data/ca_key.pem @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/test/common/tls/ocsp/test_data/ecdsa_cert.pem b/test/common/tls/ocsp/test_data/ecdsa_cert.pem index 738a5a2627..1406033eb5 100644 --- a/test/common/tls/ocsp/test_data/ecdsa_cert.pem +++ b/test/common/tls/ocsp/test_data/ecdsa_cert.pem @@ -2,15 +2,15 @@ MIICdzCCAV8CAhACMA0GCSqGSIb3DQEBCwUAMHExCzAJBgNVBAYTAlVTMRMwEQYD VQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNpc2NvMQ0wCwYDVQQK DARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2luZWVyaW5nMQswCQYDVQQDDAJjYTAe -Fw0yMjEwMjMwMjI0MzBaFw0yNDEwMjIwMjI0MzBaMFwxCzAJBgNVBAYTAlVTMRMw +Fw0yNDEwMjIxNDUwMzBaFw0yNjEwMjIxNDUwMzBaMFwxCzAJBgNVBAYTAlVTMRMw EQYDVQQIDApDYWxpZm9ybmlhMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0 IEVuZ2luZWVyaW5nMQ4wDAYDVQQDDAVlY2RzYTBZMBMGByqGSM49AgEGCCqGSM49 -AwEHA0IABF9j5Nj82s+FE1VDPNJICcZOvWjaoV8TM6tQ4iCduJe42vIGprWVxcgn -Twc7mzCiuZRbmXyugxTGfc9BJpY2qG0wDQYJKoZIhvcNAQELBQADggEBAGf5RI7m -KahYnZSihIPkSv+jrkrSJExIwOjYkYQnFkH2QiplEU2n/2T2wyM8JsmslbJ96eL6 -rP5yspFywQFehgBvm02OI4HykpMCLcizTKrdKANTeKJb+8BoQFX5wlVpJ/Uc2pIs -th2kWfNiTPhqO+CxheyT1V0QRTALz+e4WD7gBla9hxiVGzu5LY0TaoKWvgGUoQWy -MDXmpyY4fgqV7levQ4i47DeR6Q0DKd50AwMMsm6ueI0JYWvqfSu8KmtdH9ae9c+C -ll6yCwJvUvaAZ/0mxJvM+2eJmjvNZn8fIe4hSXKjmoFwgY4m3JE0waFX3BifDKGr -i9kQQD4p6SeRjP4= +AwEHA0IABNvnVfd1WmxVZJdhs63BkaGG3fM0myZHOAqLpKvj00/AaLxv0y6guEaQ +7guCTCOREOr61+J8LrbqclgIW1qFHGwwDQYJKoZIhvcNAQELBQADggEBABCCMdeD +eQMLhL3WAxcroAxq+Er6czCW4ET/hyYB7GOjeBCDwwwOlF65SjqzeWyd13B2jtZ5 +QS7hRA/DCWvne7BWTKwcuRtTPZ4l5uV6WbOxaJ8EAXsrPif+CLZFO6SbiNKLczf2 +Uz2oNUv/tFc7D1BvrQCQHA8cLokdaXSTYG39adrNiqz5xjhAJamCAIp6vEWq0nuL +AHUPkgkTzkMRdDEPP6xA8JkrFBLB/8ljbu2OJHy2ryED8XBPvzuff9QsqSRhEEOg +RiZsXoA4duvIzuGcFW2Qhc+KbiTCSoV8av9l5fl1R5jC+0xfcmAT/vLjccP7pl92 +JkID1WYY+v9Bq+o= -----END CERTIFICATE----- diff --git a/test/common/tls/ocsp/test_data/ecdsa_key.pem b/test/common/tls/ocsp/test_data/ecdsa_key.pem index 99a6e1f5b6..c3b1b57ebe 100644 --- a/test/common/tls/ocsp/test_data/ecdsa_key.pem +++ b/test/common/tls/ocsp/test_data/ecdsa_key.pem @@ -2,7 +2,7 @@ BggqhkjOPQMBBw== -----END EC PARAMETERS----- -----BEGIN EC PRIVATE KEY----- -MHcCAQEEIGwYbBaoZMHNNam3qe/GTARZDtNO1VJv7h38q5N4Dt3JoAoGCCqGSM49 -AwEHoUQDQgAEX2Pk2Pzaz4UTVUM80kgJxk69aNqhXxMzq1DiIJ24l7ja8gamtZXF -yCdPBzubMKK5lFuZfK6DFMZ9z0EmljaobQ== +MHcCAQEEIGyvpqUmOkrhuZ/5AH8eOK9V7OxP2VSpAmTJib/sqQ42oAoGCCqGSM49 +AwEHoUQDQgAE2+dV93VabFVkl2GzrcGRoYbd8zSbJkc4Coukq+PTT8BovG/TLqC4 +RpDuC4JMI5EQ6vrX4nwutupyWAhbWoUcbA== -----END EC PRIVATE KEY----- diff --git a/test/common/tls/ocsp/test_data/ecdsa_ocsp_req.der b/test/common/tls/ocsp/test_data/ecdsa_ocsp_req.der index 99bd3a19e3483b48f8c3435f7a8ab04c5a84f048..99c87cf00cd446623037c06179c19919ff1e46e5 100644 GIT binary patch delta 45 zcmV+|0Mh?zYLG1yNVgBD;`xi>dxG-bIG-{s{P-NpkwF;{w}mK(SWiYLY~MDlMvk~4 D{vH)p delta 45 zcmV+|0Mh?zYLG1yoXj7Mkf838-X!Q4U`ao|!_`)akwF;{Gwx%nJP8Ma9B~9;lOA%D D+F%nY diff --git a/test/common/tls/ocsp/test_data/ecdsa_ocsp_resp.der b/test/common/tls/ocsp/test_data/ecdsa_ocsp_resp.der index fa41eee455f6c83b5d6cb9267d4d190810c7b020..53ea02980d9916b8bb739a2ec023e517dbdb171d 100644 GIT binary patch delta 1060 zcmbQv)5D`=(8R{U#mKOriH*^qiS;iVr#2fSD=WJJBO^-_>pP&(tBFdroF;|_Mn;Av zrUnyN=xBIs=U?&YXZNG(rcd`Q<{Rn!`5|+fiAjK|fkA@b$iN7p_K!sU_EwFK2!A*A zocm^L-1>GX8t}4lYPET^edlFld=y+=&iee0VoW}4c{?t4(Y3yz{r4 z_xGb)zP~zD`1R3zFPGAZ@?Q(*1?-sE-&EQ9D^T_Cve3k|o=tww7c?l` znwT~$U}j=uV&Y`DCSaVlgzxnF$;nLZ((rIKHi#1EH8O)m36MKcy?Am3vts@BrmkHQ zlS41OHnRD*G;C%4mKayV9nJsurOMavn;x|-M{+*{_opfA1?^IO)rPJ}REW_)t%r z&HoAVzsdyfw{J>io9$emrMcSNMBeaKK>9k?)IE63WE?n`?o+{)Zy+a0Z} zV3>YW*XbIUbdl(*j|(nWa!pZ?iev5AaV6z?w3E!-Z1awZ%nRJD=Cklsm$W#@N|~R~ zY74(_+59)-@^&w^=jRSC|9h8ny5!SW=XSD%PG0kQ#!2nt$5WIidd$ARCG)?Su0ryz zhwCqTyKyoxGcqtPPBut1kY!^ImE~g*V-dlYUJc|y(#k9n24W3Z6-<7_Vp_j)+59Bu z4NKQuaOJsm{90X#O8|eGl&@D>Nb?l^@8MUMa_cUsWwhAx#)pN&V$SiD8P!MB)@|0B z-ukjpq=PSa$4rT6uh|S@L5^Z#Q+!rvE}h3W?ZqSgz+m=cI;}#!8-3)O*IYby#JgK} zS>A=;J2>w~Zwo$KE3AniUW&b;PzzinXg zq+>>RR(Ch@tW90o64$-tgxP+-&c%&aSh9XD_#HCy|EbxF-Ce&$ZQy%qWbU)Q_;bpe L?Izoq?(_oyy+7EK delta 1078 zcmeC-na-nb(8MOp#mKOriH!%yByVj0_EojDeKN#1%RkbI!>3PFV16(mjttdQU}|7MQ~O7v-uPYe zY8y`WCYeH(#L03+lMQ&;IJMe5+P?ELGIFyrFgGzWGW0h63}0jGdvlS_q4Mh2Qv&j3 zCr)GVJy)fo^}#tp6gol0Dfasq&Xt__c(trMno-EtkAhKe?M}t!$mZd4L9d^w&byL`NXiM%| zxtJSw10~k{ue6SLn(^l2W$Rw%2TM4n{XA52RBq=6*QidXXaTpJ+y}-7cP(gQzHQLN zd>x1{8#FQPUck)6$iyTf(Nbj=R{Abxb^7Gm9cvd{WV-g$XmSKoyA(V+j4Y$Xd5uhf zu>*=E6C=yXKbfZ1?=95o7C$iSfy3iXlboJ(K3rn@t2cB%V~@hmP50Vo?P# zX*he{mjc(w=FFIDt55#jwda{y#hRyHOnDmof^H8hHgNkpf1WTa&+%`4=G(}rVyVt< z9LzgjvvX;PVRdUjQu6n#w|0B!6<1sn0{y?r* z#}rdp1=9uBMa|xdf1Y@r_4JyG`d#ubr+i5^lg`-4;3aaFSKK6X5u>!Za&*+iGZK6Z zceXv|x@W&Q@kVj^wolV`RP0}1=pB{K#LURRxH#D$(Lk1sIaHR9MT|uRTe3Bf2T3cl zNEnDUU{x^rI*VyN%a?sMi;j6(-ub4KDDqt@+3Q*3i^401bt;@9AD)o4vCG+I;%gN6 z=C0t3{X43AY_nXHzR1)KhgRuq_}X)@eI`$m+=|)@+xE#@JhgcFk=vYYt;IB> zeZKlTSD$fWpR8_*6k0^DYtI_*0r^@Xt9i|VpIvs%+!aUnH|3^)BAg|p-)pJ zB1@N5PSEni=9e+5PYz4}UiWl!{mDxr^U{w#jSc?8n|b3=+7!;adtNdhnPk1*k3}ra cd*!vh$@=en9kuj&S5AImf9TtudxG-bIG-{s{P-NpkwF;{(rT4r$Wo%5VW4@QQ6(yR D49^xh delta 45 zcmV+|0Mh?zYLG1yoXj7Mkf838-X!Q4U`ao|!_`)akwF;{rrRb@dHbiETT4OjwK!`2 D^CuQt diff --git a/test/common/tls/ocsp/test_data/good_ocsp_resp.der b/test/common/tls/ocsp/test_data/good_ocsp_resp.der index 6a7d307b5fb6f580171d62e21cae50c6e161dc11..dd7782ef567e9a6a127f0a780e23051ff42e164d 100644 GIT binary patch delta 1088 zcmZ3@vw%m#povX}i;-bL6PqZIDagjD&Bn;e%5K2O$kN2dWYEO=&!CA>XkqbWN#q5Tu?bLP*tnSfR~L^tIebBJ1-+6H!A~k6C)$TVrP~+ zDJ>heG`^2;2zZz&@YbuX(C=Nwtd@-MkRzJm+c`RaEszy4pCnRz#J!M06PM{+*{_opfA1?^IO)rPJ}REW_)t%r&HoAVzsdyfw{J>io9$emrMcSNMBeaKK>9k?)I zE63WE?n`?o+{)Zy+a0Z}V3>YW*XbIUbdl(*j|(nWa!pZ?iev5AaV6z?w3E!-Z1awZ z%nRJD=Cklsm$W#@N|~R~Y74(_+59)-@^&w^=jRSC|9h8ny5!SW=XSD%PG0kQ#!2nt z$5WIidd$ARCG)?Su0ryzhwCqTyKyoxGcqtPPBut1kY!^ImE~g*V-dlYehuV7(#k9n z24W3Z6-@rdVp_j)+59Bu4NKQuaOJsm{90X#O8|eGl&@D>Nb?l^@8MUMa_cUsWwhAx z#)pN&V$SiD8P!MB)@|0B-ukjpq=PSa$4rT6uh|S@L5^Z#Q+!rvE}h3W?ZqSgz+m=c zI;}#!8-3)O*IYby#JgK}S>A=;J2>w~Zw zo$KE3AniUW&b;PzzinXgq+>>RR(Ch@tW90o64$-tgxP+-&c%&aSh9XD_#HCy|EbxF b-Ce&$ZQy%qWbU)Q_;bpe?Izoq?(_oyQ`y@l delta 1099 zcmZ3$vzkZ4povYLi;-bL6Pp5%DZ|F8&Bn;e%5K2O$kN2d3l!osXkrvvSUj1JxtLFa z-^jqo$k4#Z7)Y5+T&ZI{=Zt*sgaz*=-BWoXk>F{+@9@>IP9`P+h6V;ywZ;Zf3k1PJ zCP3{VQ%oicFiO-fyRGJ5`Fr{7Xm7{&TP?Ew8St`kYPET^edlFlXIq>z)?M2dBB=5#O!?&IJL?!BKedyUWr=`|;+#IHqf zZ9krGX>qPgELu+K)(l3mIcsJV$Aoe1ar)^wmn}r?$McgH_iWOtsXtY9H}j8Jq1v~S zR`U*fFD3DXJ=&VnX6(GP@X4)d{O{d*coP=N@@Xz--c@n3O3H_^rtbYZ*O>1jo;sR4 zLk?_t9L2hF&hD6xDIapmL-_wZzjV%XhDyoAbdw!5fuUE<+p;a0?^8DMcxvuPsf>3M zsxDtu7OZ>Sds2{P?=O{rAm8G^uMB7R=d{bp>)e}ZHO(vau&Qtf>kdn=1*el8E{Vu5 z-hAua+`~W17Bn&6HfUnL4#bxYnwWMkU}j=uViJ*PsWJ;IeHXJjeRA!NwF@pXU3+RY zIftoT3LZs9mQmuoM(`jvvYgDzJhgsrp;ou}fmsh69&eiD^rZ9Q64PJ3q5Bzo6n<{H z*FGc9Hf-;2^Ow!5EbixuUEbVtF7Fe=lKme8f(p2e&M4i8U;4QHclV~&{2fz{%4Ko$ zE(uLoa9V4cOZ`j3+4H^>xJEW-##~!{^6#!a&(tc`JoRGA)8H3$dswl7+u!-~gjsox zf9o^fMotw=b#~)m-tn59OT*Q~OUd~`adO?ePl|V!r)i4UR$2C0zv`@#lm2tnhL$%*v`a=kjHn93@cF1Rjg_E!A!#Ph7D*HqN+l7BhnOR|}C#zqD&k+ZzwCYg&E zrOlP2qb{D2;A6P6?J?Iq`^AYjip#fsnzo~2{{lnrsB9)?Mh3>k$p(oAvTV$uvV1IJ zEF##FvVlBETA4+{K&%0)g2}I0OzT;`?5kOH%+vDDH>E_8?^4NL&l+D8UOB8&;S~As zgshES&Mp&Qqrf+}U9X1DxVY-yQQc#k<)ZXOrfxX2N@v5@o`dZ(d6MK-)Lz)OPu}9G z#mkS}=4@*%rWx(?)!(`Lj1&8uRZP$SmS47XY-3Dh{>fv?Jg;YpzlBC7hh_2Y$#Y%` z)$eQhe^4jp>(9X0yM@e+<~hrY&N82f|5vhZe|S#0b^Eujt*u3iWn2}bN?2y5KK#t= z_-&cq--``>nj#Tdx~y`7mM1p9j8T1ZSo-(6r-BytVrkwhuk}sVf9LC{rPsT1@(cSz-}WqLl1T>u<9OOx diff --git a/test/common/tls/ocsp/test_data/good_ocsp_resp_details.txt b/test/common/tls/ocsp/test_data/good_ocsp_resp_details.txt index 4afb6c4c59..8b7581091f 100644 --- a/test/common/tls/ocsp/test_data/good_ocsp_resp_details.txt +++ b/test/common/tls/ocsp/test_data/good_ocsp_resp_details.txt @@ -3,116 +3,116 @@ OCSP Response Data: Response Type: Basic OCSP Response Version: 1 (0x0) Responder Id: C = US, ST = California, L = San Francisco, O = Lyft, OU = Lyft Engineering, CN = ca - Produced At: Oct 23 02:24:30 2022 GMT + Produced At: Oct 22 14:50:30 2024 GMT Responses: Certificate ID: Hash Algorithm: sha1 Issuer Name Hash: 16C50680A809B68F302789AB234F8F4B30B0E06C - Issuer Key Hash: 9CCC1F8D90A0EE92DE24E81860493FBEC3D55689 + Issuer Key Hash: 48B70FA8E2F98BE27B82F2DE389F322CFCF81CCB Serial Number: 1000 Cert Status: good - This Update: Oct 23 02:24:30 2022 GMT - Next Update: Oct 22 02:24:30 2024 GMT + This Update: Oct 22 14:50:30 2024 GMT + Next Update: Oct 22 14:50:30 2026 GMT Response Extensions: - OCSP Nonce: - 0410A6DB264F79FBA79B5B4B41EFB5386AFE + OCSP Nonce: + 0410D26A9562C852A29C61A0799E51252A7A Signature Algorithm: sha256WithRSAEncryption - 71:bf:88:91:25:37:99:1a:1b:24:c3:e6:b4:43:68:ae:d6:be: - 54:11:24:e6:56:23:e9:dc:10:a4:20:c0:07:65:6d:6b:48:ed: - 24:4d:bd:df:68:9b:ac:12:b0:1b:ac:c8:7a:17:d6:5b:b5:87: - c7:6f:39:38:ce:8a:16:5b:1e:22:da:98:01:16:9c:ac:98:73: - 5c:56:0a:bc:42:f9:49:9d:06:54:26:f8:e7:c9:d1:bc:b2:2a: - 7c:ca:7a:dd:69:fc:16:71:26:f6:74:85:37:88:3f:4a:22:17: - a1:8c:2b:29:96:98:b9:dc:a1:e4:da:96:0f:ef:46:8c:0d:60: - a1:1d:0e:29:a7:03:ba:78:c9:7a:1a:4c:01:7c:7e:ef:ae:45: - 5c:f7:14:49:2c:29:b9:54:c0:b4:e3:5a:05:a9:9c:bb:5c:f1: - 64:f0:6c:77:54:0f:fc:e7:d2:ce:49:98:24:74:91:67:34:b8: - 7c:51:55:d4:cf:3d:06:a4:9f:4c:76:91:c7:65:6d:f1:1a:68: - ee:90:7a:d3:d5:23:11:7e:eb:8d:c9:11:04:bd:fa:24:50:52: - 4d:73:f5:00:cd:bf:6c:87:1d:1f:2c:de:99:3a:96:4a:65:c3: - 25:13:54:05:b8:39:4a:a0:cb:63:40:d2:14:1f:a3:b3:da:ce: - 9d:c3:f9:76 + a3:43:04:dc:64:84:b0:b4:81:ef:58:40:50:e1:69:10:ed:4a: + 86:71:4e:ee:68:9a:84:68:57:54:c4:29:57:b7:08:89:fa:a4: + 18:06:a8:3f:ae:8d:b1:d3:e5:06:4b:91:c0:5e:7c:71:08:d2: + ec:e7:17:d6:3f:92:c6:fa:ff:d0:99:69:dd:69:a0:b6:b2:95: + 5f:8b:a9:02:0a:b6:3e:1c:22:3d:fa:6e:81:08:ac:9d:89:65: + 3f:d8:7e:5f:88:86:1f:4b:e8:91:ee:d5:a3:2a:6b:30:77:f2: + e4:cd:18:d8:ac:61:b2:87:57:5e:0d:da:d5:29:1d:bc:51:14: + 28:38:ef:b4:13:47:da:be:e2:4c:43:c4:01:ad:9d:3c:88:da: + 38:d9:5f:48:75:f7:cc:de:05:1f:42:25:2b:85:dd:0f:28:28: + 91:e9:58:20:9b:79:61:bb:0b:70:40:f5:b8:f2:6f:bb:fd:b0: + f7:7f:c1:2e:f8:a5:b3:9a:93:3c:4e:b1:37:c3:ce:a7:be:00: + d6:d6:f3:c9:a3:b2:46:ff:cd:f6:89:ee:4b:fc:23:96:1e:20: + d9:77:b4:05:40:ae:5c:97:e4:bc:9d:5e:0d:36:0c:1f:62:70: + 4e:35:7a:9c:f5:6c:4e:91:b2:85:d8:8f:04:23:e3:67:1c:9d: + 5b:12:f9:1d Certificate: Data: Version: 3 (0x2) Serial Number: - 18:84:7a:36:56:75:ee:5c:ab:67:93:7d:b8:ad:a0:d1:02:d6:e5:32 - Signature Algorithm: sha256WithRSAEncryption + d6:10:33:66:a4:0e:cb:af + Signature Algorithm: sha256WithRSAEncryption Issuer: C=US, ST=California, L=San Francisco, O=Lyft, OU=Lyft Engineering, CN=ca Validity - Not Before: Oct 23 02:24:29 2022 GMT - Not After : Oct 22 02:24:29 2024 GMT + Not Before: Oct 22 14:50:30 2024 GMT + Not After : Oct 22 14:50:30 2026 GMT Subject: C=US, ST=California, L=San Francisco, O=Lyft, OU=Lyft Engineering, CN=ca Subject Public Key Info: Public Key Algorithm: rsaEncryption - RSA Public-Key: (2048 bit) + Public-Key: (2048 bit) Modulus: - 00:bd:71:2a:8b:17:c0:9a:e0:40:e3:b2:92:42:e4: - 89:e1:a4:35:fa:8d:55:bf:01:8c:20:f9:b2:de:87: - 98:6e:3d:56:bd:fb:37:e9:83:aa:38:df:6d:16:d3: - b3:8c:ce:6e:f2:00:a4:bf:f1:50:52:70:0b:32:cc: - 22:d8:5f:a5:e3:87:fb:8b:b2:85:6f:b8:94:c5:1e: - 6a:0b:0d:a4:55:60:a0:cb:2a:96:44:7f:e9:31:9b: - 9e:f4:70:45:59:83:69:5c:d6:ab:c9:fd:ba:bc:e6: - 26:78:ac:e5:4a:02:6e:28:0f:11:46:e1:78:b0:0b: - 4f:43:f3:90:9a:6e:41:fd:69:ed:59:95:16:65:43: - 46:08:03:b8:eb:07:0a:28:45:34:4a:22:43:e0:73: - 63:7e:ee:f2:21:dd:a7:66:29:17:7d:7a:39:8e:3b: - ea:89:7a:1e:1b:fc:d5:48:e9:27:fc:1d:08:0c:48: - 93:61:7f:c0:6d:4a:88:94:35:1d:20:35:a0:d7:15: - 36:ed:17:f3:91:cf:05:cb:ac:78:7f:ba:1f:e9:94: - f4:63:36:1b:68:b1:00:4a:14:cd:0d:17:34:69:a2: - 01:1b:37:23:5b:5a:d1:cc:18:0e:00:dc:b6:e3:0a: - de:3f:a3:61:d8:73:77:b6:f2:96:b8:78:bf:a0:31: - 5a:6b + 00:b7:82:8a:ba:18:93:55:d0:eb:32:3c:fe:a5:56: + a9:7f:b4:5c:45:31:b8:83:ff:be:65:1f:7c:0f:35: + c5:3d:71:0c:97:fd:40:52:e6:33:c3:9b:5e:32:16: + 9f:fb:d0:a3:73:2b:82:94:14:d4:db:85:c0:cf:58: + 25:6b:58:18:12:1a:d9:05:41:5b:bb:9d:1f:6e:9c: + 19:bf:00:0b:f2:94:af:11:3e:65:4d:5e:83:d6:d0: + 7f:f6:a8:7a:1d:16:16:5f:5a:5f:08:33:c2:8c:5e: + 3c:ff:90:1f:fa:76:11:df:87:b2:65:06:9b:43:7f: + 6a:29:b2:ec:98:e8:d9:40:5c:67:f2:f0:68:27:ab: + 51:a1:60:b5:08:ad:a9:47:a5:8d:90:da:69:b4:3d: + 8b:5b:23:20:31:67:d9:2d:42:d6:0a:1b:72:15:ea: + f1:a0:d3:79:0a:94:20:1a:5e:05:88:b8:d4:64:d7: + 5b:42:1c:9d:6b:37:88:91:03:a0:47:3a:9f:04:0e: + 7b:74:84:40:1d:1a:37:c8:2a:86:57:df:39:83:fd: + 68:d3:b7:4a:26:e7:ce:c1:a7:fd:dd:09:97:19:e5: + ea:ce:b9:06:55:93:ac:f3:98:c9:2b:c7:c7:64:23: + 91:48:9b:df:b4:69:ff:16:2d:20:63:ba:e1:af:d1: + 46:09 Exponent: 65537 (0x10001) X509v3 extensions: - X509v3 Subject Key Identifier: - 9C:CC:1F:8D:90:A0:EE:92:DE:24:E8:18:60:49:3F:BE:C3:D5:56:89 - X509v3 Authority Key Identifier: - keyid:9C:CC:1F:8D:90:A0:EE:92:DE:24:E8:18:60:49:3F:BE:C3:D5:56:89 + X509v3 Subject Key Identifier: + 48:B7:0F:A8:E2:F9:8B:E2:7B:82:F2:DE:38:9F:32:2C:FC:F8:1C:CB + X509v3 Authority Key Identifier: + keyid:48:B7:0F:A8:E2:F9:8B:E2:7B:82:F2:DE:38:9F:32:2C:FC:F8:1C:CB X509v3 Basic Constraints: critical CA:TRUE X509v3 Key Usage: critical Digital Signature, Certificate Sign, CRL Sign Signature Algorithm: sha256WithRSAEncryption - 04:f4:be:7c:a2:c6:49:39:dc:f6:22:61:14:f7:1a:63:4a:e6: - 81:e8:71:d4:c3:2c:78:42:59:e1:c8:1d:3c:3e:6c:ba:34:4d: - 32:51:ec:db:45:d5:55:98:d1:aa:fe:c5:2d:c6:b3:1e:5a:2f: - 14:95:b0:c2:aa:2c:b0:f5:8c:c1:87:99:0c:62:1e:a8:7d:d0: - b6:be:1f:38:e5:38:e9:f1:0b:37:06:ad:38:96:32:be:4d:2f: - b9:ab:cc:42:07:9c:aa:02:e7:fd:77:d3:39:41:86:01:61:03: - f9:0c:35:03:9e:8c:94:4f:38:28:69:08:39:73:db:93:9c:e9: - 12:be:84:ff:c1:2c:5c:f5:f9:51:5d:dd:71:03:81:37:6c:a7: - 72:cd:03:c8:5f:fe:74:ae:bf:57:6c:77:3b:87:f6:8a:b5:85: - 72:a3:1c:45:21:5a:74:04:99:65:e1:f3:03:41:f6:a6:2e:fd: - d1:80:8e:29:14:58:6a:2d:05:1e:11:39:c8:b3:e9:5c:25:e4: - c3:1b:fb:ae:e5:b3:7f:c9:d2:14:9e:67:c5:e5:5d:53:fc:0d: - 69:d8:e2:66:94:09:dd:bc:e9:03:c4:92:3b:af:4e:04:16:66: - 4b:a9:d6:8e:93:2f:ee:4d:41:2a:2e:8d:a9:93:e8:3f:c2:f6: - bc:a7:1c:67 + a9:a6:9f:62:43:b0:a5:ae:d0:45:0c:da:c7:d6:7e:64:44:50: + 0f:66:1a:4d:4a:66:54:83:94:2f:f7:57:d5:a5:0b:2d:a4:7d: + 01:38:b4:ec:4c:04:08:38:9c:c7:64:98:7b:c4:26:ae:b3:2a: + 97:85:e9:81:14:88:0e:6d:b8:99:18:5b:4a:9b:00:16:52:41: + 16:16:94:4c:a8:29:a5:9e:0e:96:e8:e2:2f:51:53:07:c6:2c: + 85:12:4d:b1:4c:1e:83:ac:d1:c6:c4:4b:8b:2d:a6:6e:d0:fb: + b8:09:df:42:58:ec:dc:c4:56:9b:79:95:48:49:4d:37:39:5a: + db:84:68:17:b0:01:bd:9f:bf:fb:18:e9:05:68:29:2c:ff:be: + 8c:59:20:cc:6b:f0:3a:8c:ef:98:49:5f:a1:13:3f:fb:79:60: + 6c:67:3c:0c:b4:93:e2:e9:89:e1:d3:7f:86:ac:91:20:4d:93: + e0:94:ff:80:ad:8d:db:6d:47:8f:40:1b:47:92:5e:37:7c:eb: + 8f:3d:51:73:92:c6:32:dc:ab:8b:81:0c:ad:65:a5:84:5e:8b: + a4:c8:36:bf:4e:89:a3:81:d4:04:6a:f9:a0:fb:54:99:ff:ca: + 9b:a3:47:45:f6:5a:b0:0e:e5:32:37:4c:b7:73:f3:64:ec:b7: + 34:b7:dc:8f -----BEGIN CERTIFICATE----- -MIID0zCCArugAwIBAgIUGIR6NlZ17lyrZ5N9uK2g0QLW5TIwDQYJKoZIhvcNAQEL -BQAwcTELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM -DVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5n -aW5lZXJpbmcxCzAJBgNVBAMMAmNhMB4XDTIyMTAyMzAyMjQyOVoXDTI0MTAyMjAy -MjQyOVowcTELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNV -BAcMDVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQg -RW5naW5lZXJpbmcxCzAJBgNVBAMMAmNhMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A -MIIBCgKCAQEAvXEqixfAmuBA47KSQuSJ4aQ1+o1VvwGMIPmy3oeYbj1Wvfs36YOq -ON9tFtOzjM5u8gCkv/FQUnALMswi2F+l44f7i7KFb7iUxR5qCw2kVWCgyyqWRH/p -MZue9HBFWYNpXNaryf26vOYmeKzlSgJuKA8RRuF4sAtPQ/OQmm5B/WntWZUWZUNG -CAO46wcKKEU0SiJD4HNjfu7yId2nZikXfXo5jjvqiXoeG/zVSOkn/B0IDEiTYX/A -bUqIlDUdIDWg1xU27Rfzkc8Fy6x4f7of6ZT0YzYbaLEAShTNDRc0aaIBGzcjW1rR -zBgOANy24wreP6Nh2HN3tvKWuHi/oDFaawIDAQABo2MwYTAdBgNVHQ4EFgQUnMwf -jZCg7pLeJOgYYEk/vsPVVokwHwYDVR0jBBgwFoAUnMwfjZCg7pLeJOgYYEk/vsPV -VokwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAYYwDQYJKoZIhvcNAQEL -BQADggEBAAT0vnyixkk53PYiYRT3GmNK5oHocdTDLHhCWeHIHTw+bLo0TTJR7NtF -1VWY0ar+xS3Gsx5aLxSVsMKqLLD1jMGHmQxiHqh90La+HzjlOOnxCzcGrTiWMr5N -L7mrzEIHnKoC5/130zlBhgFhA/kMNQOejJRPOChpCDlz25Oc6RK+hP/BLFz1+VFd -3XEDgTdsp3LNA8hf/nSuv1dsdzuH9oq1hXKjHEUhWnQEmWXh8wNB9qYu/dGAjikU -WGotBR4ROciz6Vwl5MMb+67ls3/J0hSeZ8XlXVP8DWnY4maUCd286QPEkjuvTgQW -Zkup1o6TL+5NQSoujamT6D/C9rynHGc= +MIIDyDCCArCgAwIBAgIJANYQM2akDsuvMA0GCSqGSIb3DQEBCwUAMHExCzAJBgNV +BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNp +c2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2luZWVyaW5nMQsw +CQYDVQQDDAJjYTAeFw0yNDEwMjIxNDUwMzBaFw0yNjEwMjIxNDUwMzBaMHExCzAJ +BgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJh +bmNpc2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2luZWVyaW5n +MQswCQYDVQQDDAJjYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALeC +iroYk1XQ6zI8/qVWqX+0XEUxuIP/vmUffA81xT1xDJf9QFLmM8ObXjIWn/vQo3Mr +gpQU1NuFwM9YJWtYGBIa2QVBW7udH26cGb8AC/KUrxE+ZU1eg9bQf/aoeh0WFl9a +XwgzwoxePP+QH/p2Ed+HsmUGm0N/aimy7Jjo2UBcZ/LwaCerUaFgtQitqUeljZDa +abQ9i1sjIDFn2S1C1gobchXq8aDTeQqUIBpeBYi41GTXW0IcnWs3iJEDoEc6nwQO +e3SEQB0aN8gqhlffOYP9aNO3SibnzsGn/d0Jlxnl6s65BlWTrPOYySvHx2QjkUib +37Rp/xYtIGO64a/RRgkCAwEAAaNjMGEwHQYDVR0OBBYEFEi3D6ji+Yvie4Ly3jif +Miz8+BzLMB8GA1UdIwQYMBaAFEi3D6ji+Yvie4Ly3jifMiz8+BzLMA8GA1UdEwEB +/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEBCwUAA4IBAQCppp9i +Q7ClrtBFDNrH1n5kRFAPZhpNSmZUg5Qv91fVpQstpH0BOLTsTAQIOJzHZJh7xCau +syqXhemBFIgObbiZGFtKmwAWUkEWFpRMqCmlng6W6OIvUVMHxiyFEk2xTB6DrNHG +xEuLLaZu0Pu4Cd9CWOzcxFabeZVISU03OVrbhGgXsAG9n7/7GOkFaCks/76MWSDM +a/A6jO+YSV+hEz/7eWBsZzwMtJPi6Ynh03+GrJEgTZPglP+ArY3bbUePQBtHkl43 +fOuPPVFzksYy3KuLgQytZaWEXoukyDa/TomjgdQEavmg+1SZ/8qbo0dF9lqwDuUy +N0y3c/Nk7Lc0t9yP -----END CERTIFICATE----- diff --git a/test/common/tls/ocsp/test_data/intermediate_ca_cert.pem b/test/common/tls/ocsp/test_data/intermediate_ca_cert.pem index 5eefdf3696..1a143136b7 100644 --- a/test/common/tls/ocsp/test_data/intermediate_ca_cert.pem +++ b/test/common/tls/ocsp/test_data/intermediate_ca_cert.pem @@ -1,25 +1,25 @@ -----BEGIN CERTIFICATE----- -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 +0wIkN48GBo4SxjzMluikNIRFT8v2hRAILo9rjA== -----END CERTIFICATE----- diff --git a/test/common/tls/ocsp/test_data/intermediate_ca_key.pem b/test/common/tls/ocsp/test_data/intermediate_ca_key.pem index 2d3ea69812..f6180b1b35 100644 --- a/test/common/tls/ocsp/test_data/intermediate_ca_key.pem +++ b/test/common/tls/ocsp/test_data/intermediate_ca_key.pem @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/test/common/tls/ocsp/test_data/multiple_cert_ocsp_req.der b/test/common/tls/ocsp/test_data/multiple_cert_ocsp_req.der index 3bb3bc154b9ffdbe27f74e9840e222d10434cdd8..44f920a2407e970e1c6bc2c3ed935197cd5c27fb 100644 GIT binary patch delta 96 zcmZ3@xSDZ-zJ$ki{uPgYc0a0a`gG4?zLCzKA2O$zm;@Lma;V$lkYik=Y@lc$&&H|E h#>mRbZotUIBE%x#zWu?km0{M7-^$(9=N#+20RXcFCJ_Jt delta 96 zcmZ3@xSDZ-zQmj}^1Txlyqk1S<%L9or~SUeSHn7)m;@Lma;V$lkYik=Y@lc$&&H|E h#>mRbZotUIBE%xF)aRgLPu-ontf%yKxCG;7001r+A^`vZ diff --git a/test/common/tls/ocsp/test_data/multiple_cert_ocsp_resp.der b/test/common/tls/ocsp/test_data/multiple_cert_ocsp_resp.der index c438e88bd843c45f82284f1fd76fe406a717ceb4..d80ff0c4db1c03231f2b60659216e20242072184 100644 GIT binary patch delta 1130 zcmeyv^N~lxpouM)i;-bL6I&XPnZ(Aa&Bn;e%5K2O$kN0X3>5M=XktuWSUfq4xtLFa z-^jqo#L&RV$k4>pVB$($4Ug^oD<1vqepKD`>7K=WBb`4#WKJ_N2{1G;psD?*Wr;&A z<3d4HwZ;Zfr~;D{871o7w?Fu`GR)fXTe-XXoMW9g40zc%wc0$|zVk9NadfC|MVeRi{%bk3IGwop6rOkz!midSO`w46;i)ERi z!2WIRd7}#j`_}z>bSSmOrtre5e`0On|EfN*zV6xCdFIGAIgQ$hVM0v@>pLT^|K?A* z?Oo^N)p1vJU3sQDlT_|Tb+Ny$sg2Kcx3DXGXz(`iUHH9ko#nIzEs`Hp^4V>zZmOO+ zkbm3eIO`(cMPC2vdE^VfY+z&A>00wh=waf;|6H>VBrR2&S@c}8G|Kkzt&CY`_@0F% zeCEk{9Xox~295Y@eeEkcQ-wGtytHy-;QS{bdn&|+|I`Wgw+S`2OJa53g_*Y~p2=1I z;qok0rPQ^gdusoJCguwUP0VM2_=G_d(}o4iOpHuSoDA0ljMJ9zonAlr1XH^dJO+Uw zEzWCX28&Q*gUOl9Q|q@kb?uUv9D3okk|l{kIiWvSMQKQSltchkD{{{!ftqRVH}9eN!siZ0Gtc%}sA+ytwI5ACvy+Lx%e5 zz=a80Io7UpU)nq2R^}Gl?r3EN!}OcFPS?1ki$q_2TyVLPYl?zY9BappD=F8bon+=_ zn|DlPUf^yupM|fwq{Ts2%KU^@Tljs;=D!)2w|l8QKX-8X-@BaCC7-@Jx05Y&@|w>x zPHG=No}xU_WA^vO%JOEE{vEEFX&)iwL&VYakDj zR%Vef5Np7yV6r=_Y5mG&^OKx6EM0fOmFL#+Yjr6u0sLuFzFuh|%~SNhhhJUFt-GX_ z(PGOR9~KUaImc6GR3A}Ww^?g?>&r%w4!+zSGbN(EW;2KdIf{u*@mZm{bROTd7mxG< zgV~Siv_?{3{?c^7`~;Joh?@#fBvu-TPUJv@EQEu(JNw`7QKVB9-@ z|8I$xtQnd*|M&GoDxAswVAb<}hG+ajVf){e2|4LDJXZyjv3uq-QCEuHg#!BT=$X_X8Zj*7dKvE$@;nAcgW2D er)Dp9cl{Q%f$yo2xzG0E&na)Vn`~#g(+>cV8|cdb delta 1141 zcmey!^M^;npoy)5i;-bL6I&sWnajqh&Bn;e%5K2O$kN0X2Na4jXktuWSUfqNxtLFa z-^jqo$k4#Z7)Y5+T&b%u=Zt*sgaz*=-BWoXk>F{+@9@>IP9`P+h6V;Swg0p%aj0cn zD2S@o*dPj3U~(d(MEz2qgNi+MckZ&D(%0bA$r%9>v?tcq>TeAO$T3p``meGZP~dlZZr1m04KnyO`DKlWTXZU2u`< z+Eb&+dzsp$;E`!$870nZWCDy^P!yXOSx$~)o?5@RP^(+~z^n%jk2g(ndeZrDiRrK2 z(EW@(3O_g9YoC#48@Bhi`OD^27WZ?-E^qERm-mTb$^MT4K?U4KXOwQlFMZtpyL(e> z{*Ea}<+8YWmxLxPIIT6!rT(Si?0H`bTqBz^W3H_}`FGczXKEE|o_aCmY48iWJ*?Qk z?eF|~!mK>UzxA1KBd3a`I=gW&?|9A5rQvGgrR4meIJxfKC&jzV(=^3vt1SDhUv*Z= zN&mU(@lySdEC-Lr|xn3PpOl1{J7hD%Ldn^8V;(6B7Ybxq@$-kWPCD}|mV)^R&G4O({|2yHv8*v&I*N zR}Sk`I7L1@A!}oov&+QSDDcf~*Q=p3F0T4_RQK3sxhQ>+sT&Th(%JB}=V1Fxo+P;y zwHLPSlec(k@$w_LIon!`X-4~e^>?m5fAW|z&+D1uZ=sRN zVOe~8@|>4K_4``>AJmEY`ZF;0ZXt7{dCu~pv&<*r|COxUAD&Zg-Ttj>YirSB8CS)q z5|){%4?iE`;Amqg~JAAK4d{D(L5 u#-p?;oOk!UWIi&GiIh{KEdww>`_5WYPiTOZI&L diff --git a/test/common/tls/ocsp/test_data/responder_key_hash_ocsp_req.der b/test/common/tls/ocsp/test_data/responder_key_hash_ocsp_req.der index ca0ef64bcba93a980039256d71b24fc70084d2ab..ae975db1626147590d2e8ec584c6c79bfdf293fd 100644 GIT binary patch delta 45 zcmV+|0Mh?zYLG1yNVgBD;`xi>dxG-bIG-{s{P-NpkwF;{{qfSrs?x?F2Vd%eqtiyj DB2^f+ delta 45 zcmV+|0Mh?zYLG1yoXj7Mkf838-X!Q4U`ao|!_`)akwF;{dEw3w=eNM$o#fk%u2ifq D1T`1G diff --git a/test/common/tls/ocsp/test_data/responder_key_hash_ocsp_resp.der b/test/common/tls/ocsp/test_data/responder_key_hash_ocsp_resp.der index 140aee6b097c3e57865bd00c80b39f8831bcf98b..937ec728143ac9b0bb2a5eb784a84af66e2dd6bc 100644 GIT binary patch delta 1084 zcmdnRy`J0Kpow)g7bC-hCe|fD<^ncOZ8k<$R(1nMMwTYli9n%VgT_UR#8^Z;w)3xe z^t1a>b>9bFaCERa!Ia>47Y7|_F6MS6qs(#&(8}2Xp5AOV6!`aR^^Fs5^?M1)**S8#7 zE4#+~+|*#xd0JwktkbG`0<}NC+~{#VGedIjE$N!e)f!GelmgWg{R6@TuHBhd^3{E@ z?#1a5-&TtqUEU-3BEK|hBew@?w^@T3eH#dGDr$EofrCV9>;T z28d4>G%;;hz|6$R#Kg&PO~5#93E%1Uli8TsrQmU3Y!D^RYh(tC5@UnO%bBLuZ*S__ zB{4bl!fPX&e@nww)^CY%HQdqse_yJ64ZrD8+d`h{e;tCJ86TbN8>L#mW^zOOxd2=N9GjM;JvR=?G)i`q-D*AyUv)`~gRGSK z39Yv9`x;PStBIj2iLeRXapTj=C9pJ$xZK7Kq!d7{Vc`&%;qi|HyP z?|QiYqPH6-6EhLY6FHfv39 zec33|!I!&ZrbM*YYzDC)M=`M}J}Wer&f}Z*;*ow}F#9o`Rw3VwK61@#E*?AL-L1PU z@51jLocEm~-rPA7HoJ1Fho`T(Wz_BZmJIO?jC<$r|1I&7HA7S9|Gu6`g)`Y7ta{$h z@Qhz5Z2!A5At&92XUpVAFFPMzu5Vj2QNefegDL+T*7n}cb?!X>t1rgY`Ig1Sw9#24w?D?)a=FXuHT|I@I5s$_t{?jIpxiE JlkH4*`T^Lb+-?8> delta 1080 zcmZ3_y^Gu1pow)G7bC-hCf4;p=4v)hZ8k<$R(1nMMwTYlIY6Nq291jriLr>xIV0aY zVZpme_f%d;BzW5IJA5^)Q-a^fz{tqZz{nU#nN0N7(ZHsPiAjK=fdNhJe2MzXhvx*I zZ$EHq6G(8}PDmYPET^edlFl@9);rb6B83splHUjS0(3+74xN-4x>a(YH@& z@}`#4k)_ESp1eHpB_@(JT15MB-b;zX}y8QRctxuEwR`Ks%^5)y^JDD3qrcaj5PtjUA zmyu^j;M?ZadxD-k`pDNB^U-5s)x^I&d%qr-6B~Ot?RD@~*5+!lr4uif3omG5zHQLN zd>x1{8#FQPUck)6$iyTf(Nbj=R{Abxb^7Gm9cvd{WV-g$X!38yb}4vt7+FS%^BS1| zV+RyTCPtQ%=P*sJ-&?5FEq-9u1Bb_(COJLne7MB)S8wQk#vX;Ao9?yG$g>UG``i3w z^D2w`xnh?$_ngc7#IR)l$AF*$Zlg0wH{zE*ZvWlAsWpGcl%sN4+`LOd6BeA-n&wjf z(s1^?F9oiV&6zRRR-gR4YtJ*aiZxHYnDR9E1>GK2Y~c2H{ybq;p5x#8%(szK#ZsN! zIGA_5X6MpyHStn%eo&lT_wJM8-Q{VT;*+NW^}FO>PWh5-CY`a7!As;UueeF(B1UO*<>;u3XC(L- z?reL^b2kSQvAvLTCzDYkTKAkW4eDyz&QVIbCkHMvi&Vlk~} z`LeHO(J@cUJKvNNMZQZVdp&D>QF!IBPK8tC!xOSLb~(FDe2oI%+;+VhI^*K1e@AtX zZI+AD7n!=@&?=n`UwaO=&*VvxTTy#q+dg@Vrxq_ia+|ZQwU}nK&sTrv>N8I4b5=1u z|66|9(y@&(k@+W&Df7IZDgG83nH-kIwz;0|KY2-HUi#6evB7_MGjBXfo5Fc_&r9YbldRYKv52L4ue{bbS^u4{qn2Lp Q%E>S64}IISoJl4f0Es>7e*gdg diff --git a/test/common/tls/ocsp/test_data/revoked_cert.pem b/test/common/tls/ocsp/test_data/revoked_cert.pem index ceea50537e..c2713e57de 100644 --- a/test/common/tls/ocsp/test_data/revoked_cert.pem +++ b/test/common/tls/ocsp/test_data/revoked_cert.pem @@ -2,20 +2,20 @@ MIIDYDCCAkigAwIBAgICEAEwDQYJKoZIhvcNAQELBQAwcTELMAkGA1UEBhMCVVMx EzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcMDVNhbiBGcmFuY2lzY28xDTAL BgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5naW5lZXJpbmcxCzAJBgNVBAMM -AmNhMB4XDTIyMTAyMzAyMjQzMFoXDTI0MTAyMjAyMjQzMFowXjELMAkGA1UEBhMC +AmNhMB4XDTI0MTAyMjE0NTAzMFoXDTI2MTAyMjE0NTAzMFowXjELMAkGA1UEBhMC VVMxEzARBgNVBAgMCkNhbGlmb3JuaWExDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsM EEx5ZnQgRW5naW5lZXJpbmcxEDAOBgNVBAMMB3Jldm9rZWQwggEiMA0GCSqGSIb3 -DQEBAQUAA4IBDwAwggEKAoIBAQC85vP2qxNRY5z7pA9UX9QxSrDQ53EBATflTP2x -Xx1Lg8fbE3j0cCp9u3rwl5SJ3L0zHj+rycq4f1p/0Qu4wEfDbTdCPyrtVatTzSKO -c7xarjEvfKcPYM+agi6viUZeoASLexlAMtQXgotj2yDmia8JEo/H39PJYWwGr7sl -+zCPHN+dMhR5hI5UBTTkQTIPONL0Goe1X7CmzKN21L6qf5RcbeskPYnlFNTBqAXl -l3tWU4cgGkT1ceVPpthDtYTexLq7L5a7Haeu4GQUxkA4CQWwXDoQP8sBJIPc+i7M -1bMf2nzIhCGt+aWxA85Pkw9tm9PyQlkq18H0GuIbkzmauyO3AgMBAAGjFTATMBEG -CCsGAQUFBwEYBAUwAwIBBTANBgkqhkiG9w0BAQsFAAOCAQEAX9Xmum4fn6AapG1e -QFwbOvgOG5PNBd1SiyzJKRf8nViPTDkUwC+dv4qTgNMgH7yS2DBH/0SlOxopFmOd -oEoT3RwS9LHjuH7aIj/fmx0lXEjZp/9HpQqqPW0X/wlRG5xdEHFKHkSkpXYwBc9l -s7gWDB4acszW9Zyj+cE9BG8eiPCal/geXMpBqyxLJKore+i71oUk60xohTdpWoz5 -kHwFcl6FixW9Jr7AEVaM7EIFF9hf7Q9aLMvELpP3HbO6oqJawT7Cc8kdfblfQrtI -sxxohY69HhM8aglB/cgb3562pEKzyJmC1f6Ni6KM/N1SKn63M3zqZW2gd6G1W90D -lJ+yBw== +DQEBAQUAA4IBDwAwggEKAoIBAQDJoIzfrbWrwZPLiOLyTh+KsMl7z2uygZSx2kwc +tUyqim6da4lUniCMSYc8GggKywihTjsMI+DXy9dbYyxVYTWHc2igl5K850C9ftsx +R6HL3dC+ExWs/p7gS94AzmZia/dyVQfWIKwSZDsGoltwjHXwJWP08+EkO/UE2REb +NglgfTJ0MmoYBaxpkO1QdgF/nKTEjG5vezFEtNckqJaII2RXf0keefPA37eT/bPU +MzCOvp4j8Kxf7Df+hnXG7GPMwIaByaKCNB09+hfWvczZb/t8K69PY7UgvB2Ercxv +8bXxjUaDx/HucnalDyAXGa1h1VHGHmyDROFMX2T+trrRezO5AgMBAAGjFTATMBEG +CCsGAQUFBwEYBAUwAwIBBTANBgkqhkiG9w0BAQsFAAOCAQEAfbtiETsHs4aSBHiq +AXnXxGyq40HYzwM1seWqbEGfz76v+r3CiPo6cTzvZFAKY5cM9v5in1W+lUj+ZZwi +k/rEGNZ8sFXKQcfYj1sXfrdfdZUQfoOSSBupw6/hy/ZYZmPMVjk77rjuQj0Q30wL +q4hB1wPr9a720b3b4adBKu+1G6F/pICpbauTc8axBhvZ1TGfQzXRlmYeRoGY9iLH +b2du6TIRGF0U4l+kwjPxLt9PTQT29pPCcQe48iJ6romb2YDC4grdfUoeujCpQI2x +jsTdbSbcHqhjt5p1fxgrBiAj6KWH+RACU2FbrYcUXY4RmN0f9Jn9ECno0I3TO6qX +hognFQ== -----END CERTIFICATE----- diff --git a/test/common/tls/ocsp/test_data/revoked_key.pem b/test/common/tls/ocsp/test_data/revoked_key.pem index 9a9275c240..c678426bfc 100644 --- a/test/common/tls/ocsp/test_data/revoked_key.pem +++ b/test/common/tls/ocsp/test_data/revoked_key.pem @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -MIIEpAIBAAKCAQEAvObz9qsTUWOc+6QPVF/UMUqw0OdxAQE35Uz9sV8dS4PH2xN4 -9HAqfbt68JeUidy9Mx4/q8nKuH9af9ELuMBHw203Qj8q7VWrU80ijnO8Wq4xL3yn -D2DPmoIur4lGXqAEi3sZQDLUF4KLY9sg5omvCRKPx9/TyWFsBq+7JfswjxzfnTIU -eYSOVAU05EEyDzjS9BqHtV+wpsyjdtS+qn+UXG3rJD2J5RTUwagF5Zd7VlOHIBpE -9XHlT6bYQ7WE3sS6uy+Wux2nruBkFMZAOAkFsFw6ED/LASSD3PouzNWzH9p8yIQh -rfmlsQPOT5MPbZvT8kJZKtfB9BriG5M5mrsjtwIDAQABAoIBAQC3SkkR4PD/me4q -ZQfS0KDtqxFhwg/t76aywT+vqSCdsyJqubw1QdiY4x7o78ta8WpLfWA+abBf0IKZ -XtdGzptTTle92djnLKbuyy5qlnX+buKetw7KZx9JRmPSQxqamh2O0USw/CC7Jxnl -LCwCRTonTXFheRbgYb0Vx9GJiu+VC7puIyhQ9d80usxgH0U1SImfVbxh6qaSoIUb -biZrF1j7oNL8p4oz3aw2U/ZLeWYCzZAh2bLgukU4M++RABY1tUCuCOAbpqh1VBIV -gVQoT4diqVcMy6VrDCtdHrmkZ80kpnFfdfGkOuAF2uNbeuy1wDgPW29vBqyzaAAM -VT6tqNjxAoGBAPu3jw9A2aWH6JcgLCD/dApKBtlllNtoWkfFxLRt0dPcyd92n9ac -XAQXr6dujfhbNsq1Klk6FbpHSA/6BwTTu78cOdBxu6oS2wQ1ze0q/kgQcqTDi4Ko -2YtVwZ7XWKHIJ74i2gKgbO0ScP5ZANAwHrKvzlvcK5fUlh1A+5u1mhhFAoGBAMAd -yDmUjz5Tqw1lvDx7Rj/mlkt2veBC60MDhZoKkx31GRjWKWI9P7ogqGgAFZdRgeZ9 -VfKQ4iFovjXsI8hc/HorpaknZur0OVNeWz9btQhqPugumshKLhqvlUoREURW5xyy -sdq8DK0Fr7h/1275rLUcyjHPT+su/74xofeP1SHLAoGBAOhlybwgeJF+kDxvJK72 -itExFW/DfJKxnqCjNAANYGuFbhBVui7vP3k70R35UTQaKtUuPEITAZpxU1QE2FQZ -lD5Wtf3/826LaBBUCKLOTeSE4wPB0l04vVkKPPAFDDyZyi+eh79jFA4xN4ds7vZH -ZyA8dn6TIOBWEp5Br8tL+FAtAoGARxP9u0f6g03DUG6eaSYWxJeUbZEeCPXZQu7v -pCFbcs72nRjHMOCGTl+8ztWRJ23xiIxAm0D9WOz+ysZ2KrA0fSLe5Kl+S1lWSED1 -s4hDfzyHz7FGdOn1CsyBiGiuIcGhOh3m7Y17hxw+eh1aYGWhf1SKfkk8QUAfQIfu -a8BcU2cCgYB1LwHI15LkXiTnzNlMWvB+KvIzjmUlJwbJye3gcxHVq/yqt4pAJFkC -MBXGrL5Kn6780aO1v2GlM6weUNv7EIerBbaL0TjAwU/TxMiU3MXbD3k2xIctCLFX -fn1kt2pcbuNg8AP1jgoJD60svknnDt8/sDAAvhYQb9UPKTE55svj2g== +MIIEpQIBAAKCAQEAyaCM3621q8GTy4ji8k4firDJe89rsoGUsdpMHLVMqopunWuJ +VJ4gjEmHPBoICssIoU47DCPg18vXW2MsVWE1h3NooJeSvOdAvX7bMUehy93QvhMV +rP6e4EveAM5mYmv3clUH1iCsEmQ7BqJbcIx18CVj9PPhJDv1BNkRGzYJYH0ydDJq +GAWsaZDtUHYBf5ykxIxub3sxRLTXJKiWiCNkV39JHnnzwN+3k/2z1DMwjr6eI/Cs +X+w3/oZ1xuxjzMCGgcmigjQdPfoX1r3M2W/7fCuvT2O1ILwdhK3Mb/G18Y1Gg8fx +7nJ2pQ8gFxmtYdVRxh5sg0ThTF9k/ra60XszuQIDAQABAoIBAQDAqxOStqqwStVR +HChJhI+tdwvBrM5sEFknrsMmd7SgDpJvCRB89HGDvMtmijV/Is7HXTsdebdkXpwW +7uixWafOHGExfEWzD4QU0ADi0WFxry/GQfRnkBP/n1+wA4tgp20YKtrHKgdjt7WT +vFeGcCJO7Vvb+aP9fPHAxTAMgZFqSeTQKGu5KEJkwhzD+LHcvfUYKqjA5Nggbnjr +XW9IJoyKH8coa6INvlyYm9yjUF50BFUP6Ymy+6OYS7u2lFDr6Nv+o7lXk7qPMt3c +D193BPZIy7HVydrgZ3fSaqzJyZFTqfxtKTNRSfxXZgKsgNwCoByKdfYw+qzYnDnL +lpShiNGlAoGBAPcHCWLvLG81oWzJeV10Cb9SP/tMInOszyqc/UkDHa7iRn/5k4Za +CUeQ2Z1T/HH4SJ7w35QlS5jyEUethe7p7Gg/yLV3DdM2WSQnm01yGrbiDJsj1QVw +wqXy2QpeGxF6o8ooqqsv5Jyu1EQ8uifXvgEf1As4+++zJjJocUOctX+zAoGBANDz +XNI5Vbksm6zMT3cDD0LFYGHfeE+PbLv2UBaqs1Hqp9Fr0hSPOk08vZndzwNHKHNV +ZNTLTFkyOUsdAnhu8I2xp8+7jRjvcYMv/5XjoC8tweHKMeCv5TkmJ9/+qCvtBj05 +E5pDyIJVauT/3U5U1I9oWH8o/5J1FB6PvuKpjSjjAoGBAMo0+lv/x/GohuDT8wKq +j6gKndEIu1LQ7CvHohV39X5IPslW9ImPffUU/u0n6IcqY9em+Hz+ImmqDLcNtYqh +9SBIxfS05Z406LcNrLSyaGe3lfYQWLlBWjQZG8y+x42BRD2hGENUyt/uxFavFvqy +QRgOg7ZECQZnMScmE0DzMCa9AoGARgY4xi72vn7nkOpLezvoQl05JrOocylCrF8o +ieAdBkfYg8NZfRBe3oGLnOQLuzJ+qOAmUXXsGTxOnRCUwl2TejjeXyygZYnhBbDx +O380MHtqLUwAmSb5b8SMunFyVH4ziBL3scwjhyIvF51zwguFzKWQetT3iVJ5MqDD +vNxLdTcCgYEAuaX47GHvHj+V3EUde+JKX0zwvkPwgeIvGPBqLwzVS8UlkDiEc4s9 +MfDx1tCfd7oD31bFNlZUI9N4cTTfNUN9eUzC9G2gjg5dfURD8B96uPZ0YxkU8kAi +ArdK2G+VtfdtN9carcrECRslnR+RR8KtH3Qyujl+7lPhYklUYZu3pW8= -----END RSA PRIVATE KEY----- diff --git a/test/common/tls/ocsp/test_data/revoked_ocsp_req.der b/test/common/tls/ocsp/test_data/revoked_ocsp_req.der index 537232509bcaefacd59f9382a148f0b99e795394..11897dafb21d11d1770745b1cf9ca3373000543d 100644 GIT binary patch delta 45 zcmV+|0Mh?zYLG1yNVgBD;`xi>dxG-bIG-{s{P-NpkwF;{|NR|^y^$)8Rix!WtH@de D6h;>k delta 45 zcmV+|0Mh?zYLG1yoXj7Mkf838-X!Q4U`ao|!_`)akwF;{$29|&gr!#W$l2YYk}0it D^0yX@ diff --git a/test/common/tls/ocsp/test_data/revoked_ocsp_resp.der b/test/common/tls/ocsp/test_data/revoked_ocsp_resp.der index 7b1f2ff1a45aef7af06e334c3cea60cf6cdf317e..c10dabdfd1c2501d0113bb455528755b55ae7d61 100644 GIT binary patch delta 1078 zcmZ3<+XQEOar-`9~k&&T^ zslmjRI+h;W`Byyp+5M=x>C-)n`9?Z_e#o3=ViI6nC@8^iWMBkWYitmODlnOkQKJ6; zU)hem6Sew6mppY?eIkm*fR~L^tIebBJ1-+6H!A~k6C)$Tyg8qIrA38X8QNgK>X{#ZC4pR-MC;{B@Q`pXpOG#&^J|C6Bwk_Z9ie6&A zcUL$31aExhs%I>w2h-2h=Nj!om=%@%O4qWq zTK`Z-;Cr_-*N)v`+5K&!P}#{J)gKP;@w~Kb`BumEzuKODoG+@@dqDm8Plfqn3!0cO z7&I}T0pb$|O-vgWFf%bSF>x|n6EIF&!gqT8=$5aBy_xairbB&9`lk;W>Z=16CT!(cyV8AW?}S^K zTWq_dl@$!rZ|XW-b9Xqb1T#t5=nVW6iF_C$JyVZOazUq<| z2U#ie6IyNI_br?MW?bIxrS|;X!R3GNa!!|g`s&I*ef)Te@_qSyJ z7t>Wp-t}<(MQ=AwCT2zk#>L47i3YN4%%QS;EMhDo*ix{8JV;uZMZ!R=0jq+^Usz1* zS1y~MQZjqCAEweTi*Dva9GSao-(8Q zh}yc%TGLx!Hi~rcn_W?@Oua6eW!>wcaDV3uAJ)O>1%Eob-TVLLwp0{-ue4~OT1*w(A4?AuP0LB zO!fz>p7%36;};6s|E^5PNw?wIGWpTV&WD%l+ty4}@SXf%%KwJ7y|;7S`yHg+C&ii9 zyzaLRES_}C=+5fyMxM2)OIzZ)mz*%$@7KAw@d``U&jr6jX8u1ld$GIgx2O$#PmRod Qwika+d9&SQJJX$h0FE=;OaK4? delta 1082 zcmbQovyw-{povYDi;-bL6Pp~6DaFRA&Bn;e%5K2O$kN2d4HRNGXkrvtSUj1BxtLFa z-^jqo$k4#Z7)Y5+T&ZI@=Zt*sgaz*=-BWoXk>F{+@9@>IP9`P+#)X2YYK;w|Pz5IQ zF-p`QH)WpQvNY_=iJNy9PSRXkVZh7AsnzDu_MMlJk(-r)xrvdHK~KTq%Td)YVQfF$ zTy9I2G}wNQ-+Y7j?ZH^BxBovZo-A6oclp17HCKYa{khk3{w{~c8&`h$yQ?>5>=t!7 z**I6f`Q_=*S3h1~lav!@ig=k9Heu6+4<20e0#|G=aIOF0;T`vA2lIkg3nm(Ty*z!A zz)#jKLgufoWbBAtD#!o%g`=$T&Z={Z{{{pB%s6w(@!qX< zT|e(K)qV(xzH_qT1fRChkvOJ*@1!5i+`)gA`J7Ils9?TAWc9i0UTv4oEoEJx{H0(C zzgc6-`xz`!veW!Oas=}HtueO$o6qq0>#+jQ^J2CPmkvdGML(STrb$;Ti*2{%xu?d{ zS~o3dV!mzA#C#oyFB>#5?Owpl#K^=XBGFQ17FPN$W_9}H+8t{bTx7cT)M#=RQ@a#A zf{ZMq#CeTOfbj*2HWMSu$=u9S>-QFFb&DUE^}ylrrb$juIv*}E{nZ<~pRq^b=caq@ zGxBW1_Wm}1*}Tf)ey-T%%{}MxJ~1rW|1lt_fZOPd(vA3~kK2EDZ)(loG3BUS7B}yb z(1Zo2wWhh$zcidZ?@NJeWOHWBwbdv8?%MNAtzyknFQz;VenGc~6&twyoj*^QmFM`k zKJ#tlRIyZNHxA|!N0F#XnCx&w6@IMg1=Mms7qZn@MMEWbhI>%PVe@xrkBP zTsb=G;u#4(hCACHbKSFFoOq+SeA}mKJ1X`sFl36#p1goX#1vb~HIQdx4wY4AkuVTz z5W%Kk@=F%edX_KyY8D;yw7m08DN*FRRI=Bz#utTG4(n7nMLs+sYh#zQ%f#0x@Xc-4 ztD!S4uKIUW_t<8+D1DKs8xF0~+3>aJVEas-B)Ju}7q;z_w|Hvt@*}r7+ggihM*DpA zcdkC;#6D*g)APUOmn|LJ7!#R)@|ZHu>zU$jp^?d9S$uo)oR>oN`&#}V)QS1}GcfjU zA#Ok!{;g|kYtdpESH-9jmYJy!KQlXiTc-E-Vnd&%NJN${ ztDK% Dklqn; delta 45 zcmd1GnxHH4dI>9!=5CS3Ii2@sS&8W7*cPXAOmvhKSdzFpIU!clWwuXs-n+obe*laX B5;_0? diff --git a/test/common/tls/ocsp/test_data/unknown_ocsp_resp.der b/test/common/tls/ocsp/test_data/unknown_ocsp_resp.der index bba2aa70252516b96cc75e39b8820fdebad7635d..151dfe345e8c4b441cedf0bb144d8b27d781c03c 100644 GIT binary patch delta 1145 zcmbQn+s&(F(8Six#mKOriLC+1tYPESW@BV!WjA1CWNBi{1qx+ORO;b0F*GnTGBhzY zn7Cc1UhazFq{+39`P(-|uHi~`JT4&Rp3TH0z|h1X!Ea<>1XpWp5VcU*K+!-RVJH)e z5Q{*dg7^jvALh-ScTaC)HvP$Oz{|#|)#lOmotKf3o0WmNiII_E$)j_8``6wN+u*wN z#r4RqoK`G9Q}*>$R!p6%UBA@T@9>&b=VSZkwlsc;uFyzm2uzHM+w3_#;i{9+nTH29 zYV@57__820c)FX*ySY94CEdOsZvU71u3SIpui)kHQ>0~YCW~#4Ur=BwDyb3fsl0Bg za@+H3hQE3%C3p4y=H$xV^5x6BSG&`$Zwy^u-Td^z-3jM>UdF_`>(~GDU%)Y;KHFoD zr{dg+x;<0(bFU2fyl3^1a&y6qts$y!DwLzrk2MP)Vlqsh=GM10eB#=w_Rg()#W!xd zr+-1ja0B=EH;Z>U?|oNv{p>yUU8PAyXBnl|@Y&}_b?7v&I-or5mHp-0u@&>Y)~d#q zE@)zLFlb`20b&b-CT4{N%uI|-Oq>jT>`K7~70>qFn_R@yE`c1_;=D#?uy~p*$h@Tf zqV>we&3rqx6+b<2TWh4Oo9p^-gN=rs%YONndI!#ArL?E0Z;z645$ET7EjsDBT>quN z+3kpv`r51G?IGfeB}O%xL;WXa7B2~FpU;^Xp?J!k9e z?QW-TKlPr|Tu0{jozvFVoSrL|t0t%@)#Gimy@NlmcYcP`wvrf4-z(WhdI@RA6W1C# z{qeZuv0eI8Jv;v<%jt|h*{$1l9WK6f`9KOsJ?orI+Z73G^VivQ*`HypUmPvX-XwBx z+O;x{hx23V)lCH>Pd6u;e4f8`ljjCzF^S~|O(wE0Fe~nMtmc_@=-v65A7WNte)9je z-m1ek@`C&vvo21_Wy|C=x!QPEgPGUTYokl%p1U8cG?p=U@NMGx+Ud4o^4j$qcA1IC t|MqsjV;2)M)ph@6CKdC3Hnu*YV>V}|y;x$>;_83;TdM$vUO!WI4**gE-LL=v delta 1156 zcmeC?oyMzV(8M;0i;-bL6I(Zs+0MqP&Bn;e%5K2O$kN1C0Te2ksMN!0WN2VyY+z($ zGI6_3{p%&HJes>j8s~K0pJgSYmt$L;&cVbaz|h1X!EXdq1XF8l5VcU*K+!-RVJH)e z5R1T)#MQ|Ov6?QkeX8@`1y25Bz{|#|)#lOmotKf3o0WmNiII^(zB|Kh5l3ChhL0;V zHeI@5zuTc@cUN)jT$YHR_1Dxt1ZAu^V|)BT^zx=Fhdwo~%NE$2bV9f2i%mmomC#w? zrM1Qer;}p%r(Rj@?Hl}aJFor@Jzs}l-Q%;K?1|9cYqHGL@()Ygdc#?!PE7M-UwG~Q z(A@VYP*(ox!>dhOUa1{gcP9H|3{P)}Av6CYqe+v`ie~GTnEHK^64|)-?d-hz##kE} z?uQ~L&j)7Rv}f>B4m|bNQ~7B6A`aogZ$0bsxl5jLZQXG(pq=p~gVFgte{qaqx72Q*ezA(fI-@3BOTCrJL(pb( zpVcgV{*@h%XWR)}zGZ%dH6O#mmq{-!HqK%`A>y!Pcm4sb&0l?#=igSWJ>}f2{J2{? z#mQFWQ0uR=J%6RWLN`omKHeaFNO^zC9gmFPOpb2s;uKelxO=Bq0#2vSZA%xoP~Egbs?kAv= zpI%y!)R#Qvj%dQExBeeH}t^XgZ%=&irs3YE;|_?#cHD{`MzDX)FGYo=97 zz?7|h!nZn=B>p(h`rz3fb!^YSxm&ER+a3Bk^~l;6`w!cdOQ+7bQsgOjN>1tN4G)Ih z1Sv~hEq-1*@8j(GN!H>)%pIX)SwuE&nZ)-MxaZ_l5bgo}If>gw7XjJgO$Yeto7# z!oj$(TNkQ5^7yxxZv3$3T!MR5`C^a7ZzbPcT+i7jICIwX%`0`A=N`-YBi^sMV5Z!8 Jn^2}5Rsc8W?6Lp= From 30173052c37d984bc51b76aab5de86d144956d77 Mon Sep 17 00:00:00 2001 From: phlax Date: Tue, 22 Oct 2024 17:48:47 +0100 Subject: [PATCH 03/41] ocsp/formatting: Fix format issue in generated cert (#36763) Signed-off-by: Ryan Northey --- test/common/tls/ocsp/test_data/good_ocsp_resp_details.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/common/tls/ocsp/test_data/good_ocsp_resp_details.txt b/test/common/tls/ocsp/test_data/good_ocsp_resp_details.txt index 8b7581091f..515cc8b104 100644 --- a/test/common/tls/ocsp/test_data/good_ocsp_resp_details.txt +++ b/test/common/tls/ocsp/test_data/good_ocsp_resp_details.txt @@ -15,7 +15,7 @@ OCSP Response Data: Next Update: Oct 22 14:50:30 2026 GMT Response Extensions: - OCSP Nonce: + OCSP Nonce: 0410D26A9562C852A29C61A0799E51252A7A Signature Algorithm: sha256WithRSAEncryption a3:43:04:dc:64:84:b0:b4:81:ef:58:40:50:e1:69:10:ed:4a: @@ -68,9 +68,9 @@ Certificate: 46:09 Exponent: 65537 (0x10001) X509v3 extensions: - X509v3 Subject Key Identifier: + X509v3 Subject Key Identifier: 48:B7:0F:A8:E2:F9:8B:E2:7B:82:F2:DE:38:9F:32:2C:FC:F8:1C:CB - X509v3 Authority Key Identifier: + X509v3 Authority Key Identifier: keyid:48:B7:0F:A8:E2:F9:8B:E2:7B:82:F2:DE:38:9F:32:2C:FC:F8:1C:CB X509v3 Basic Constraints: critical From 2cdea999f68f984d274a264c8160b68f541d8345 Mon Sep 17 00:00:00 2001 From: phlax Date: Tue, 22 Oct 2024 19:22:41 +0100 Subject: [PATCH 04/41] ci/rbe: Switch rbe pools `2core` -> `6gig` (#36761) Signed-off-by: Ryan Northey Signed-off-by: phlax --- contrib/checksum/filters/http/test/BUILD | 4 +- .../filters/network/test/BUILD | 4 +- contrib/config/test/BUILD | 2 +- .../cryptomb/private_key_providers/test/BUILD | 2 +- contrib/dlb/test/BUILD | 2 +- contrib/dynamo/filters/http/test/BUILD | 2 +- contrib/exe/BUILD | 4 +- .../generic_proxy/filters/network/test/BUILD | 12 +- .../filters/network/test/codecs/dubbo/BUILD | 2 +- .../filters/network/test/codecs/http1/BUILD | 2 +- .../filters/network/test/codecs/kafka/BUILD | 2 +- .../filters/network/test/mocks/BUILD | 2 +- .../filters/network/test/router/BUILD | 2 +- contrib/golang/filters/http/test/BUILD | 10 +- contrib/golang/filters/network/test/BUILD | 6 +- .../router/cluster_specifier/test/BUILD | 2 +- .../matching/input_matchers/test/BUILD | 2 +- contrib/hyperscan/regex_engines/test/BUILD | 4 +- contrib/kafka/filters/network/source/BUILD | 2 +- .../kafka/filters/network/test/broker/BUILD | 4 +- contrib/kafka/filters/network/test/mesh/BUILD | 4 +- contrib/language/filters/http/test/BUILD | 4 +- .../mysql_proxy/filters/network/test/BUILD | 2 +- .../postgres_proxy/filters/network/test/BUILD | 2 +- .../compression/qatzip/compressor/test/BUILD | 2 +- .../compression/qatzstd/compressor/test/BUILD | 2 +- contrib/qat/private_key_providers/test/BUILD | 4 +- .../rocketmq_proxy/filters/network/test/BUILD | 12 +- contrib/sip_proxy/filters/network/test/BUILD | 10 +- contrib/squash/filters/http/test/BUILD | 6 +- contrib/sxg/filters/http/test/BUILD | 4 +- source/common/listener_manager/BUILD | 2 +- source/common/upstream/BUILD | 4 +- source/exe/BUILD | 8 +- source/server/BUILD | 2 +- source/server/config_validation/BUILD | 2 +- test/common/access_log/BUILD | 4 +- test/common/api/BUILD | 2 +- test/common/buffer/BUILD | 18 +- test/common/common/BUILD | 112 +++++----- test/common/config/BUILD | 32 +-- test/common/conn_pool/BUILD | 2 +- test/common/crypto/BUILD | 6 +- test/common/event/BUILD | 6 +- test/common/filesystem/BUILD | 6 +- test/common/filter/BUILD | 2 +- test/common/formatter/BUILD | 8 +- test/common/grpc/BUILD | 26 +-- test/common/html/BUILD | 2 +- test/common/http/BUILD | 70 +++--- test/common/http/http1/BUILD | 8 +- test/common/http/http2/BUILD | 22 +- test/common/http/http3/BUILD | 2 +- test/common/http/matching/BUILD | 4 +- test/common/init/BUILD | 6 +- test/common/io/BUILD | 8 +- test/common/json/BUILD | 12 +- test/common/listener_manager/BUILD | 12 +- test/common/local_info/BUILD | 2 +- test/common/local_reply/BUILD | 2 +- test/common/matcher/BUILD | 12 +- test/common/memory/BUILD | 6 +- test/common/network/BUILD | 62 +++--- test/common/network/dns_resolver/BUILD | 2 +- test/common/protobuf/BUILD | 12 +- test/common/quic/BUILD | 40 ++-- test/common/quic/platform/BUILD | 2 +- test/common/rds/BUILD | 2 +- test/common/router/BUILD | 52 ++--- test/common/runtime/BUILD | 8 +- test/common/secret/BUILD | 4 +- test/common/shared_pool/BUILD | 2 +- test/common/signal/BUILD | 4 +- test/common/singleton/BUILD | 4 +- test/common/ssl/matching/BUILD | 4 +- test/common/stats/BUILD | 50 ++--- test/common/stream_info/BUILD | 12 +- test/common/tcp/BUILD | 4 +- test/common/tcp_proxy/BUILD | 6 +- test/common/thread_local/BUILD | 2 +- test/common/tls/BUILD | 14 +- test/common/tls/cert_validator/BUILD | 8 +- test/common/tls/integration/BUILD | 4 +- test/common/tls/ocsp/BUILD | 4 +- test/common/tracing/BUILD | 10 +- test/common/upstream/BUILD | 54 ++--- test/common/watchdog/BUILD | 4 +- test/common/websocket/BUILD | 2 +- test/config_test/BUILD | 4 +- test/dependencies/BUILD | 2 +- test/exe/BUILD | 16 +- test/extensions/access_loggers/common/BUILD | 4 +- test/extensions/access_loggers/file/BUILD | 2 +- test/extensions/access_loggers/fluentd/BUILD | 6 +- test/extensions/access_loggers/grpc/BUILD | 14 +- .../access_loggers/open_telemetry/BUILD | 12 +- test/extensions/access_loggers/stream/BUILD | 4 +- test/extensions/access_loggers/wasm/BUILD | 2 +- .../bootstrap/internal_listener/BUILD | 8 +- test/extensions/bootstrap/wasm/BUILD | 8 +- test/extensions/clusters/aggregate/BUILD | 6 +- test/extensions/clusters/common/BUILD | 4 +- .../clusters/dynamic_forward_proxy/BUILD | 2 +- test/extensions/clusters/eds/BUILD | 6 +- test/extensions/clusters/logical_dns/BUILD | 2 +- test/extensions/clusters/original_dst/BUILD | 2 +- test/extensions/clusters/redis/BUILD | 8 +- test/extensions/common/async_files/BUILD | 8 +- test/extensions/common/aws/BUILD | 18 +- test/extensions/common/dubbo/BUILD | 10 +- .../common/dynamic_forward_proxy/BUILD | 4 +- test/extensions/common/matcher/BUILD | 4 +- test/extensions/common/proxy_protocol/BUILD | 4 +- test/extensions/common/redis/BUILD | 2 +- test/extensions/common/tap/BUILD | 4 +- test/extensions/common/wasm/BUILD | 16 +- .../compression/brotli/compressor/BUILD | 2 +- .../compression/brotli/decompressor/BUILD | 2 +- test/extensions/compression/gzip/BUILD | 2 +- .../compression/gzip/compressor/BUILD | 2 +- .../compression/gzip/decompressor/BUILD | 2 +- test/extensions/compression/zstd/BUILD | 2 +- .../compression/zstd/compressor/BUILD | 2 +- .../compression/zstd/decompressor/BUILD | 2 +- .../config/validators/minimum_clusters/BUILD | 6 +- .../config_subscription/common/BUILD | 4 +- .../config_subscription/filesystem/BUILD | 2 +- .../extensions/config_subscription/grpc/BUILD | 26 +-- .../extensions/config_subscription/rest/BUILD | 2 +- test/extensions/filters/common/expr/BUILD | 6 +- .../extensions/filters/common/ext_authz/BUILD | 6 +- test/extensions/filters/common/fault/BUILD | 2 +- .../filters/common/local_ratelimit/BUILD | 2 +- test/extensions/filters/common/lua/BUILD | 4 +- .../filters/common/mutation_rules/BUILD | 2 +- .../filters/common/original_src/BUILD | 2 +- .../extensions/filters/common/ratelimit/BUILD | 2 +- test/extensions/filters/common/rbac/BUILD | 6 +- .../filters/common/set_filter_state/BUILD | 2 +- .../filters/http/adaptive_concurrency/BUILD | 4 +- .../adaptive_concurrency/controller/BUILD | 2 +- .../filters/http/admission_control/BUILD | 10 +- .../http/alternate_protocols_cache/BUILD | 4 +- test/extensions/filters/http/aws_lambda/BUILD | 8 +- .../filters/http/aws_request_signing/BUILD | 6 +- .../filters/http/bandwidth_limit/BUILD | 4 +- test/extensions/filters/http/basic_auth/BUILD | 6 +- test/extensions/filters/http/buffer/BUILD | 6 +- test/extensions/filters/http/cache/BUILD | 22 +- test/extensions/filters/http/cdn_loop/BUILD | 12 +- test/extensions/filters/http/common/BUILD | 6 +- .../extensions/filters/http/common/fuzz/BUILD | 4 +- test/extensions/filters/http/composite/BUILD | 4 +- test/extensions/filters/http/compressor/BUILD | 12 +- .../filters/http/connect_grpc_bridge/BUILD | 8 +- test/extensions/filters/http/cors/BUILD | 4 +- .../filters/http/credential_injector/BUILD | 4 +- test/extensions/filters/http/csrf/BUILD | 4 +- .../filters/http/custom_response/BUILD | 6 +- .../filters/http/decompressor/BUILD | 4 +- .../filters/http/dynamic_forward_proxy/BUILD | 6 +- test/extensions/filters/http/ext_authz/BUILD | 12 +- test/extensions/filters/http/ext_proc/BUILD | 22 +- test/extensions/filters/http/fault/BUILD | 6 +- .../filters/http/file_system_buffer/BUILD | 6 +- test/extensions/filters/http/gcp_authn/BUILD | 8 +- test/extensions/filters/http/geoip/BUILD | 6 +- .../filters/http/grpc_field_extraction/BUILD | 6 +- .../message_converter/BUILD | 6 +- .../filters/http/grpc_http1_bridge/BUILD | 6 +- .../http/grpc_http1_reverse_bridge/BUILD | 6 +- .../filters/http/grpc_json_transcoder/BUILD | 12 +- test/extensions/filters/http/grpc_stats/BUILD | 2 +- test/extensions/filters/http/grpc_web/BUILD | 6 +- .../filters/http/header_mutation/BUILD | 6 +- .../filters/http/header_to_metadata/BUILD | 4 +- .../filters/http/health_check/BUILD | 6 +- test/extensions/filters/http/ip_tagging/BUILD | 4 +- .../filters/http/json_to_metadata/BUILD | 6 +- test/extensions/filters/http/jwt_authn/BUILD | 26 +-- .../filters/http/kill_request/BUILD | 8 +- .../filters/http/local_ratelimit/BUILD | 6 +- test/extensions/filters/http/lua/BUILD | 8 +- .../filters/http/match_delegate/BUILD | 4 +- test/extensions/filters/http/oauth2/BUILD | 8 +- test/extensions/filters/http/on_demand/BUILD | 6 +- .../filters/http/original_src/BUILD | 6 +- .../filters/http/rate_limit_quota/BUILD | 8 +- test/extensions/filters/http/ratelimit/BUILD | 8 +- test/extensions/filters/http/rbac/BUILD | 8 +- test/extensions/filters/http/router/BUILD | 4 +- .../filters/http/set_filter_state/BUILD | 2 +- .../filters/http/set_metadata/BUILD | 4 +- .../filters/http/stateful_session/BUILD | 6 +- test/extensions/filters/http/tap/BUILD | 6 +- .../filters/http/thrift_to_metadata/BUILD | 6 +- test/extensions/filters/http/wasm/BUILD | 2 +- .../filters/listener/common/fuzz/BUILD | 4 +- .../filters/listener/http_inspector/BUILD | 8 +- .../filters/listener/local_ratelimit/BUILD | 4 +- .../filters/listener/original_dst/BUILD | 6 +- .../filters/listener/original_src/BUILD | 8 +- .../filters/listener/proxy_protocol/BUILD | 6 +- .../filters/listener/tls_inspector/BUILD | 8 +- .../filters/network/common/fuzz/BUILD | 8 +- .../filters/network/common/redis/BUILD | 6 +- .../filters/network/connection_limit/BUILD | 4 +- .../filters/network/direct_response/BUILD | 4 +- .../filters/network/dubbo_proxy/BUILD | 28 +-- test/extensions/filters/network/echo/BUILD | 2 +- .../filters/network/ext_authz/BUILD | 6 +- .../network/http_connection_manager/BUILD | 6 +- .../filters/network/local_ratelimit/BUILD | 6 +- .../filters/network/mongo_proxy/BUILD | 10 +- .../filters/network/ratelimit/BUILD | 4 +- test/extensions/filters/network/rbac/BUILD | 6 +- .../filters/network/redis_proxy/BUILD | 14 +- .../filters/network/set_filter_state/BUILD | 2 +- .../filters/network/sni_cluster/BUILD | 2 +- .../network/sni_dynamic_forward_proxy/BUILD | 4 +- .../filters/network/tcp_proxy/BUILD | 2 +- .../filters/network/thrift_proxy/BUILD | 50 ++--- .../network/thrift_proxy/filters/BUILD | 2 +- .../filters/header_to_metadata/BUILD | 4 +- .../filters/payload_to_metadata/BUILD | 4 +- .../thrift_proxy/filters/ratelimit/BUILD | 4 +- test/extensions/filters/network/wasm/BUILD | 4 +- .../filters/network/zookeeper_proxy/BUILD | 4 +- test/extensions/filters/udp/dns_filter/BUILD | 8 +- test/extensions/filters/udp/udp_proxy/BUILD | 10 +- .../udp/udp_proxy/session_filters/BUILD | 2 +- .../dynamic_forward_proxy/BUILD | 4 +- .../session_filters/http_capsule/BUILD | 4 +- test/extensions/formatter/cel/BUILD | 2 +- test/extensions/formatter/metadata/BUILD | 2 +- .../formatter/req_without_query/BUILD | 2 +- test/extensions/geoip_providers/maxmind/BUILD | 4 +- .../extensions/grpc_credentials/aws_iam/BUILD | 2 +- .../file_based_metadata/BUILD | 2 +- .../health_check/event_sinks/file/BUILD | 2 +- test/extensions/health_checkers/redis/BUILD | 4 +- test/extensions/health_checkers/thrift/BUILD | 8 +- .../http/cache/file_system_http_cache/BUILD | 6 +- .../http/cache/simple_http_cache/BUILD | 2 +- .../http/credential_injector/generic/BUILD | 2 +- .../http/credential_injector/oauth2/BUILD | 6 +- .../header_mutation/BUILD | 6 +- .../header_formatters/preserve_case/BUILD | 8 +- .../header_validators/envoy_default/BUILD | 16 +- .../original_ip_detection/custom_header/BUILD | 4 +- .../http/original_ip_detection/xff/BUILD | 4 +- .../http/stateful_session/cookie/BUILD | 4 +- .../http/stateful_session/header/BUILD | 4 +- test/extensions/internal_redirect/BUILD | 2 +- .../internal_redirect/previous_routes/BUILD | 2 +- test/extensions/io_socket/user_space/BUILD | 6 +- test/extensions/key_value/file_based/BUILD | 4 +- .../cluster_provided/BUILD | 4 +- .../load_balancing_policies/common/BUILD | 6 +- .../least_request/BUILD | 12 +- .../load_balancing_policies/maglev/BUILD | 10 +- .../load_balancing_policies/random/BUILD | 12 +- .../load_balancing_policies/ring_hash/BUILD | 8 +- .../load_balancing_policies/round_robin/BUILD | 10 +- .../load_balancing_policies/subset/BUILD | 8 +- .../matching/actions/format_string/BUILD | 2 +- .../common_inputs/environment_variable/BUILD | 4 +- .../matching/input_matchers/cel_matcher/BUILD | 2 +- .../input_matchers/consistent_hashing/BUILD | 4 +- .../matching/input_matchers/ip/BUILD | 4 +- .../input_matchers/runtime_fraction/BUILD | 4 +- test/extensions/matching/network/common/BUILD | 4 +- .../network/dns_resolver/apple/BUILD | 2 +- .../network/dns_resolver/cares/BUILD | 2 +- .../network/dns_resolver/getaddrinfo/BUILD | 2 +- test/extensions/path/match/uri_template/BUILD | 4 +- .../path/rewrite/uri_template/BUILD | 4 +- test/extensions/path/uri_template_lib/BUILD | 6 +- .../quic/connection_id_generator/BUILD | 2 +- .../quic/server_preferred_address/BUILD | 4 +- .../rate_limit_descriptors/expr/BUILD | 2 +- test/extensions/request_id/uuid/BUILD | 2 +- .../downstream_connections/BUILD | 6 +- .../resource_monitors/fixed_heap/BUILD | 4 +- .../resource_monitors/injected_resource/BUILD | 6 +- .../retry/host/omit_canary_hosts/BUILD | 2 +- .../retry/host/omit_host_metadata/BUILD | 2 +- .../retry/host/previous_hosts/BUILD | 4 +- .../retry/priority/previous_priorities/BUILD | 2 +- .../router/cluster_specifiers/lua/BUILD | 4 +- .../stats_sinks/common/statsd/BUILD | 4 +- test/extensions/stats_sinks/dog_statsd/BUILD | 2 +- .../stats_sinks/graphite_statsd/BUILD | 2 +- test/extensions/stats_sinks/hystrix/BUILD | 6 +- .../stats_sinks/metrics_service/BUILD | 4 +- .../stats_sinks/open_telemetry/BUILD | 6 +- test/extensions/stats_sinks/statsd/BUILD | 2 +- test/extensions/stats_sinks/wasm/BUILD | 4 +- test/extensions/string_matcher/lua/BUILD | 4 +- test/extensions/tracers/common/ot/BUILD | 1 + test/extensions/tracers/datadog/BUILD | 2 +- test/extensions/tracers/dynamic_ot/BUILD | 2 + test/extensions/tracers/opencensus/BUILD | 4 +- test/extensions/tracers/opentelemetry/BUILD | 12 +- .../opentelemetry/resource_detectors/BUILD | 2 +- .../resource_detectors/dynatrace/BUILD | 6 +- .../resource_detectors/environment/BUILD | 6 +- .../resource_detectors/static/BUILD | 6 +- .../tracers/opentelemetry/samplers/BUILD | 2 +- .../opentelemetry/samplers/always_on/BUILD | 6 +- .../opentelemetry/samplers/dynatrace/BUILD | 6 +- test/extensions/tracers/skywalking/BUILD | 10 +- test/extensions/tracers/xray/BUILD | 6 +- test/extensions/tracers/zipkin/BUILD | 4 +- test/extensions/transport_sockets/alts/BUILD | 18 +- .../extensions/transport_sockets/common/BUILD | 2 +- .../transport_sockets/http_11_proxy/BUILD | 4 +- .../transport_sockets/internal_upstream/BUILD | 4 +- .../transport_sockets/proxy_protocol/BUILD | 4 +- .../transport_sockets/starttls/BUILD | 6 +- test/extensions/transport_sockets/tap/BUILD | 4 +- .../transport_sockets/tcp_stats/BUILD | 4 +- .../tls/cert_validator/spiffe/BUILD | 4 +- .../udp_packet_writer/default/BUILD | 2 +- test/extensions/udp_packet_writer/gso/BUILD | 2 +- test/extensions/upstreams/http/BUILD | 2 +- test/extensions/upstreams/http/generic/BUILD | 2 +- test/extensions/upstreams/http/tcp/BUILD | 2 +- test/extensions/upstreams/http/udp/BUILD | 4 +- test/extensions/upstreams/tcp/generic/BUILD | 2 +- test/extensions/watchdog/profile_action/BUILD | 4 +- test/fuzz/BUILD | 4 +- test/integration/BUILD | 206 +++++++++--------- test/integration/admin_html/BUILD | 4 +- test/integration/python/BUILD | 2 +- test/mocks/grpc/BUILD | 2 +- test/mocks/http/BUILD | 6 +- test/mocks/network/BUILD | 4 +- test/mocks/router/BUILD | 4 +- test/mocks/server/BUILD | 20 +- test/mocks/stream_info/BUILD | 2 +- test/mocks/tcp/BUILD | 2 +- test/mocks/upstream/BUILD | 8 +- test/server/BUILD | 42 ++-- test/server/admin/BUILD | 42 ++-- test/server/config_validation/BUILD | 14 +- test/test_common/BUILD | 12 +- test/tools/config_load_check/BUILD | 2 +- test/tools/router_check/BUILD | 4 +- test/tools/router_check/test/BUILD | 4 +- test/tools/schema_validator/BUILD | 2 +- test/tools/schema_validator/test/BUILD | 2 +- test/tools/type_whisperer/BUILD | 2 +- 353 files changed, 1334 insertions(+), 1331 deletions(-) diff --git a/contrib/checksum/filters/http/test/BUILD b/contrib/checksum/filters/http/test/BUILD index 28f51df99b..f4647a622f 100644 --- a/contrib/checksum/filters/http/test/BUILD +++ b/contrib/checksum/filters/http/test/BUILD @@ -11,7 +11,7 @@ envoy_contrib_package() envoy_cc_test( name = "checksum_filter_test", srcs = ["checksum_filter_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//contrib/checksum/filters/http/source:checksum_filter_lib", "//source/common/buffer:buffer_lib", @@ -26,7 +26,7 @@ envoy_cc_test( envoy_cc_test( name = "config_test", srcs = ["config_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//contrib/checksum/filters/http/source:config", "//test/mocks/server:factory_context_mocks", diff --git a/contrib/client_ssl_auth/filters/network/test/BUILD b/contrib/client_ssl_auth/filters/network/test/BUILD index 090144f029..9ef60b6f37 100644 --- a/contrib/client_ssl_auth/filters/network/test/BUILD +++ b/contrib/client_ssl_auth/filters/network/test/BUILD @@ -12,7 +12,7 @@ envoy_cc_test( name = "client_ssl_auth_test", srcs = ["client_ssl_auth_test.cc"], data = glob(["test_data/**"]), - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//contrib/client_ssl_auth/filters/network/source:client_ssl_auth", "//test/mocks/network:network_mocks", @@ -29,7 +29,7 @@ envoy_cc_test( envoy_cc_test( name = "config_test", srcs = ["config_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//contrib/client_ssl_auth/filters/network/source:config", "//source/common/protobuf:utility_lib", diff --git a/contrib/config/test/BUILD b/contrib/config/test/BUILD index abfd044846..4aa48a23bf 100644 --- a/contrib/config/test/BUILD +++ b/contrib/config/test/BUILD @@ -39,7 +39,7 @@ envoy_cc_test( data = [ "//test/config/integration/certs", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":invalid_proto_kv_store_config_proto_cc_proto", "//contrib/config/source:kv_store_xds_delegate", diff --git a/contrib/cryptomb/private_key_providers/test/BUILD b/contrib/cryptomb/private_key_providers/test/BUILD index 490c4ad5aa..75f1c52e6b 100644 --- a/contrib/cryptomb/private_key_providers/test/BUILD +++ b/contrib/cryptomb/private_key_providers/test/BUILD @@ -50,7 +50,7 @@ envoy_cc_test( data = [ "//contrib/cryptomb/private_key_providers/test/test_data:certs", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":test_fake_factory", "//source/common/common:random_generator_lib", diff --git a/contrib/dlb/test/BUILD b/contrib/dlb/test/BUILD index 6239630e0a..7672f38cd6 100644 --- a/contrib/dlb/test/BUILD +++ b/contrib/dlb/test/BUILD @@ -14,7 +14,7 @@ envoy_cc_test( "//bazel:linux_x86_64": ["config_test.cc"], "//conditions:default": [], }), - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//contrib/dlb/source:connection_balancer", "//source/common/protobuf:utility_lib", diff --git a/contrib/dynamo/filters/http/test/BUILD b/contrib/dynamo/filters/http/test/BUILD index 1040b43408..cd5a071bc8 100644 --- a/contrib/dynamo/filters/http/test/BUILD +++ b/contrib/dynamo/filters/http/test/BUILD @@ -47,7 +47,7 @@ envoy_cc_test( envoy_cc_test( name = "config_test", srcs = ["config_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//contrib/dynamo/filters/http/source:config", "//test/mocks/server:factory_context_mocks", diff --git a/contrib/exe/BUILD b/contrib/exe/BUILD index 337bda2e03..e9f3c7c266 100644 --- a/contrib/exe/BUILD +++ b/contrib/exe/BUILD @@ -30,7 +30,7 @@ SELECTED_CONTRIB_EXTENSIONS = select({ envoy_cc_binary( name = "envoy-static", - rbe_pool = "2core", + rbe_pool = "6gig", stamped = True, visibility = ["//visibility:public"], deps = ["//source/exe:envoy_main_entry_lib"] + SELECTED_CONTRIB_EXTENSIONS, @@ -48,7 +48,7 @@ envoy_cc_test( "DISABLE_TEST_MERGE": "true", "GODEBUG": "cgocheck=0", }, - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//test/config_test:example_configs_test_lib", ] + SELECTED_CONTRIB_EXTENSIONS, diff --git a/contrib/generic_proxy/filters/network/test/BUILD b/contrib/generic_proxy/filters/network/test/BUILD index 7a33a7331f..1f9ee84eeb 100644 --- a/contrib/generic_proxy/filters/network/test/BUILD +++ b/contrib/generic_proxy/filters/network/test/BUILD @@ -26,7 +26,7 @@ envoy_cc_test( srcs = [ "route_test.cc", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":fake_codec_lib", "//contrib/generic_proxy/filters/network/source:route_lib", @@ -45,7 +45,7 @@ envoy_cc_test( srcs = [ "proxy_test.cc", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":fake_codec_lib", "//contrib/generic_proxy/filters/network/source:proxy_lib", @@ -64,7 +64,7 @@ envoy_cc_test( srcs = [ "config_test.cc", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":fake_codec_lib", "//contrib/generic_proxy/filters/network/source:config", @@ -88,7 +88,7 @@ envoy_cc_test( srcs = [ "integration_test.cc", ], - rbe_pool = "2core", + rbe_pool = "6gig", tags = [ "cpu:3", ], @@ -120,7 +120,7 @@ envoy_cc_test( srcs = [ "match_test.cc", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":fake_codec_lib", "//contrib/generic_proxy/filters/network/source:match_lib", @@ -133,7 +133,7 @@ envoy_cc_test( srcs = [ "access_log_test.cc", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":fake_codec_lib", "//contrib/generic_proxy/filters/network/source:access_log_lib", diff --git a/contrib/generic_proxy/filters/network/test/codecs/dubbo/BUILD b/contrib/generic_proxy/filters/network/test/codecs/dubbo/BUILD index 5675b3ce27..022c627a3c 100644 --- a/contrib/generic_proxy/filters/network/test/codecs/dubbo/BUILD +++ b/contrib/generic_proxy/filters/network/test/codecs/dubbo/BUILD @@ -13,7 +13,7 @@ envoy_cc_test( srcs = [ "config_test.cc", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//contrib/generic_proxy/filters/network/source/codecs/dubbo:config", "//contrib/generic_proxy/filters/network/test/mocks:codec_mocks", diff --git a/contrib/generic_proxy/filters/network/test/codecs/http1/BUILD b/contrib/generic_proxy/filters/network/test/codecs/http1/BUILD index 8207286fbb..b1aa556590 100644 --- a/contrib/generic_proxy/filters/network/test/codecs/http1/BUILD +++ b/contrib/generic_proxy/filters/network/test/codecs/http1/BUILD @@ -13,7 +13,7 @@ envoy_cc_test( srcs = [ "config_test.cc", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//contrib/generic_proxy/filters/network/source/codecs/http1:config", "//contrib/generic_proxy/filters/network/test/mocks:codec_mocks", diff --git a/contrib/generic_proxy/filters/network/test/codecs/kafka/BUILD b/contrib/generic_proxy/filters/network/test/codecs/kafka/BUILD index 5db3124810..13de2ef323 100644 --- a/contrib/generic_proxy/filters/network/test/codecs/kafka/BUILD +++ b/contrib/generic_proxy/filters/network/test/codecs/kafka/BUILD @@ -13,7 +13,7 @@ envoy_cc_test( srcs = [ "config_test.cc", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//contrib/generic_proxy/filters/network/source/codecs/kafka:config", "//contrib/generic_proxy/filters/network/test/mocks:codec_mocks", diff --git a/contrib/generic_proxy/filters/network/test/mocks/BUILD b/contrib/generic_proxy/filters/network/test/mocks/BUILD index 58f5cd0a32..d9edebdf8b 100644 --- a/contrib/generic_proxy/filters/network/test/mocks/BUILD +++ b/contrib/generic_proxy/filters/network/test/mocks/BUILD @@ -12,7 +12,7 @@ envoy_cc_mock( name = "filter_mocks", srcs = ["filter.cc"], hdrs = ["filter.h"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//contrib/generic_proxy/filters/network/source/interface:config_interface", "//contrib/generic_proxy/filters/network/source/interface:filter_interface", diff --git a/contrib/generic_proxy/filters/network/test/router/BUILD b/contrib/generic_proxy/filters/network/test/router/BUILD index cb748f8590..ae04e81175 100644 --- a/contrib/generic_proxy/filters/network/test/router/BUILD +++ b/contrib/generic_proxy/filters/network/test/router/BUILD @@ -13,7 +13,7 @@ envoy_cc_test( srcs = [ "router_test.cc", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//contrib/generic_proxy/filters/network/source/router:router_lib", "//contrib/generic_proxy/filters/network/test:fake_codec_lib", diff --git a/contrib/golang/filters/http/test/BUILD b/contrib/golang/filters/http/test/BUILD index 625fbf831a..a1c068424f 100644 --- a/contrib/golang/filters/http/test/BUILD +++ b/contrib/golang/filters/http/test/BUILD @@ -16,7 +16,7 @@ envoy_cc_test( data = [ "//contrib/golang/filters/http/test/test_data/passthrough:filter.so", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//contrib/golang/filters/http/source:config", "//test/mocks/server:factory_context_mocks", @@ -31,7 +31,7 @@ envoy_cc_test( "//contrib/golang/filters/http/test/test_data/passthrough:filter.so", "//contrib/golang/filters/http/test/test_data/routeconfig:filter.so", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//contrib/golang/filters/http/source:golang_filter_lib", "//source/common/stream_info:stream_info_lib", @@ -62,7 +62,7 @@ envoy_cc_test( "//contrib/golang/filters/http/test/test_data/property:filter.so", "//contrib/golang/filters/http/test/test_data/routeconfig:filter.so", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//contrib/golang/filters/http/source:config", "//source/exe:main_common_lib", @@ -88,7 +88,7 @@ envoy_cc_fuzz_test( name = "golang_filter_fuzz_test", srcs = ["golang_filter_fuzz_test.cc"], corpus = "golang_filter_corpus", - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":golang_filter_fuzz_proto_cc_proto", "//contrib/golang/common/dso/test:dso_mocks", @@ -110,7 +110,7 @@ envoy_cc_test( data = [ "//contrib/golang/filters/http/test/test_data/websocket:filter.so", ], - rbe_pool = "2core", + rbe_pool = "6gig", tags = [ "cpu:3", ], diff --git a/contrib/golang/filters/network/test/BUILD b/contrib/golang/filters/network/test/BUILD index b7c781317d..4f7f50bb6a 100644 --- a/contrib/golang/filters/network/test/BUILD +++ b/contrib/golang/filters/network/test/BUILD @@ -14,7 +14,7 @@ envoy_cc_test( data = [ "//contrib/golang/filters/network/test/test_data:filter.so", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//contrib/golang/filters/network/source:config", "//test/mocks/server:factory_context_mocks", @@ -26,7 +26,7 @@ envoy_cc_test( envoy_cc_test( name = "filter_test", srcs = ["filter_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//contrib/golang/common/dso/test:dso_mocks", "//contrib/golang/filters/network/source:golang", @@ -45,7 +45,7 @@ envoy_cc_test( envoy_cc_test( name = "upstream_test", srcs = ["upstream_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//contrib/golang/common/dso/test:dso_mocks", "//contrib/golang/filters/network/source:upstream", diff --git a/contrib/golang/router/cluster_specifier/test/BUILD b/contrib/golang/router/cluster_specifier/test/BUILD index 00a339d306..6940fd46f5 100644 --- a/contrib/golang/router/cluster_specifier/test/BUILD +++ b/contrib/golang/router/cluster_specifier/test/BUILD @@ -15,7 +15,7 @@ envoy_cc_test( "//contrib/golang/router/cluster_specifier/test/test_data/simple:plugin.so", ], env = {"GODEBUG": "cgocheck=0"}, - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//contrib/golang/router/cluster_specifier/source:config", "//source/exe:main_common_lib", diff --git a/contrib/hyperscan/matching/input_matchers/test/BUILD b/contrib/hyperscan/matching/input_matchers/test/BUILD index e8aa62ddb3..882d127ab9 100644 --- a/contrib/hyperscan/matching/input_matchers/test/BUILD +++ b/contrib/hyperscan/matching/input_matchers/test/BUILD @@ -12,7 +12,7 @@ envoy_contrib_package() envoy_cc_test( name = "config_test", srcs = ["config_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//contrib/hyperscan/matching/input_matchers/source:config", "//test/mocks/server:factory_context_mocks", diff --git a/contrib/hyperscan/regex_engines/test/BUILD b/contrib/hyperscan/regex_engines/test/BUILD index 591bded8ca..e10fda5b1c 100644 --- a/contrib/hyperscan/regex_engines/test/BUILD +++ b/contrib/hyperscan/regex_engines/test/BUILD @@ -11,7 +11,7 @@ envoy_contrib_package() envoy_cc_test( name = "config_test", srcs = ["config_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//contrib/hyperscan/regex_engines/source:config", "//test/mocks/server:factory_context_mocks", @@ -32,7 +32,7 @@ envoy_cc_test( envoy_cc_test( name = "integration_test", srcs = ["integration_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//contrib/hyperscan/regex_engines/source:config", "//test/integration:integration_lib", diff --git a/contrib/kafka/filters/network/source/BUILD b/contrib/kafka/filters/network/source/BUILD index a1c5c45597..330c7db60e 100644 --- a/contrib/kafka/filters/network/source/BUILD +++ b/contrib/kafka/filters/network/source/BUILD @@ -109,7 +109,7 @@ envoy_cc_library( "external/responses.h", "kafka_response_parser.h", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":kafka_response_lib", ":parser_lib", diff --git a/contrib/kafka/filters/network/test/broker/BUILD b/contrib/kafka/filters/network/test/broker/BUILD index 054eb8319d..a76e75f5bb 100644 --- a/contrib/kafka/filters/network/test/broker/BUILD +++ b/contrib/kafka/filters/network/test/broker/BUILD @@ -12,7 +12,7 @@ envoy_contrib_package() envoy_cc_test( name = "config_unit_test", srcs = ["config_unit_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//contrib/kafka/filters/network/source/broker:config_lib", "//test/mocks/server:factory_context_mocks", @@ -22,7 +22,7 @@ envoy_cc_test( envoy_cc_test( name = "filter_unit_test", srcs = ["filter_unit_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//contrib/kafka/filters/network/source/broker:filter_lib", "//envoy/event:timer_interface", diff --git a/contrib/kafka/filters/network/test/mesh/BUILD b/contrib/kafka/filters/network/test/mesh/BUILD index 2b560b6c0a..3185719c6d 100644 --- a/contrib/kafka/filters/network/test/mesh/BUILD +++ b/contrib/kafka/filters/network/test/mesh/BUILD @@ -16,7 +16,7 @@ envoy_contrib_package() envoy_cc_test( name = "config_unit_test", srcs = ["config_unit_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["skip_on_windows"], deps = [ "//contrib/kafka/filters/network/source/mesh:config_lib", @@ -28,7 +28,7 @@ envoy_cc_test( envoy_cc_test( name = "filter_unit_test", srcs = ["filter_unit_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["skip_on_windows"], deps = [ "//contrib/kafka/filters/network/source/mesh:filter_lib", diff --git a/contrib/language/filters/http/test/BUILD b/contrib/language/filters/http/test/BUILD index d38e2637a8..72300022bf 100644 --- a/contrib/language/filters/http/test/BUILD +++ b/contrib/language/filters/http/test/BUILD @@ -11,7 +11,7 @@ envoy_contrib_package() envoy_cc_test( name = "language_config_test", srcs = ["language_config_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//contrib/language/filters/http/source:config_lib", "//test/mocks/server:factory_context_mocks", @@ -23,7 +23,7 @@ envoy_cc_test( envoy_cc_test( name = "language_integration_test", srcs = ["language_integration_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//contrib/language/filters/http/source:config_lib", "//test/integration:http_protocol_integration_lib", diff --git a/contrib/mysql_proxy/filters/network/test/BUILD b/contrib/mysql_proxy/filters/network/test/BUILD index abcfd8323b..5199e70a6b 100644 --- a/contrib/mysql_proxy/filters/network/test/BUILD +++ b/contrib/mysql_proxy/filters/network/test/BUILD @@ -93,7 +93,7 @@ envoy_cc_test( data = [ "mysql_test_config.yaml", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":mysql_test_utils_lib", "//contrib/mysql_proxy/filters/network/source:config", diff --git a/contrib/postgres_proxy/filters/network/test/BUILD b/contrib/postgres_proxy/filters/network/test/BUILD index 5c0c459867..cd20c603e3 100644 --- a/contrib/postgres_proxy/filters/network/test/BUILD +++ b/contrib/postgres_proxy/filters/network/test/BUILD @@ -69,7 +69,7 @@ envoy_cc_test( "postgres_test_config.yaml-template", "//test/config/integration/certs", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":postgres_integration_proto_cc_proto", ":postgres_test_utils_lib", diff --git a/contrib/qat/compression/qatzip/compressor/test/BUILD b/contrib/qat/compression/qatzip/compressor/test/BUILD index 4be6817eb0..661e1f6d80 100644 --- a/contrib/qat/compression/qatzip/compressor/test/BUILD +++ b/contrib/qat/compression/qatzip/compressor/test/BUILD @@ -14,7 +14,7 @@ envoy_cc_test( "//bazel:linux_x86_64": ["qatzip_compressor_impl_test.cc"], "//conditions:default": [], }), - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//contrib/qat/compression/qatzip/compressor/source:config", "//source/extensions/compression/gzip/decompressor:zlib_decompressor_impl_lib", diff --git a/contrib/qat/compression/qatzstd/compressor/test/BUILD b/contrib/qat/compression/qatzstd/compressor/test/BUILD index fb7486c74e..20d6b0dcf8 100644 --- a/contrib/qat/compression/qatzstd/compressor/test/BUILD +++ b/contrib/qat/compression/qatzstd/compressor/test/BUILD @@ -11,7 +11,7 @@ envoy_contrib_package() envoy_cc_test( name = "compressor_test", srcs = ["qatzstd_compressor_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//contrib/qat/compression/qatzstd/compressor/source:config", "//source/extensions/compression/zstd/decompressor:decompressor_lib", diff --git a/contrib/qat/private_key_providers/test/BUILD b/contrib/qat/private_key_providers/test/BUILD index 33007b18a1..b39e32eb84 100644 --- a/contrib/qat/private_key_providers/test/BUILD +++ b/contrib/qat/private_key_providers/test/BUILD @@ -48,7 +48,7 @@ envoy_cc_test( data = [ "//contrib/qat/private_key_providers/test/test_data:certs", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":test_fake_factory", "//source/common/common:random_generator_lib", @@ -71,7 +71,7 @@ envoy_cc_test( data = [ "//contrib/qat/private_key_providers/test/test_data:certs", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":test_fake_factory", "//source/common/tls/private_key:private_key_manager_lib", diff --git a/contrib/rocketmq_proxy/filters/network/test/BUILD b/contrib/rocketmq_proxy/filters/network/test/BUILD index b214135b6d..52533527f0 100644 --- a/contrib/rocketmq_proxy/filters/network/test/BUILD +++ b/contrib/rocketmq_proxy/filters/network/test/BUILD @@ -14,7 +14,7 @@ envoy_cc_mock( name = "mocks_lib", srcs = ["mocks.cc"], hdrs = ["mocks.h"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//contrib/rocketmq_proxy/filters/network/source:config", "//contrib/rocketmq_proxy/filters/network/source/router:router_lib", @@ -43,7 +43,7 @@ envoy_cc_test( envoy_cc_test( name = "router_test", srcs = ["router_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":mocks_lib", ":utility_lib", @@ -66,7 +66,7 @@ envoy_cc_test( envoy_cc_test( name = "conn_manager_test", srcs = ["conn_manager_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":utility_lib", "//test/common/stats:stat_test_utility_lib", @@ -82,7 +82,7 @@ envoy_cc_test( envoy_cc_test( name = "active_message_test", srcs = ["active_message_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":utility_lib", "//contrib/rocketmq_proxy/filters/network/source:config", @@ -97,7 +97,7 @@ envoy_cc_test( envoy_cc_test( name = "config_test", srcs = ["config_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//contrib/rocketmq_proxy/filters/network/source:config", "//test/mocks/local_info:local_info_mocks", @@ -123,7 +123,7 @@ envoy_cc_test( envoy_cc_test( name = "route_matcher_test", srcs = ["route_matcher_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//contrib/rocketmq_proxy/filters/network/source/router:route_matcher", "//test/mocks/server:server_factory_context_mocks", diff --git a/contrib/sip_proxy/filters/network/test/BUILD b/contrib/sip_proxy/filters/network/test/BUILD index 698223deec..145a40b25c 100644 --- a/contrib/sip_proxy/filters/network/test/BUILD +++ b/contrib/sip_proxy/filters/network/test/BUILD @@ -54,7 +54,7 @@ envoy_cc_test( envoy_cc_test( name = "config_test", srcs = ["config_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":mocks", "//contrib/sip_proxy/filters/network/source:config", @@ -68,7 +68,7 @@ envoy_cc_test( envoy_cc_test( name = "conn_manager_test", srcs = ["conn_manager_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":mocks", ":utility_lib", @@ -88,7 +88,7 @@ envoy_cc_test( envoy_cc_test( name = "tra_test", srcs = ["tra_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":mocks", ":utility_lib", @@ -109,7 +109,7 @@ envoy_cc_test( envoy_cc_test( name = "decoder_test", srcs = ["decoder_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":mocks", ":utility_lib", @@ -130,7 +130,7 @@ envoy_cc_test( envoy_cc_test( name = "router_test", srcs = ["router_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":mocks", ":utility_lib", diff --git a/contrib/squash/filters/http/test/BUILD b/contrib/squash/filters/http/test/BUILD index 47ac1a1966..2cfb369337 100644 --- a/contrib/squash/filters/http/test/BUILD +++ b/contrib/squash/filters/http/test/BUILD @@ -11,7 +11,7 @@ envoy_contrib_package() envoy_cc_test( name = "squash_filter_test", srcs = ["squash_filter_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//contrib/squash/filters/http/source:squash_filter_lib", "//envoy/event:dispatcher_interface", @@ -28,7 +28,7 @@ envoy_cc_test( envoy_cc_test( name = "squash_filter_integration_test", srcs = ["squash_filter_integration_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//contrib/squash/filters/http/source:config", "//test/integration:http_integration_lib", @@ -39,7 +39,7 @@ envoy_cc_test( envoy_cc_test( name = "config_test", srcs = ["config_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//contrib/squash/filters/http/source:config", "//test/mocks/server:factory_context_mocks", diff --git a/contrib/sxg/filters/http/test/BUILD b/contrib/sxg/filters/http/test/BUILD index e216da6d55..7180c2b6cf 100644 --- a/contrib/sxg/filters/http/test/BUILD +++ b/contrib/sxg/filters/http/test/BUILD @@ -11,7 +11,7 @@ envoy_contrib_package() envoy_cc_test( name = "filter_test", srcs = ["filter_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["skip_on_windows"], deps = [ "//contrib/sxg/filters/http/source:config", @@ -28,7 +28,7 @@ envoy_cc_test( envoy_cc_test( name = "config_test", srcs = ["config_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["skip_on_windows"], deps = [ "//contrib/sxg/filters/http/source:config", diff --git a/source/common/listener_manager/BUILD b/source/common/listener_manager/BUILD index 400553b42f..0a62947148 100644 --- a/source/common/listener_manager/BUILD +++ b/source/common/listener_manager/BUILD @@ -19,7 +19,7 @@ envoy_cc_library( "listener_impl.h", "listener_manager_impl.h", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":active_raw_udp_listener_config", ":connection_handler_lib", diff --git a/source/common/upstream/BUILD b/source/common/upstream/BUILD index 41d24edc25..aa9335aca2 100644 --- a/source/common/upstream/BUILD +++ b/source/common/upstream/BUILD @@ -78,7 +78,7 @@ envoy_cc_library( name = "cluster_manager_lib", srcs = ["cluster_manager_impl.cc"], hdrs = ["cluster_manager_impl.h"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":cds_api_lib", ":cluster_discovery_manager_lib", @@ -365,7 +365,7 @@ envoy_cc_library( envoy_cc_library( name = "upstream_lib", srcs = ["upstream_impl.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":cluster_factory_lib", ":default_local_address_selector_factory", diff --git a/source/exe/BUILD b/source/exe/BUILD index 950f22cd67..a631af6b20 100644 --- a/source/exe/BUILD +++ b/source/exe/BUILD @@ -29,7 +29,7 @@ envoy_cc_binary( "//bazel:windows_opt_build": ["generate_pdb_file"], "//conditions:default": [], }), - rbe_pool = "2core", + rbe_pool = "6gig", stamped = True, deps = [":envoy_main_entry_lib"], ) @@ -60,7 +60,7 @@ envoy_cc_library( external_deps = [ "abseil_symbolize", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":envoy_main_common_lib", ":platform_impl_lib", @@ -73,7 +73,7 @@ envoy_cc_library( name = "stripped_main_base_lib", srcs = ["stripped_main_base.cc"], hdrs = ["stripped_main_base.h"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":platform_impl_lib", ":process_wide_lib", @@ -107,7 +107,7 @@ envoy_cc_library( hdrs = [ "main_common.h", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = envoy_select_admin_functionality([":admin_response_lib"]) + [ ":platform_impl_lib", ":process_wide_lib", diff --git a/source/server/BUILD b/source/server/BUILD index 9b95b52b8e..1636251f35 100644 --- a/source/server/BUILD +++ b/source/server/BUILD @@ -412,7 +412,7 @@ envoy_cc_library( "abseil_node_hash_map", "abseil_optional", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":api_listener_lib", ":configuration_lib", diff --git a/source/server/config_validation/BUILD b/source/server/config_validation/BUILD index bd60330ba1..6ffccddcd0 100644 --- a/source/server/config_validation/BUILD +++ b/source/server/config_validation/BUILD @@ -64,7 +64,7 @@ envoy_cc_library( srcs = ["server.cc"], hdrs = ["server.h"], external_deps = ["abseil_optional"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":admin_lib", ":api_lib", diff --git a/test/common/access_log/BUILD b/test/common/access_log/BUILD index 59775c77b0..43f1e846e5 100644 --- a/test/common/access_log/BUILD +++ b/test/common/access_log/BUILD @@ -17,7 +17,7 @@ envoy_cc_test( "-DUSE_CEL_PARSER", ], }), - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/access_log:access_log_lib", "//source/common/stream_info:utility_lib", @@ -46,7 +46,7 @@ envoy_cc_test( envoy_cc_test( name = "access_log_manager_impl_test", srcs = ["access_log_manager_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/access_log:access_log_manager_lib", "//source/common/stats:stats_lib", diff --git a/test/common/api/BUILD b/test/common/api/BUILD index 227b5c149f..610315f2e7 100644 --- a/test/common/api/BUILD +++ b/test/common/api/BUILD @@ -11,7 +11,7 @@ envoy_package() envoy_cc_test( name = "os_sys_calls_test", srcs = ["os_sys_calls_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/api:os_sys_calls_lib", ], diff --git a/test/common/buffer/BUILD b/test/common/buffer/BUILD index c0833fd8e0..4bd63be8b1 100644 --- a/test/common/buffer/BUILD +++ b/test/common/buffer/BUILD @@ -31,7 +31,7 @@ envoy_cc_test_library( name = "buffer_fuzz_lib", srcs = ["buffer_fuzz.cc"], hdrs = ["buffer_fuzz.h"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":buffer_fuzz_proto_cc_proto", "//source/common/buffer:buffer_lib", @@ -45,14 +45,14 @@ envoy_cc_fuzz_test( name = "buffer_fuzz_test", srcs = ["buffer_fuzz_test.cc"], corpus = "buffer_corpus", - rbe_pool = "2core", + rbe_pool = "6gig", deps = [":buffer_fuzz_lib"], ) envoy_cc_test( name = "buffer_test", srcs = ["buffer_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":utility_lib", "//source/common/buffer:buffer_lib", @@ -64,7 +64,7 @@ envoy_cc_test( envoy_cc_test( name = "owned_impl_test", srcs = ["owned_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":utility_lib", "//source/common/buffer:buffer_lib", @@ -78,7 +78,7 @@ envoy_cc_test( envoy_cc_test( name = "buffer_util_test", srcs = ["buffer_util_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":utility_lib", "//source/common/buffer:buffer_lib", @@ -89,7 +89,7 @@ envoy_cc_test( envoy_cc_test( name = "watermark_buffer_test", srcs = ["watermark_buffer_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":utility_lib", "//source/common/buffer:buffer_lib", @@ -102,7 +102,7 @@ envoy_cc_test( envoy_cc_test( name = "buffer_memory_account_test", srcs = ["buffer_memory_account_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/buffer:buffer_lib", "//test/integration:tracked_watermark_buffer_lib", @@ -115,7 +115,7 @@ envoy_cc_test( envoy_cc_test( name = "zero_copy_input_stream_test", srcs = ["zero_copy_input_stream_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":utility_lib", "//source/common/buffer:zero_copy_input_stream_lib", @@ -128,7 +128,7 @@ envoy_cc_benchmark_binary( external_deps = [ "benchmark", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/buffer:buffer_lib", "//source/common/buffer:watermark_buffer_lib", diff --git a/test/common/common/BUILD b/test/common/common/BUILD index c628e46887..af58da0534 100644 --- a/test/common/common/BUILD +++ b/test/common/common/BUILD @@ -15,7 +15,7 @@ envoy_package() envoy_cc_test( name = "backoff_strategy_test", srcs = ["backoff_strategy_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/common:backoff_lib", "//test/mocks/runtime:runtime_mocks", @@ -25,7 +25,7 @@ envoy_cc_test( envoy_cc_test( name = "assert_test", srcs = ["assert_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/common:assert_lib", "//test/test_common:logging_lib", @@ -36,7 +36,7 @@ envoy_cc_test( envoy_cc_test( name = "containers_test", srcs = ["containers_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/common:containers_lib", "//test/test_common:logging_lib", @@ -49,7 +49,7 @@ envoy_cc_test( name = "assert_enabled_in_release_test", srcs = ["assert_test.cc"], copts = ["-DENVOY_LOG_DEBUG_ASSERT_IN_RELEASE"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/common:assert_lib", "//test/test_common:logging_lib", @@ -60,7 +60,7 @@ envoy_cc_test( envoy_cc_test( name = "assert2_test", srcs = ["assert2_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/common:assert_lib", "//test/test_common:logging_lib", @@ -71,7 +71,7 @@ envoy_cc_test( envoy_cc_test( name = "base64_test", srcs = ["base64_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/buffer:buffer_lib", "//source/common/common:base64_lib", @@ -82,7 +82,7 @@ envoy_cc_fuzz_test( name = "base64_fuzz_test", srcs = ["base64_fuzz_test.cc"], corpus = "base64_corpus", - rbe_pool = "2core", + rbe_pool = "6gig", # Fuzzer is stable, no bugs, simple test target; avoid emitting CO2. tags = ["no_fuzz"], deps = ["//source/common/common:base64_lib"], @@ -92,7 +92,7 @@ envoy_cc_fuzz_test( name = "utility_fuzz_test", srcs = ["utility_fuzz_test.cc"], corpus = "utility_corpus", - rbe_pool = "2core", + rbe_pool = "6gig", # Fuzzer is stable, no bugs, simple test target; avoid emitting CO2. tags = ["no_fuzz"], deps = ["//source/common/common:utility_lib"], @@ -102,21 +102,21 @@ envoy_cc_fuzz_test( name = "hash_fuzz_test", srcs = ["hash_fuzz_test.cc"], corpus = "hash_corpus", - rbe_pool = "2core", + rbe_pool = "6gig", deps = ["//source/common/common:hash_lib"], ) envoy_cc_test( name = "cleanup_test", srcs = ["cleanup_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = ["//source/common/common:cleanup_lib"], ) envoy_cc_test( name = "dns_utils_test", srcs = ["dns_utils_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/common:dns_utils_lib", "//test/test_common:utility_lib", @@ -126,28 +126,28 @@ envoy_cc_test( envoy_cc_test( name = "mem_block_builder_test", srcs = ["mem_block_builder_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = ["//source/common/common:mem_block_builder_lib"], ) envoy_cc_test( name = "safe_memcpy_test", srcs = ["safe_memcpy_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = ["//source/common/common:safe_memcpy_lib"], ) envoy_cc_test( name = "phantom_test", srcs = ["phantom_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = ["//source/common/common:phantom"], ) envoy_cc_test( name = "fmt_test", srcs = ["fmt_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/common:fmt_lib", "//source/common/common:minimal_logger_lib", @@ -157,21 +157,21 @@ envoy_cc_test( envoy_cc_test( name = "hash_test", srcs = ["hash_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = ["//source/common/common:hash_lib"], ) envoy_cc_test( name = "hex_test", srcs = ["hex_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = ["//source/common/common:hex_lib"], ) envoy_cc_test( name = "linked_object_test", srcs = ["linked_object_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/common:linked_object", ], @@ -180,7 +180,7 @@ envoy_cc_test( envoy_cc_test( name = "log_macros_test", srcs = ["log_macros_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/common:minimal_logger_lib", "//test/mocks/http:http_mocks", @@ -194,7 +194,7 @@ envoy_cc_test( name = "log_verbosity_update_test", srcs = ["log_verbosity_update_test.cc"], args = ["--enable-fine-grain-logging"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/common:minimal_logger_lib", "//test/test_common:logging_lib", @@ -205,7 +205,7 @@ envoy_cc_test( name = "fine_grain_log_macros_test", srcs = ["log_macros_test.cc"], args = ["--enable-fine-grain-logging"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/common:minimal_logger_lib", "//test/mocks/http:http_mocks", @@ -219,7 +219,7 @@ envoy_cc_benchmark_binary( name = "logger_speed_test", srcs = ["logger_speed_test.cc"], external_deps = ["benchmark"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = ["//source/common/common:minimal_logger_lib"], ) @@ -231,7 +231,7 @@ envoy_benchmark_test( envoy_cc_test( name = "logger_test", srcs = ["logger_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/common:minimal_logger_lib", "//test/mocks/http:http_mocks", @@ -243,7 +243,7 @@ envoy_cc_fuzz_test( name = "logger_fuzz_test", srcs = ["logger_fuzz_test.cc"], corpus = "logger_corpus", - rbe_pool = "2core", + rbe_pool = "6gig", # TODO(github.com/envoyproxy/envoy#8893): Re-enable once more fuzz tests are added tags = ["no_fuzz"], deps = ["//source/common/common:minimal_logger_lib"], @@ -252,7 +252,7 @@ envoy_cc_fuzz_test( envoy_cc_test( name = "matchers_test", srcs = ["matchers_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/common:matchers_lib", "//source/common/config:metadata_lib", @@ -268,7 +268,7 @@ envoy_cc_test( envoy_cc_test( name = "mutex_tracer_test", srcs = ["mutex_tracer_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/common:mutex_tracer_lib", "//test/test_common:contention_lib", @@ -279,13 +279,13 @@ envoy_cc_test( envoy_cc_test( name = "optref_test", srcs = ["optref_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", ) envoy_cc_test( name = "random_generator_test", srcs = ["random_generator_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/common:interval_value", "//source/common/common:random_generator_lib", @@ -297,7 +297,7 @@ envoy_cc_test( envoy_cc_test( name = "trie_lookup_table_test", srcs = ["trie_lookup_table_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = ["//source/common/common:trie_lookup_table_lib"], ) @@ -307,7 +307,7 @@ envoy_cc_test( external_deps = [ "abseil_strings", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/common:utility_lib", "//test/common/memory:memory_test_utility_lib", @@ -320,13 +320,13 @@ envoy_cc_test( envoy_cc_test( name = "compiled_string_map_test", srcs = ["compiled_string_map_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", ) envoy_cc_test( name = "packed_struct_test", srcs = ["packed_struct_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/common:packed_struct_lib", "//test/common/memory:memory_test_utility_lib", @@ -338,7 +338,7 @@ envoy_cc_test( envoy_cc_test( name = "regex_test", srcs = ["regex_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/common:regex_lib", "//test/test_common:logging_lib", @@ -351,7 +351,7 @@ envoy_cc_test( envoy_cc_test( name = "perf_annotation_test", srcs = ["perf_annotation_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/common:perf_annotation_lib", ], @@ -360,7 +360,7 @@ envoy_cc_test( envoy_cc_test( name = "perf_annotation_disabled_test", srcs = ["perf_annotation_disabled_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/common:perf_annotation_lib", ], @@ -369,7 +369,7 @@ envoy_cc_test( envoy_cc_test( name = "basic_resource_impl_test", srcs = ["basic_resource_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/common:basic_resource_lib", "//test/mocks/runtime:runtime_mocks", @@ -379,7 +379,7 @@ envoy_cc_test( envoy_cc_test( name = "token_bucket_impl_test", srcs = ["token_bucket_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/common:token_bucket_impl_lib", "//test/test_common:simulated_time_system_lib", @@ -391,7 +391,7 @@ envoy_cc_test( envoy_cc_test( name = "shared_token_bucket_impl_test", srcs = ["shared_token_bucket_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/common:shared_token_bucket_impl_lib", "//test/test_common:simulated_time_system_lib", @@ -402,7 +402,7 @@ envoy_cc_test( envoy_cc_test( name = "callback_impl_test", srcs = ["callback_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/common:callback_impl_lib", "//test/mocks/event:event_mocks", @@ -427,7 +427,7 @@ envoy_cc_benchmark_binary( "abseil_strings", "benchmark", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/common:assert_lib", "//source/common/common:utility_lib", @@ -446,7 +446,7 @@ envoy_cc_benchmark_binary( "abseil_strings", "benchmark", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/common:trie_lookup_table_lib", ], @@ -460,7 +460,7 @@ envoy_benchmark_test( envoy_cc_test( name = "lock_guard_test", srcs = ["lock_guard_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/common:lock_guard_lib", "//source/common/common:thread_lib", @@ -471,7 +471,7 @@ envoy_cc_test( name = "thread_id_test", srcs = ["thread_id_test.cc"], external_deps = ["abseil_hash_testing"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/common:thread_lib", "//test/test_common:thread_factory_for_test_lib", @@ -481,7 +481,7 @@ envoy_cc_test( envoy_cc_test( name = "thread_test", srcs = ["thread_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/common:thread_lib", "//source/common/common:thread_synchronizer_lib", @@ -492,7 +492,7 @@ envoy_cc_test( envoy_cc_test( name = "stl_helpers_test", srcs = ["stl_helpers_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/common:stl_helpers", ], @@ -505,7 +505,7 @@ envoy_cc_test( external_deps = [ "abseil_strings", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/version:version_lib", ], @@ -514,14 +514,14 @@ envoy_cc_test( envoy_cc_test( name = "api_version_test", srcs = ["api_version_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = ["//source/common/version:api_version_lib"], ) envoy_cc_test( name = "statusor_test", srcs = ["statusor_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/common:statusor_lib", "//source/common/http:status_lib", @@ -531,14 +531,14 @@ envoy_cc_test( envoy_cc_test( name = "interval_value_test", srcs = ["interval_value_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = ["//source/common/common:interval_value"], ) envoy_cc_test( name = "scope_tracker_test", srcs = ["scope_tracker_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/api:api_lib", "//source/common/common:scope_tracker", @@ -551,7 +551,7 @@ envoy_cc_test( envoy_cc_test( name = "scope_tracked_object_stack_test", srcs = ["scope_tracked_object_stack_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/common:scope_tracked_object_stack", "//source/common/common:utility_lib", @@ -561,7 +561,7 @@ envoy_cc_test( envoy_cc_test( name = "union_string_test", srcs = ["union_string_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/common:union_string", ], @@ -570,7 +570,7 @@ envoy_cc_test( envoy_cc_test( name = "bit_array_test", srcs = ["bit_array_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/common:bit_array_lib", "//source/common/common:random_generator_lib", @@ -580,7 +580,7 @@ envoy_cc_test( envoy_cc_test( name = "inline_map_test", srcs = ["inline_map_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = ["//source/common/common:inline_map"], ) @@ -588,7 +588,7 @@ envoy_cc_benchmark_binary( name = "inline_map_speed_test", srcs = ["inline_map_speed_test.cc"], external_deps = ["benchmark"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = ["//source/common/common:inline_map"], ) @@ -600,7 +600,7 @@ envoy_benchmark_test( envoy_cc_test( name = "execution_context_test", srcs = ["execution_context_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/common:execution_context", ], diff --git a/test/common/config/BUILD b/test/common/config/BUILD index 5941379047..6122e03e70 100644 --- a/test/common/config/BUILD +++ b/test/common/config/BUILD @@ -13,7 +13,7 @@ envoy_package() envoy_cc_test( name = "decoded_resource_impl_test", srcs = ["decoded_resource_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/config:decoded_resource_lib", "//test/mocks/config:config_mocks", @@ -24,7 +24,7 @@ envoy_cc_test( envoy_cc_test( name = "ttl_test", srcs = ["ttl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/config:ttl_lib", "//test/mocks/event:event_mocks", @@ -36,7 +36,7 @@ envoy_cc_test( envoy_cc_test( name = "grpc_subscription_impl_test", srcs = ["grpc_subscription_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":grpc_subscription_test_harness", "//source/common/buffer:zero_copy_input_stream_lib", @@ -70,7 +70,7 @@ envoy_cc_test_library( envoy_cc_test( name = "opaque_resource_decoder_impl_test", srcs = ["opaque_resource_decoder_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/config:opaque_resource_decoder_lib", "//source/common/protobuf:message_validator_lib", @@ -92,7 +92,7 @@ envoy_cc_test_library( envoy_cc_test( name = "type_to_endpoint_test", srcs = ["type_to_endpoint_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/config:type_to_endpoint_lib", "//test/config:v2_link_hacks", @@ -104,7 +104,7 @@ envoy_cc_test( envoy_cc_test( name = "metadata_test", srcs = ["metadata_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/common:base_includes", "//source/common/config:metadata_lib", @@ -119,7 +119,7 @@ envoy_cc_test( envoy_cc_test( name = "runtime_utility_test", srcs = ["runtime_utility_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/config:runtime_utility_lib", "//test/test_common:utility_lib", @@ -131,7 +131,7 @@ envoy_cc_test( name = "utility_test", srcs = ["utility_test.cc"], external_deps = ["abseil_optional"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/config:api_version_lib", "//source/common/config:utility_lib", @@ -160,7 +160,7 @@ envoy_cc_test( envoy_cc_test( name = "registry_test", srcs = ["registry_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/config:typed_config_interface", "//test/test_common:logging_lib", @@ -176,7 +176,7 @@ envoy_proto_library( envoy_cc_test( name = "config_provider_impl_test", srcs = ["config_provider_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":dummy_config_proto_cc_proto", "//source/common/config:config_provider_lib", @@ -191,7 +191,7 @@ envoy_cc_test( envoy_cc_test( name = "context_provider_impl_test", srcs = ["context_provider_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":xds_test_utility_lib", "//source/common/config:context_provider_lib", @@ -202,7 +202,7 @@ envoy_cc_test( envoy_cc_test( name = "datasource_test", srcs = ["datasource_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/common:empty_string", "//source/common/config:datasource_lib", @@ -222,7 +222,7 @@ envoy_cc_test( envoy_cc_test( name = "xds_context_params_test", srcs = ["xds_context_params_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":xds_test_utility_lib", "//source/common/config:xds_context_params_lib", @@ -234,7 +234,7 @@ envoy_cc_test( envoy_cc_test( name = "xds_resource_test", srcs = ["xds_resource_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":xds_test_utility_lib", "//source/common/config:xds_resource_lib", @@ -251,7 +251,7 @@ envoy_cc_test_library( envoy_cc_test( name = "watched_directory_test", srcs = ["watched_directory_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/config:watched_directory_lib", "//test/mocks/event:event_mocks", @@ -262,7 +262,7 @@ envoy_cc_test( envoy_cc_test( name = "custom_config_validators_impl_test", srcs = ["custom_config_validators_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//test/mocks/protobuf:protobuf_mocks", "//test/mocks/server:instance_mocks", diff --git a/test/common/conn_pool/BUILD b/test/common/conn_pool/BUILD index ca5bcd4171..27e7a25820 100644 --- a/test/common/conn_pool/BUILD +++ b/test/common/conn_pool/BUILD @@ -11,7 +11,7 @@ envoy_package() envoy_cc_test( name = "conn_pool_base_test", srcs = ["conn_pool_base_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/conn_pool:conn_pool_base_lib", "//source/common/event:dispatcher_lib", diff --git a/test/common/crypto/BUILD b/test/common/crypto/BUILD index f9d75aea3a..359be13457 100644 --- a/test/common/crypto/BUILD +++ b/test/common/crypto/BUILD @@ -18,7 +18,7 @@ envoy_cc_test( external_deps = [ "ssl", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/buffer:buffer_lib", "//source/common/common:hex_lib", @@ -35,7 +35,7 @@ envoy_cc_fuzz_test( name = "get_sha_256_digest_fuzz_test", srcs = ["get_sha_256_digest_fuzz_test.cc"], corpus = "get_sha_256_digest_corpus", - rbe_pool = "2core", + rbe_pool = "6gig", deps = ["//source/common/crypto:utility_lib"], ) @@ -44,7 +44,7 @@ envoy_cc_fuzz_test( srcs = ["verify_signature_fuzz_test.cc"], corpus = "verify_signature_corpus", dictionaries = ["verify_signature_fuzz_test.dict"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":verify_signature_fuzz_proto_cc_proto", "//source/common/common:hex_lib", diff --git a/test/common/event/BUILD b/test/common/event/BUILD index 08e489e0b8..8675587e14 100644 --- a/test/common/event/BUILD +++ b/test/common/event/BUILD @@ -11,7 +11,7 @@ envoy_package() envoy_cc_test( name = "dispatcher_impl_test", srcs = ["dispatcher_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/api:api_lib", "//source/common/event:deferred_task", @@ -31,7 +31,7 @@ envoy_cc_test( envoy_cc_test( name = "file_event_impl_test", srcs = ["file_event_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/event:file_event_interface", "//source/common/event:dispatcher_includes", @@ -47,7 +47,7 @@ envoy_cc_test( envoy_cc_test( name = "scaled_range_timer_manager_impl_test", srcs = ["scaled_range_timer_manager_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/event:scaled_range_timer_manager_lib", "//test/mocks/event:wrapped_dispatcher", diff --git a/test/common/filesystem/BUILD b/test/common/filesystem/BUILD index cf9bb9f76c..a822940e52 100644 --- a/test/common/filesystem/BUILD +++ b/test/common/filesystem/BUILD @@ -11,7 +11,7 @@ envoy_package() envoy_cc_test( name = "filesystem_impl_test", srcs = ["filesystem_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/filesystem:filesystem_lib", "//test/test_common:environment_lib", @@ -21,7 +21,7 @@ envoy_cc_test( envoy_cc_test( name = "directory_test", srcs = ["directory_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/filesystem:directory_lib", "//test/test_common:environment_lib", @@ -32,7 +32,7 @@ envoy_cc_test( envoy_cc_test( name = "watcher_impl_test", srcs = ["watcher_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/common:assert_lib", "//source/common/event:dispatcher_includes", diff --git a/test/common/filter/BUILD b/test/common/filter/BUILD index 0cf966a0ba..ee614bbcfe 100644 --- a/test/common/filter/BUILD +++ b/test/common/filter/BUILD @@ -11,7 +11,7 @@ envoy_package() envoy_cc_test( name = "config_discovery_impl_test", srcs = ["config_discovery_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/config:utility_lib", "//source/common/filter:config_discovery_lib", diff --git a/test/common/formatter/BUILD b/test/common/formatter/BUILD index 49666a6759..560092ad7c 100644 --- a/test/common/formatter/BUILD +++ b/test/common/formatter/BUILD @@ -27,7 +27,7 @@ envoy_cc_fuzz_test( "substitution_formatter_fuzz_test.dict", "//test/fuzz:headers.dict", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":substitution_formatter_fuzz_proto_cc_proto", "//source/common/formatter:substitution_formatter_lib", @@ -48,7 +48,7 @@ envoy_cc_test_library( envoy_cc_test( name = "substitution_formatter_test", srcs = ["substitution_formatter_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":command_extension_lib", "//source/common/common:utility_lib", @@ -76,7 +76,7 @@ envoy_cc_test( envoy_cc_test( name = "substitution_format_string_test", srcs = ["substitution_format_string_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":command_extension_lib", "//source/common/formatter:substitution_format_string_lib", @@ -95,7 +95,7 @@ envoy_cc_benchmark_binary( external_deps = [ "benchmark", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/formatter:substitution_formatter_lib", "//source/common/http:header_map_lib", diff --git a/test/common/grpc/BUILD b/test/common/grpc/BUILD index c01569fcaf..28de121050 100644 --- a/test/common/grpc/BUILD +++ b/test/common/grpc/BUILD @@ -16,7 +16,7 @@ envoy_package() envoy_cc_test( name = "async_client_impl_test", srcs = ["async_client_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/event:dispatcher_lib", "//source/common/grpc:async_client_lib", @@ -32,7 +32,7 @@ envoy_cc_test( envoy_cc_test( name = "async_client_manager_impl_test", srcs = ["async_client_manager_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/api:api_lib", "//source/common/grpc:async_client_manager_lib", @@ -52,7 +52,7 @@ envoy_cc_fuzz_test( name = "codec_fuzz_test", srcs = ["codec_fuzz_test.cc"], corpus = "codec_corpus", - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/buffer:buffer_lib", "//source/common/grpc:codec_lib", @@ -64,7 +64,7 @@ envoy_cc_fuzz_test( envoy_cc_test( name = "codec_test", srcs = ["codec_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/buffer:buffer_lib", "//source/common/grpc:codec_lib", @@ -76,7 +76,7 @@ envoy_cc_test( envoy_cc_test( name = "common_test", srcs = ["common_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/grpc:common_lib", "//source/common/http:headers_lib", @@ -89,7 +89,7 @@ envoy_cc_test( envoy_cc_test( name = "context_impl_test", srcs = ["context_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/grpc:common_lib", "//source/common/grpc:context_lib", @@ -102,7 +102,7 @@ envoy_cc_test( envoy_cc_test( name = "google_grpc_utils_test", srcs = envoy_select_google_grpc(["google_grpc_utils_test.cc"]), - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/grpc:common_lib", "//source/common/http:headers_lib", @@ -114,7 +114,7 @@ envoy_cc_test( envoy_cc_test( name = "google_async_client_impl_test", srcs = envoy_select_google_grpc(["google_async_client_impl_test.cc"]), - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/api:api_lib", "//source/common/event:dispatcher_lib", @@ -134,7 +134,7 @@ envoy_cc_test( name = "google_grpc_creds_test", srcs = envoy_select_google_grpc(["google_grpc_creds_test.cc"]), data = [":service_key.json"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":utility_lib", "//test/mocks/stats:stats_mocks", @@ -186,7 +186,7 @@ envoy_cc_test( name = "grpc_client_integration_test", size = "large", srcs = ["grpc_client_integration_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":grpc_client_integration_test_harness_lib", "//source/common/grpc:async_client_lib", @@ -208,7 +208,7 @@ envoy_cc_test_library( envoy_cc_test( name = "buffered_async_client_test", srcs = ["buffered_async_client_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/grpc:async_client_lib", "//source/common/grpc:buffered_async_client_lib", @@ -224,7 +224,7 @@ envoy_cc_test( envoy_cc_test( name = "buffered_message_ttl_manager_test", srcs = ["buffered_message_ttl_manager_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/event:dispatcher_lib", "//source/common/grpc:buffered_message_ttl_manager_lib", @@ -238,7 +238,7 @@ envoy_cc_benchmark_binary( external_deps = [ "benchmark", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/api:api_lib", "//source/common/grpc:async_client_manager_lib", diff --git a/test/common/html/BUILD b/test/common/html/BUILD index 368b2f36d2..b8384a9283 100644 --- a/test/common/html/BUILD +++ b/test/common/html/BUILD @@ -11,7 +11,7 @@ envoy_package() envoy_cc_test( name = "utility_test", srcs = ["utility_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/html:utility_lib", ], diff --git a/test/common/http/BUILD b/test/common/http/BUILD index 581857e8a3..e537b9de8c 100644 --- a/test/common/http/BUILD +++ b/test/common/http/BUILD @@ -17,7 +17,7 @@ envoy_package() envoy_cc_test( name = "async_client_impl_test", srcs = ["async_client_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":common_lib", "//source/common/buffer:buffer_lib", @@ -44,7 +44,7 @@ envoy_cc_test( envoy_cc_test( name = "async_client_utility_test", srcs = ["async_client_utility_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/http:async_client_utility_lib", "//test/mocks/http:http_mocks", @@ -54,7 +54,7 @@ envoy_cc_test( envoy_cc_test( name = "character_set_validation_test", srcs = ["character_set_validation_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/http:character_set_validation_lib", "//test/test_common:utility_lib", @@ -64,7 +64,7 @@ envoy_cc_test( envoy_cc_test( name = "codec_client_test", srcs = ["codec_client_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":common_lib", "//source/common/buffer:buffer_lib", @@ -106,7 +106,7 @@ envoy_proto_library( srcs = ["codec_impl_fuzz_test.cc"], corpus = "codec_impl_corpus", defines = ["FUZZ_PROTOCOL_%s" % http_protocol], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":codec_impl_fuzz_proto_cc_proto", "//source/common/http:conn_manager_lib", @@ -132,7 +132,7 @@ envoy_proto_library( envoy_cc_test( name = "filter_manager_test", srcs = ["filter_manager_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/http:filter_manager_lib", "//test/mocks/event:event_mocks", @@ -147,7 +147,7 @@ envoy_cc_test( envoy_cc_test( name = "codec_wrappers_test", srcs = ["codec_wrappers_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/http:codec_wrappers_lib", "//test/mocks/http:http_mocks", @@ -158,7 +158,7 @@ envoy_cc_test( envoy_cc_test( name = "codes_test", srcs = ["codes_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/common:empty_string", "//source/common/http:codes_lib", @@ -175,7 +175,7 @@ envoy_cc_benchmark_binary( external_deps = [ "benchmark", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/http:codes_lib", "//source/common/stats:isolated_store_lib", @@ -215,7 +215,7 @@ envoy_cc_fuzz_test( name = "conn_manager_impl_fuzz_test", srcs = ["conn_manager_impl_fuzz_test.cc"], corpus = "conn_manager_impl_corpus", - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":conn_manager_impl_fuzz_proto_cc_proto", "//source/common/common:empty_string", @@ -247,7 +247,7 @@ envoy_cc_test_library( name = "conn_manager_impl_test_base_lib", srcs = ["conn_manager_impl_test_base.cc"], hdrs = ["conn_manager_impl_test_base.h"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":xff_extension_lib", "//source/common/http:conn_manager_lib", @@ -282,7 +282,7 @@ envoy_cc_test( "conn_manager_impl_test.cc", "conn_manager_impl_test_2.cc", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":conn_manager_impl_test_base_lib", ":custom_header_extension_lib", @@ -292,7 +292,7 @@ envoy_cc_test( envoy_cc_test( name = "conn_manager_utility_test", srcs = ["conn_manager_utility_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":custom_header_extension_lib", ":xff_extension_lib", @@ -320,7 +320,7 @@ envoy_cc_test( envoy_cc_test( name = "date_provider_impl_test", srcs = ["date_provider_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/http:date_provider_lib", "//source/common/http:header_map_lib", @@ -332,7 +332,7 @@ envoy_cc_test( envoy_cc_test( name = "header_map_impl_test", srcs = ["header_map_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/http:header_list_view_lib", "//source/common/http:header_map_lib", @@ -348,7 +348,7 @@ envoy_cc_benchmark_binary( external_deps = [ "benchmark", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/http:header_map_lib", ], @@ -368,7 +368,7 @@ envoy_cc_fuzz_test( name = "header_map_impl_fuzz_test", srcs = ["header_map_impl_fuzz_test.cc"], corpus = "header_map_impl_corpus", - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":header_map_impl_fuzz_proto_cc_proto", "//source/common/http:header_map_lib", @@ -380,7 +380,7 @@ envoy_cc_fuzz_test( envoy_cc_test( name = "inline_cookie_test", srcs = ["inline_cookie_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/http:header_map_lib", "//test/mocks/runtime:runtime_mocks", @@ -390,7 +390,7 @@ envoy_cc_test( envoy_cc_test( name = "header_utility_test", srcs = ["header_utility_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/http:header_utility_lib", "//test/mocks/http:header_validator_mocks", @@ -404,7 +404,7 @@ envoy_cc_test( envoy_cc_test( name = "user_agent_test", srcs = ["user_agent_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/http:header_map_lib", "//source/common/http:user_agent_lib", @@ -424,7 +424,7 @@ envoy_cc_fuzz_test( name = "utility_fuzz_test", srcs = ["utility_fuzz_test.cc"], corpus = "utility_corpus", - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":utility_fuzz_proto_cc_proto", "//source/common/http:utility_lib", @@ -436,7 +436,7 @@ envoy_cc_fuzz_test( envoy_cc_test( name = "utility_test", srcs = ["utility_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/http:exception_lib", "//source/common/http:header_map_lib", @@ -453,7 +453,7 @@ envoy_cc_test( envoy_cc_test( name = "metadata_interface_test", srcs = ["metadata_interface_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/http:metadata_interface", "//source/common/http:utility_lib", @@ -463,7 +463,7 @@ envoy_cc_test( envoy_cc_test( name = "path_utility_test", srcs = ["path_utility_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/http:header_map_lib", "//source/common/http:path_utility_lib", @@ -473,7 +473,7 @@ envoy_cc_test( envoy_cc_test( name = "status_test", srcs = ["status_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/http:status_lib", ], @@ -482,7 +482,7 @@ envoy_cc_test( envoy_cc_test( name = "mixed_conn_pool_test", srcs = ["mixed_conn_pool_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":common_lib", "//source/common/http:mixed_conn_pool", @@ -503,7 +503,7 @@ envoy_cc_test( envoy_cc_test( name = "conn_pool_grid_test", srcs = envoy_select_enable_http3(["conn_pool_grid_test.cc"]), - rbe_pool = "2core", + rbe_pool = "6gig", deps = envoy_select_enable_http3([ ":common_lib", "//source/common/http:conn_pool_grid", @@ -529,7 +529,7 @@ envoy_cc_test( envoy_cc_test( name = "http3_status_tracker_impl_test", srcs = ["http3_status_tracker_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":common_lib", "//source/common/http:http3_status_tracker_impl_lib", @@ -540,7 +540,7 @@ envoy_cc_test( envoy_cc_test( name = "http_server_properties_cache_impl_test", srcs = ["http_server_properties_cache_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":common_lib", "//source/common/http:http_server_properties_cache", @@ -552,7 +552,7 @@ envoy_cc_test( envoy_cc_test( name = "http_server_properties_cache_manager_test", srcs = ["http_server_properties_cache_manager_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":common_lib", "//source/common/http:http_server_properties_cache", @@ -576,7 +576,7 @@ envoy_cc_fuzz_test( name = "path_utility_fuzz_test", srcs = ["path_utility_fuzz_test.cc"], corpus = "path_utility_corpus", - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":path_utility_fuzz_proto_cc_proto", "//source/common/http:header_map_lib", @@ -606,7 +606,7 @@ envoy_cc_test_library( envoy_cc_test( name = "dependency_manager_test", srcs = ["dependency_manager_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/http:dependency_manager", ], @@ -615,7 +615,7 @@ envoy_cc_test( envoy_cc_test( name = "header_mutation_test", srcs = ["header_mutation_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/http:header_mutation_lib", "//test/mocks/stream_info:stream_info_mocks", @@ -626,7 +626,7 @@ envoy_cc_test( envoy_cc_test( name = "filter_chain_helper_test", srcs = ["filter_chain_helper_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/http:filter_chain_helper_lib", "//test/mocks:common_lib", @@ -649,7 +649,7 @@ envoy_cc_fuzz_test( name = "hcm_router_fuzz_test", srcs = ["hcm_router_fuzz_test.cc"], corpus = "hcm_router_fuzz_corpus", - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":conn_manager_impl_test_base_lib", ":hcm_router_fuzz_proto_cc_proto", diff --git a/test/common/http/http1/BUILD b/test/common/http/http1/BUILD index 40ad8a0ccb..5a76eb737f 100644 --- a/test/common/http/http1/BUILD +++ b/test/common/http/http1/BUILD @@ -12,7 +12,7 @@ envoy_package() envoy_cc_test( name = "header_formatter_test", srcs = ["header_formatter_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/http/http1:header_formatter_lib", ], @@ -21,7 +21,7 @@ envoy_cc_test( envoy_cc_test( name = "codec_impl_test", srcs = ["codec_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/buffer:buffer_interface", "//envoy/event:dispatcher_interface", @@ -52,7 +52,7 @@ envoy_cc_test( envoy_cc_test( name = "conn_pool_test", srcs = ["conn_pool_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/buffer:buffer_lib", "//source/common/event:dispatcher_lib", @@ -80,7 +80,7 @@ envoy_cc_fuzz_test( name = "http1_connection_fuzz_test", srcs = ["http1_connection_fuzz_test.cc"], corpus = "http1_connection_corpus", - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/http:conn_manager_lib", "//source/common/http:header_map_lib", diff --git a/test/common/http/http2/BUILD b/test/common/http/http2/BUILD index d80ba7eabb..bb17ed6dbe 100644 --- a/test/common/http/http2/BUILD +++ b/test/common/http/http2/BUILD @@ -18,7 +18,7 @@ envoy_cc_test( external_deps = [ "quiche_http2_adapter", ], - rbe_pool = "2core", + rbe_pool = "6gig", shard_count = 5, deps = [ ":codec_impl_test_util", @@ -67,7 +67,7 @@ envoy_cc_test_library( envoy_cc_test( name = "conn_pool_test", srcs = ["conn_pool_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/event:dispatcher_lib", "//source/common/http/http2:conn_pool_lib", @@ -107,7 +107,7 @@ envoy_cc_test_library( name = "frame_replay_lib", srcs = ["frame_replay.cc"], hdrs = ["frame_replay.h"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/common:hex_lib", "//source/common/common:macros", @@ -131,7 +131,7 @@ envoy_cc_test( "response_header_corpus/simple_example_huffman", "response_header_corpus/simple_example_plain", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":frame_replay_lib", "//test/common/http/http2:codec_impl_test_util", @@ -145,7 +145,7 @@ envoy_cc_test( "quiche_http2_adapter", "quiche_http2_test_tools", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/buffer:buffer_lib", "//source/common/common:random_generator_lib", @@ -162,7 +162,7 @@ envoy_cc_test( envoy_cc_test( name = "http2_frame_test", srcs = ["http2_frame_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/http:metadata_interface", "//source/common/http/http2:metadata_encoder_lib", @@ -173,7 +173,7 @@ envoy_cc_test( envoy_cc_test( name = "protocol_constraints_test", srcs = ["protocol_constraints_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/http/http2:protocol_constraints_lib", "//test/common/memory:memory_test_utility_lib", @@ -186,7 +186,7 @@ envoy_cc_fuzz_test( name = "response_header_fuzz_test", srcs = ["response_header_fuzz_test.cc"], corpus = "response_header_corpus", - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":frame_replay_lib", "//test/common/http/http2:codec_impl_test_util", @@ -198,7 +198,7 @@ envoy_cc_fuzz_test( name = "request_header_fuzz_test", srcs = ["request_header_fuzz_test.cc"], corpus = "request_header_corpus", - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":frame_replay_lib", "//test/common/http/http2:codec_impl_test_util", @@ -219,7 +219,7 @@ envoy_cc_fuzz_test( external_deps = [ "nghttp2", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":hpack_fuzz_proto_cc_proto", "//test/test_common:utility_lib", @@ -239,7 +239,7 @@ envoy_cc_fuzz_test( external_deps = [ "nghttp2", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":http2_connection_proto_cc_proto", "//source/common/http/http2:codec_lib", diff --git a/test/common/http/http3/BUILD b/test/common/http/http3/BUILD index d4c7920627..0e807f503e 100644 --- a/test/common/http/http3/BUILD +++ b/test/common/http/http3/BUILD @@ -12,7 +12,7 @@ envoy_package() envoy_cc_test( name = "conn_pool_test", srcs = envoy_select_enable_http3(["conn_pool_test.cc"]), - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["nofips"], deps = envoy_select_enable_http3([ "//source/common/event:dispatcher_lib", diff --git a/test/common/http/matching/BUILD b/test/common/http/matching/BUILD index 0310d7f319..75b5c62f21 100644 --- a/test/common/http/matching/BUILD +++ b/test/common/http/matching/BUILD @@ -11,7 +11,7 @@ envoy_package() envoy_cc_test( name = "inputs_test", srcs = ["inputs_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/http/matching:data_impl_lib", "//source/common/http/matching:inputs_lib", @@ -26,7 +26,7 @@ envoy_cc_test( envoy_cc_test( name = "status_code_input_test", srcs = ["status_code_input_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/http/matching:data_impl_lib", "//source/common/http/matching:status_code_input_lib", diff --git a/test/common/init/BUILD b/test/common/init/BUILD index 2dd1393be9..6e0847884b 100644 --- a/test/common/init/BUILD +++ b/test/common/init/BUILD @@ -11,7 +11,7 @@ envoy_package() envoy_cc_test( name = "watcher_impl_test", srcs = ["watcher_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//test/mocks/init:init_mocks", ], @@ -20,7 +20,7 @@ envoy_cc_test( envoy_cc_test( name = "target_impl_test", srcs = ["target_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//test/mocks/init:init_mocks", ], @@ -29,7 +29,7 @@ envoy_cc_test( envoy_cc_test( name = "manager_impl_test", srcs = ["manager_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/init:manager_lib", "//test/mocks/init:init_mocks", diff --git a/test/common/io/BUILD b/test/common/io/BUILD index 08af231c2f..a13cd925ea 100644 --- a/test/common/io/BUILD +++ b/test/common/io/BUILD @@ -11,7 +11,7 @@ envoy_package() envoy_cc_test( name = "io_uring_impl_test", srcs = ["io_uring_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = [ "nocompdb", "skip_on_windows", @@ -31,7 +31,7 @@ envoy_cc_test( "//bazel:linux": ["io_uring_worker_impl_test.cc"], "//conditions:default": [], }), - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//test/mocks/event:event_mocks", "//test/mocks/io:io_mocks", @@ -50,7 +50,7 @@ envoy_cc_test( "//bazel:linux": ["io_uring_worker_impl_integration_test.cc"], "//conditions:default": [], }), - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/api:os_sys_calls_interface", "//source/common/api:os_sys_calls_lib", @@ -69,7 +69,7 @@ envoy_cc_test( "//bazel:linux": ["io_uring_worker_factory_impl_test.cc"], "//conditions:default": [], }), - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//test/mocks/server:server_mocks", "//test/test_common:environment_lib", diff --git a/test/common/json/BUILD b/test/common/json/BUILD index 91bf779da9..77448f6681 100644 --- a/test/common/json/BUILD +++ b/test/common/json/BUILD @@ -16,7 +16,7 @@ envoy_cc_fuzz_test( name = "json_fuzz_test", srcs = ["json_fuzz_test.cc"], corpus = "json_corpus", - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/protobuf", "//source/common/protobuf:utility_lib", @@ -34,7 +34,7 @@ JSON_TEST_DEPS = [ envoy_cc_test( name = "json_loader_test", srcs = ["json_loader_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/json:json_loader_lib", "//source/common/stats:isolated_store_lib", @@ -46,7 +46,7 @@ envoy_cc_test( envoy_cc_test( name = "json_sanitizer_test", srcs = ["json_sanitizer_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":json_sanitizer_test_util_lib", "//source/common/buffer:buffer_lib", @@ -70,7 +70,7 @@ envoy_cc_fuzz_test( name = "json_sanitizer_fuzz_test", srcs = ["json_sanitizer_fuzz_test.cc"], corpus = "json_sanitizer_corpus", - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":json_sanitizer_test_util_lib", "//source/common/json:json_sanitizer_lib", @@ -82,7 +82,7 @@ envoy_cc_fuzz_test( envoy_cc_test( name = "json_streamer_test", srcs = ["json_streamer_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/buffer:buffer_lib", "//source/common/json:json_internal_lib", @@ -121,6 +121,6 @@ envoy_cc_test_library( envoy_cc_test( name = "utf8_test", srcs = ["utf8_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [":utf8_lib"], ) diff --git a/test/common/listener_manager/BUILD b/test/common/listener_manager/BUILD index dd8694294b..8d2414dbac 100644 --- a/test/common/listener_manager/BUILD +++ b/test/common/listener_manager/BUILD @@ -24,7 +24,7 @@ envoy_cc_test( "internal_listener.yaml", "internal_listener_missing_bootstrap.yaml", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/bootstrap/internal_listener:config", "//source/extensions/filters/network/tcp_proxy:config", @@ -71,7 +71,7 @@ envoy_cc_test_library( envoy_cc_test( name = "listener_manager_impl_test", srcs = ["listener_manager_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":listener_manager_impl_test_lib", "//source/common/api:os_sys_calls_lib", @@ -108,7 +108,7 @@ envoy_cc_test( envoy_cc_test( name = "listener_manager_impl_quic_only_test", srcs = ["listener_manager_impl_quic_only_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["nofips"], deps = [ ":listener_manager_impl_test_lib", @@ -131,7 +131,7 @@ envoy_cc_test( name = "filter_chain_manager_impl_test", srcs = ["filter_chain_manager_impl_test.cc"], data = ["//test/common/tls/test_data:certs"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/api:os_sys_calls_lib", "//source/common/config:metadata_lib", @@ -167,7 +167,7 @@ envoy_cc_test( data = [ "//test/config/integration/certs", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/listener_manager:lds_api_lib", "//source/common/protobuf:utility_lib", @@ -191,7 +191,7 @@ envoy_cc_benchmark_binary( "benchmark", "googletest", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "@envoy_api//envoy/config/listener/v3:pkg_cc_proto", "//source/common/listener_manager:filter_chain_manager_lib", diff --git a/test/common/local_info/BUILD b/test/common/local_info/BUILD index bbb81a7956..d469d7847a 100644 --- a/test/common/local_info/BUILD +++ b/test/common/local_info/BUILD @@ -11,7 +11,7 @@ envoy_package() envoy_cc_test( name = "local_info_impl_test", srcs = ["local_info_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/local_info:local_info_lib", "//test/common/stats:stat_test_utility_lib", diff --git a/test/common/local_reply/BUILD b/test/common/local_reply/BUILD index 9d9d035b4b..7f81ee0468 100644 --- a/test/common/local_reply/BUILD +++ b/test/common/local_reply/BUILD @@ -11,7 +11,7 @@ envoy_package() envoy_cc_test( name = "local_reply_test", srcs = ["local_reply_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/local_reply:local_reply_lib", "//test/mocks/http:http_mocks", diff --git a/test/common/matcher/BUILD b/test/common/matcher/BUILD index 2a4f04adfa..bd746dcdae 100644 --- a/test/common/matcher/BUILD +++ b/test/common/matcher/BUILD @@ -22,7 +22,7 @@ envoy_cc_test_library( envoy_cc_test( name = "list_matcher_test", srcs = ["list_matcher_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":test_utility_lib", "//source/common/matcher:list_matcher_lib", @@ -33,7 +33,7 @@ envoy_cc_test( envoy_cc_test( name = "exact_map_matcher_test", srcs = ["exact_map_matcher_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":test_utility_lib", "//source/common/matcher:exact_map_matcher_lib", @@ -44,7 +44,7 @@ envoy_cc_test( envoy_cc_test( name = "prefix_map_matcher_test", srcs = ["prefix_map_matcher_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":test_utility_lib", "//source/common/matcher:prefix_map_matcher_lib", @@ -55,7 +55,7 @@ envoy_cc_test( envoy_cc_test( name = "field_matcher_test", srcs = ["field_matcher_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":test_utility_lib", "//source/common/matcher:field_matcher_lib", @@ -67,7 +67,7 @@ envoy_cc_test( envoy_cc_test( name = "value_input_matcher_test", srcs = ["value_input_matcher_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/matcher:value_input_matcher_lib", "//test/mocks/server:server_factory_context_mocks", @@ -78,7 +78,7 @@ envoy_cc_test( envoy_cc_test( name = "matcher_test", srcs = ["matcher_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":test_utility_lib", "//source/common/matcher:matcher_lib", diff --git a/test/common/memory/BUILD b/test/common/memory/BUILD index e359c31297..b8db10ccf7 100644 --- a/test/common/memory/BUILD +++ b/test/common/memory/BUILD @@ -12,14 +12,14 @@ envoy_package() envoy_cc_test( name = "debug_test", srcs = ["debug_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = ["//source/common/memory:stats_lib"], ) envoy_cc_test( name = "memory_release_test", srcs = ["memory_release_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/event:dispatcher_lib", "//source/common/memory:stats_lib", @@ -32,7 +32,7 @@ envoy_cc_test( envoy_cc_test( name = "heap_shrinker_test", srcs = ["heap_shrinker_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/event:dispatcher_lib", "//source/common/memory:heap_shrinker_lib", diff --git a/test/common/network/BUILD b/test/common/network/BUILD index 82d352dbcd..7aacdbec01 100644 --- a/test/common/network/BUILD +++ b/test/common/network/BUILD @@ -36,7 +36,7 @@ envoy_cc_test_library( envoy_cc_test( name = "address_impl_test", srcs = ["address_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/network:address_lib", "//source/common/network:utility_lib", @@ -54,7 +54,7 @@ envoy_cc_benchmark_binary( external_deps = [ "benchmark", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/network:address_lib", ], @@ -68,7 +68,7 @@ envoy_benchmark_test( envoy_cc_test( name = "cidr_range_test", srcs = ["cidr_range_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/network:address_lib", "//source/common/network:cidr_range_lib", @@ -78,7 +78,7 @@ envoy_cc_test( envoy_cc_test( name = "connection_impl_test", srcs = ["connection_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/buffer:buffer_lib", "//source/common/common:empty_string", @@ -109,7 +109,7 @@ envoy_cc_test( envoy_cc_test( name = "happy_eyeballs_connection_provider_test", srcs = ["happy_eyeballs_connection_provider_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/network:happy_eyeballs_connection_impl_lib", "//test/test_common:utility_lib", @@ -119,7 +119,7 @@ envoy_cc_test( envoy_cc_test( name = "multi_connection_base_impl_test", srcs = ["multi_connection_base_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/network:multi_connection_base_impl_lib", "//source/common/network:socket_option_lib", @@ -131,7 +131,7 @@ envoy_cc_test( envoy_cc_test( name = "filter_manager_impl_test", srcs = ["filter_manager_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/buffer:buffer_lib", "//source/common/event:dispatcher_lib", @@ -158,7 +158,7 @@ envoy_cc_test( envoy_cc_test( name = "lc_trie_test", srcs = ["lc_trie_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/common:utility_lib", "//source/common/network:address_lib", @@ -171,7 +171,7 @@ envoy_cc_test( envoy_cc_test( name = "listen_socket_impl_test", srcs = ["listen_socket_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/network:address_lib", "//source/common/network:listen_socket_lib", @@ -188,7 +188,7 @@ envoy_cc_test( envoy_cc_test( name = "listener_filter_buffer_impl_test", srcs = ["listener_filter_buffer_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/network:listener_filter_buffer_lib", "//test/mocks/event:event_mocks", @@ -199,7 +199,7 @@ envoy_cc_test( envoy_cc_test( name = "listener_impl_test", srcs = ["listener_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/event:dispatcher_lib", "//source/common/network:address_lib", @@ -221,7 +221,7 @@ envoy_cc_test( envoy_cc_test( name = "raw_buffer_socket_test", srcs = ["raw_buffer_socket_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/network:raw_buffer_socket_lib", "//source/common/network:transport_socket_options_lib", @@ -252,7 +252,7 @@ envoy_cc_test_library( envoy_cc_test( name = "udp_listener_impl_test", srcs = ["udp_listener_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":udp_listener_impl_test_base_lib", "//source/common/event:dispatcher_lib", @@ -277,7 +277,7 @@ envoy_cc_test( envoy_cc_test( name = "udp_listener_impl_batch_writer_test", srcs = ["udp_listener_impl_batch_writer_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", # Skipping as quiche quic_gso_batch_writer.h does not exist on Windows tags = [ "nofips", @@ -307,7 +307,7 @@ envoy_cc_test( envoy_cc_test( name = "resolver_test", srcs = ["resolver_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/network:address_lib", "//source/common/network:resolver_lib", @@ -337,7 +337,7 @@ envoy_cc_test_library( envoy_cc_test( name = "socket_option_impl_test", srcs = ["socket_option_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":socket_option_test", "//test/test_common:environment_lib", @@ -349,7 +349,7 @@ envoy_cc_test( name = "socket_option_factory_test", srcs = ["socket_option_factory_test.cc"], external_deps = ["abseil_str_format"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/network:address_lib", "//source/common/network:socket_option_factory_lib", @@ -365,7 +365,7 @@ envoy_cc_test( envoy_cc_test( name = "addr_family_aware_socket_option_impl_test", srcs = ["addr_family_aware_socket_option_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":socket_option_test", "//source/common/network:addr_family_aware_socket_option_lib", @@ -377,7 +377,7 @@ envoy_cc_test( envoy_cc_test( name = "utility_test", srcs = ["utility_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/network:address_lib", "//source/common/network:utility_lib", @@ -393,7 +393,7 @@ envoy_cc_fuzz_test( name = "udp_fuzz_test", srcs = ["udp_fuzz.cc"], corpus = "udp_corpus", - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "udp_listener_impl_test_base_lib", "//source/common/event:dispatcher_lib", @@ -418,7 +418,7 @@ envoy_cc_fuzz_test( name = "utility_fuzz_test", srcs = ["utility_fuzz_test.cc"], corpus = "utility_corpus", - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/network:address_lib", "//source/common/network:utility_lib", @@ -432,7 +432,7 @@ envoy_cc_benchmark_binary( external_deps = [ "benchmark", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/network:lc_trie_lib", "//source/common/network:utility_lib", @@ -447,7 +447,7 @@ envoy_benchmark_test( envoy_cc_test( name = "io_socket_handle_impl_test", srcs = ["io_socket_handle_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/common:utility_lib", "//source/common/network:address_lib", @@ -463,7 +463,7 @@ envoy_cc_test( "//bazel:linux": ["io_uring_socket_handle_impl_test.cc"], "//conditions:default": [], }), - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//test/mocks/api:api_mocks", "//test/mocks/event:event_mocks", @@ -478,7 +478,7 @@ envoy_cc_test( "//bazel:linux": ["io_uring_socket_handle_impl_integration_test.cc"], "//conditions:default": [], }), - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/network:default_socket_interface_lib", "//source/common/thread_local:thread_local_lib", @@ -493,7 +493,7 @@ envoy_cc_test( envoy_cc_test( name = "win32_socket_handle_impl_test", srcs = ["win32_socket_handle_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/buffer:buffer_lib", "//source/common/common:utility_lib", @@ -507,7 +507,7 @@ envoy_cc_test( envoy_cc_test( name = "io_socket_handle_impl_integration_test", srcs = ["io_socket_handle_impl_integration_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["requires-network"], deps = [ "//source/common/common:utility_lib", @@ -519,7 +519,7 @@ envoy_cc_test( envoy_cc_test( name = "transport_socket_options_impl_test", srcs = ["transport_socket_options_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/network:address_lib", "//source/common/network:transport_socket_options_lib", @@ -530,7 +530,7 @@ envoy_cc_test( envoy_cc_test( name = "win32_redirect_records_option_test", srcs = ["win32_redirect_records_option_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":socket_option_test", "//source/common/network:address_lib", @@ -541,7 +541,7 @@ envoy_cc_test( envoy_cc_test( name = "filter_matcher_test", srcs = ["filter_matcher_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/network:address_lib", "//source/common/network:filter_matcher_lib", @@ -558,7 +558,7 @@ envoy_cc_fuzz_test( name = "listener_filter_buffer_fuzz_test", srcs = ["listener_filter_buffer_fuzz_test.cc"], corpus = "listener_filter_buffer_corpus", - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":listener_filter_buffer_fuzz_proto_cc_proto", "//source/common/network:listener_filter_buffer_lib", diff --git a/test/common/network/dns_resolver/BUILD b/test/common/network/dns_resolver/BUILD index b32394a80b..d3ddaa673c 100644 --- a/test/common/network/dns_resolver/BUILD +++ b/test/common/network/dns_resolver/BUILD @@ -11,7 +11,7 @@ envoy_package() envoy_cc_test( name = "dns_factory_test", srcs = ["dns_factory_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/network/dns_resolver:dns_factory_util_lib", "//source/extensions/network/dns_resolver/cares:config", diff --git a/test/common/protobuf/BUILD b/test/common/protobuf/BUILD index 058e0eb54b..dea91a0701 100644 --- a/test/common/protobuf/BUILD +++ b/test/common/protobuf/BUILD @@ -15,7 +15,7 @@ envoy_package() envoy_cc_test( name = "message_validator_impl_test", srcs = ["message_validator_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/protobuf:message_validator_lib", "//test/common/stats:stat_test_utility_lib", @@ -32,7 +32,7 @@ envoy_proto_library( envoy_cc_test( name = "deterministic_hash_test", srcs = ["deterministic_hash_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":deterministic_hash_test_proto_cc_proto", "//source/common/protobuf:deterministic_hash_lib", @@ -55,7 +55,7 @@ envoy_proto_library( envoy_cc_test( name = "utility_test", srcs = ["utility_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":utility_test_protos_cc_proto", "//source/common/config:api_version_lib", @@ -85,7 +85,7 @@ envoy_cc_test( envoy_cc_test( name = "proto_descriptor_test", srcs = ["proto_descriptor_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "@envoy_api//bazel/cc_proto_descriptor_library:create_dynamic_message", "@envoy_api//bazel/cc_proto_descriptor_library:text_format_transcoder", @@ -98,7 +98,7 @@ envoy_cc_fuzz_test( name = "value_util_fuzz_test", srcs = ["value_util_fuzz_test.cc"], corpus = "value_util_corpus", - rbe_pool = "2core", + rbe_pool = "6gig", # Fuzzer is stable, no bugs, simple test target; avoid emitting CO2. tags = ["no_fuzz"], deps = ["//source/common/protobuf:utility_lib"], @@ -108,7 +108,7 @@ envoy_cc_benchmark_binary( name = "utility_speed_test", srcs = ["utility_speed_test.cc"], external_deps = ["benchmark"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":deterministic_hash_test_proto_cc_proto", "//source/common/protobuf:utility_lib", diff --git a/test/common/quic/BUILD b/test/common/quic/BUILD index 4c8af4f885..341dcb512c 100644 --- a/test/common/quic/BUILD +++ b/test/common/quic/BUILD @@ -16,7 +16,7 @@ envoy_cc_test( name = "envoy_quic_alarm_test", srcs = ["envoy_quic_alarm_test.cc"], external_deps = ["quiche_quic_platform"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["nofips"], deps = [ "//source/common/quic:envoy_quic_alarm_factory_lib", @@ -30,7 +30,7 @@ envoy_cc_test( envoy_cc_test( name = "envoy_quic_clock_test", srcs = ["envoy_quic_clock_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["nofips"], deps = [ "//source/common/quic:envoy_quic_clock_lib", @@ -44,7 +44,7 @@ envoy_cc_test( name = "envoy_quic_writer_test", srcs = ["envoy_quic_writer_test.cc"], external_deps = ["quiche_quic_platform"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["nofips"], deps = [ "//source/common/network:io_socket_error_lib", @@ -60,7 +60,7 @@ envoy_cc_test( name = "envoy_quic_proof_source_test", srcs = ["envoy_quic_proof_source_test.cc"], external_deps = ["quiche_quic_platform"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["nofips"], deps = [ ":test_utils_lib", @@ -79,7 +79,7 @@ envoy_cc_test( envoy_cc_test( name = "quic_filter_manager_connection_impl_test", srcs = ["quic_filter_manager_connection_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["nofips"], deps = [ "//source/common/quic:quic_filter_manager_connection_lib", @@ -93,7 +93,7 @@ envoy_cc_test( envoy_cc_test( name = "quic_stat_names_test", srcs = ["quic_stat_names_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["nofips"], deps = [ "//source/common/quic:quic_stat_names_lib", @@ -107,7 +107,7 @@ envoy_cc_test( name = "envoy_quic_proof_verifier_test", srcs = ["envoy_quic_proof_verifier_test.cc"], external_deps = ["quiche_quic_platform"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["nofips"], deps = [ ":test_utils_lib", @@ -125,7 +125,7 @@ envoy_cc_test( envoy_cc_test( name = "envoy_quic_server_stream_test", srcs = ["envoy_quic_server_stream_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["nofips"], deps = [ ":test_utils_lib", @@ -148,7 +148,7 @@ envoy_cc_test( envoy_cc_test( name = "envoy_quic_client_stream_test", srcs = ["envoy_quic_client_stream_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["nofips"], deps = [ ":test_utils_lib", @@ -169,7 +169,7 @@ envoy_cc_test( envoy_cc_test( name = "envoy_quic_server_session_test", srcs = ["envoy_quic_server_session_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["nofips"], deps = [ ":test_proof_source_lib", @@ -198,7 +198,7 @@ envoy_cc_test( envoy_cc_test( name = "envoy_quic_client_session_test", srcs = ["envoy_quic_client_session_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["nofips"], deps = [ ":test_utils_lib", @@ -225,7 +225,7 @@ envoy_cc_test( envoy_cc_test( name = "active_quic_listener_test", srcs = ["active_quic_listener_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["nofips"], deps = [ ":test_proof_source_lib", @@ -253,7 +253,7 @@ envoy_cc_test( envoy_cc_test( name = "envoy_quic_dispatcher_test", srcs = ["envoy_quic_dispatcher_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["nofips"], deps = [ ":test_proof_source_lib", @@ -302,7 +302,7 @@ envoy_cc_test_library( envoy_cc_test( name = "client_connection_factory_impl_test", srcs = ["client_connection_factory_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["nofips"], deps = [ "//source/common/event:dispatcher_lib", @@ -327,7 +327,7 @@ envoy_cc_test( envoy_cc_test( name = "quic_io_handle_wrapper_test", srcs = ["quic_io_handle_wrapper_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["nofips"], deps = [ "//source/common/quic:quic_io_handle_wrapper_lib", @@ -341,7 +341,7 @@ envoy_cc_test( envoy_cc_test( name = "envoy_quic_utils_test", srcs = ["envoy_quic_utils_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["nofips"], deps = [ "//source/common/quic:envoy_quic_utils_lib", @@ -354,7 +354,7 @@ envoy_cc_test( envoy_cc_test( name = "envoy_quic_simulated_watermark_buffer_test", srcs = ["envoy_quic_simulated_watermark_buffer_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["nofips"], deps = ["//source/common/quic:envoy_quic_simulated_watermark_buffer_lib"], ) @@ -387,7 +387,7 @@ envoy_cc_test( data = [ "//test/common/tls/test_data:certs", ], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["nofips"], deps = [ "//source/common/quic:quic_server_transport_socket_factory_lib", @@ -403,7 +403,7 @@ envoy_cc_test( envoy_cc_test( name = "http_datagram_handler_test", srcs = envoy_select_enable_http_datagrams(["http_datagram_handler_test.cc"]), - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["nofips"], deps = envoy_select_enable_http_datagrams([ "//source/common/quic:http_datagram_handler", @@ -435,7 +435,7 @@ envoy_cc_fuzz_test( name = "envoy_quic_h3_fuzz_test", srcs = ["envoy_quic_h3_fuzz_test.cc"], corpus = "envoy_quic_h3_fuzz_test_corpus", - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["nofips"], deps = [ ":envoy_quic_h3_fuzz_helper_lib", diff --git a/test/common/quic/platform/BUILD b/test/common/quic/platform/BUILD index d4993f8d33..1f753e0f29 100644 --- a/test/common/quic/platform/BUILD +++ b/test/common/quic/platform/BUILD @@ -24,7 +24,7 @@ envoy_cc_test( }), data = ["//test/common/tls/test_data:certs"], external_deps = ["quiche_quic_platform"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["nofips"], deps = [ "//source/common/memory:stats_lib", diff --git a/test/common/rds/BUILD b/test/common/rds/BUILD index a3e1b8932d..8a44d738cd 100644 --- a/test/common/rds/BUILD +++ b/test/common/rds/BUILD @@ -11,7 +11,7 @@ envoy_package() envoy_cc_test( name = "rds_test", srcs = ["rds_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/rds:rds_lib", "//test/mocks/server:instance_mocks", diff --git a/test/common/router/BUILD b/test/common/router/BUILD index f631591c11..d4afc56737 100644 --- a/test/common/router/BUILD +++ b/test/common/router/BUILD @@ -17,14 +17,14 @@ envoy_package() envoy_cc_test( name = "config_impl_test", - rbe_pool = "2core", + rbe_pool = "6gig", deps = [":config_impl_test_lib"], ) envoy_cc_test_library( name = "config_impl_test_lib", srcs = ["config_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":route_fuzz_proto_cc_proto", "//envoy/common:hashable_interface", @@ -54,7 +54,7 @@ envoy_cc_test( srcs = [ "config_impl_integration_test.cc", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/protobuf", "//source/common/router:config_lib", @@ -70,7 +70,7 @@ envoy_cc_benchmark_binary( external_deps = [ "benchmark", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/http:header_map_lib", "//source/common/router:config_lib", @@ -93,7 +93,7 @@ envoy_cc_fuzz_test( name = "header_parser_fuzz_test", srcs = ["header_parser_fuzz_test.cc"], corpus = "header_parser_corpus", - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":header_parser_fuzz_proto_cc_proto", "//source/common/http:header_map_lib", @@ -105,7 +105,7 @@ envoy_cc_fuzz_test( envoy_cc_test( name = "reset_header_parser_test", srcs = ["reset_header_parser_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/http:header_utility_lib", "//source/common/router:reset_header_parser_lib", @@ -118,7 +118,7 @@ envoy_cc_test( envoy_cc_test( name = "rds_impl_test", srcs = ["rds_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/config:utility_lib", "//source/common/http:rds_lib", @@ -146,7 +146,7 @@ envoy_cc_test( external_deps = [ "abseil_strings", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/router:scoped_config_lib", "//test/mocks/router:router_mocks", @@ -162,7 +162,7 @@ envoy_cc_test( external_deps = [ "abseil_strings", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/config:subscription_interface", "//envoy/init:manager_interface", @@ -194,7 +194,7 @@ envoy_cc_test( envoy_cc_test( name = "vhds_test", srcs = ["vhds_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/config:utility_lib", "//source/common/protobuf", @@ -215,7 +215,7 @@ envoy_cc_test( envoy_cc_test( name = "retry_state_impl_test", srcs = ["retry_state_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/http:header_map_lib", "//source/common/router:reset_header_parser_lib", @@ -245,7 +245,7 @@ envoy_proto_library( # envoy_cc_test_binary is generating mostly static binary regardless of config envoy_cc_test_binary( name = "config_impl_test_static", - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":config_impl_test_lib", "//test:main", @@ -270,7 +270,7 @@ envoy_directory_genrule( "$(location //test/common/router:config_impl_test_static)", ]), exec_properties = select({ - "//bazel:engflow_rbe": {"Pool": "2core"}, + "//bazel:engflow_rbe": {"Pool": "6gig"}, "//conditions:default": {}, }), tools = [":corpus_from_config_impl_sh"], @@ -295,7 +295,7 @@ envoy_cc_fuzz_test( size = "large", srcs = ["route_fuzz_test.cc"], corpus = ":route_corpus", - rbe_pool = "2core", + rbe_pool = "6gig", # The :config_impl_test_static target does not build with coverage tags = ["nocoverage"], deps = [ @@ -310,7 +310,7 @@ envoy_cc_fuzz_test( envoy_cc_test( name = "router_ratelimit_test", srcs = ["router_ratelimit_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/http:header_map_lib", "//source/common/protobuf:utility_lib", @@ -332,7 +332,7 @@ envoy_cc_test( "router_test.cc", "router_2_test.cc", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":router_test_base_lib", "//source/common/buffer:buffer_lib", @@ -373,7 +373,7 @@ envoy_cc_test_library( name = "router_test_base_lib", srcs = ["router_test_base.cc"], hdrs = ["router_test_base.h"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/buffer:buffer_lib", "//source/common/http:context_lib", @@ -407,7 +407,7 @@ envoy_cc_test( name = "router_upstream_log_test", srcs = ["router_upstream_log_test.cc"], external_deps = ["abseil_optional"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/buffer:buffer_lib", "//source/common/network:utility_lib", @@ -436,7 +436,7 @@ envoy_cc_test( envoy_cc_test( name = "router_upstream_filter_test", srcs = ["router_upstream_filter_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/buffer:buffer_lib", "//source/common/network:utility_lib", @@ -466,7 +466,7 @@ envoy_cc_test( envoy_cc_test( name = "shadow_writer_impl_test", srcs = ["shadow_writer_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/http:headers_lib", "//source/common/http:message_lib", @@ -478,7 +478,7 @@ envoy_cc_test( envoy_cc_test( name = "header_formatter_test", srcs = ["header_formatter_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/config:metadata_lib", "//source/common/http:header_utility_lib", @@ -503,7 +503,7 @@ envoy_cc_test( envoy_cc_test( name = "string_accessor_impl_test", srcs = ["string_accessor_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/router:string_accessor_lib", ], @@ -512,7 +512,7 @@ envoy_cc_test( envoy_cc_test( name = "upstream_request_test", srcs = ["upstream_request_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/router:router_lib", "//test/common/http:common_lib", @@ -526,7 +526,7 @@ envoy_cc_test( envoy_cc_test( name = "delegating_route_impl_test", srcs = ["delegating_route_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/router:config_lib", "//source/common/router:delegating_route_lib", @@ -550,7 +550,7 @@ envoy_cc_benchmark_binary( external_deps = [ "benchmark", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/common:assert_lib", "//source/common/router:config_lib", @@ -572,7 +572,7 @@ envoy_cc_benchmark_binary( external_deps = [ "benchmark", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/router:router_lib", "//test/common/stream_info:test_util", diff --git a/test/common/runtime/BUILD b/test/common/runtime/BUILD index 02d659e114..3ebfc3e38a 100644 --- a/test/common/runtime/BUILD +++ b/test/common/runtime/BUILD @@ -19,7 +19,7 @@ filegroup( envoy_cc_test( name = "runtime_protos_test", srcs = ["runtime_protos_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/runtime:runtime_lib", "//test/mocks/runtime:runtime_mocks", @@ -33,7 +33,7 @@ envoy_cc_test( name = "runtime_impl_test", srcs = ["runtime_impl_test.cc"], data = glob(["test_data/**"]) + ["filesystem_setup.sh"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/config:runtime_utility_lib", "//source/common/runtime:runtime_lib", @@ -68,7 +68,7 @@ envoy_cc_test( "--runtime-feature-disable-for-tests=envoy.reloadable_features.test_feature_true", ], coverage = False, - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/runtime:runtime_lib", ], @@ -82,7 +82,7 @@ envoy_cc_test( "--runtime-feature-disable-for-tests=envoy.reloadable_features.test_feature_false", ], coverage = False, - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/runtime:runtime_lib", ], diff --git a/test/common/secret/BUILD b/test/common/secret/BUILD index 38f9cbda73..4f81096d03 100644 --- a/test/common/secret/BUILD +++ b/test/common/secret/BUILD @@ -20,7 +20,7 @@ envoy_cc_test( data = [ "//test/common/tls/test_data:certs", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":private_key_provider_proto_cc_proto", "//source/common/secret:sds_api_lib", @@ -48,7 +48,7 @@ envoy_cc_test( data = [ "//test/common/tls/test_data:certs", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/secret:sds_api_lib", "//source/common/ssl:certificate_validation_context_config_impl_lib", diff --git a/test/common/shared_pool/BUILD b/test/common/shared_pool/BUILD index a100079231..0e8febccf0 100644 --- a/test/common/shared_pool/BUILD +++ b/test/common/shared_pool/BUILD @@ -11,7 +11,7 @@ envoy_package() envoy_cc_test( name = "shared_pool_test", srcs = ["shared_pool_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/event:timer_lib", "//source/common/shared_pool:shared_pool_lib", diff --git a/test/common/signal/BUILD b/test/common/signal/BUILD index 08830d2e22..80da57e871 100644 --- a/test/common/signal/BUILD +++ b/test/common/signal/BUILD @@ -11,7 +11,7 @@ envoy_package() envoy_cc_test( name = "signals_test", srcs = ["signals_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", # Posix signal tests are irrelevant to Windows tags = [ "backtrace", @@ -28,7 +28,7 @@ envoy_cc_test( envoy_cc_test( name = "fatal_action_test", srcs = ["fatal_action_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/signal:fatal_error_handler_lib", "//test/mocks/server:instance_mocks", diff --git a/test/common/singleton/BUILD b/test/common/singleton/BUILD index ec8ed5b701..d92cd8d55c 100644 --- a/test/common/singleton/BUILD +++ b/test/common/singleton/BUILD @@ -11,7 +11,7 @@ envoy_package() envoy_cc_test( name = "manager_impl_test", srcs = ["manager_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/singleton:manager_impl_lib", "//test/test_common:utility_lib", @@ -21,7 +21,7 @@ envoy_cc_test( envoy_cc_test( name = "threadsafe_singleton_test", srcs = ["threadsafe_singleton_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/common:thread_lib", "//source/common/singleton:threadsafe_singleton", diff --git a/test/common/ssl/matching/BUILD b/test/common/ssl/matching/BUILD index 06cd92a4cd..e9e7dbe451 100644 --- a/test/common/ssl/matching/BUILD +++ b/test/common/ssl/matching/BUILD @@ -11,7 +11,7 @@ envoy_package() envoy_cc_test( name = "inputs_test", srcs = ["inputs_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/http/matching:data_impl_lib", "//source/common/network:address_lib", @@ -25,7 +25,7 @@ envoy_cc_test( envoy_cc_test( name = "inputs_integration_test", srcs = ["inputs_integration_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/http/matching:data_impl_lib", "//source/common/network/matching:data_impl_lib", diff --git a/test/common/stats/BUILD b/test/common/stats/BUILD index cc8bbd06d5..b03ea3d337 100644 --- a/test/common/stats/BUILD +++ b/test/common/stats/BUILD @@ -15,7 +15,7 @@ envoy_package() envoy_cc_test( name = "allocator_impl_test", srcs = ["allocator_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/stats:allocator_lib", "//test/test_common:logging_lib", @@ -26,7 +26,7 @@ envoy_cc_test( envoy_cc_test( name = "custom_stat_namespaces_impl_test", srcs = ["custom_stat_namespaces_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/stats:custom_stat_namespaces_lib", ], @@ -35,7 +35,7 @@ envoy_cc_test( envoy_cc_test( name = "isolated_store_impl_test", srcs = ["isolated_store_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/stats:isolated_store_lib", ], @@ -44,7 +44,7 @@ envoy_cc_test( envoy_cc_test( name = "histogram_impl_test", srcs = ["histogram_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/stats:histogram_lib", "//test/mocks/server:server_factory_context_mocks", @@ -55,7 +55,7 @@ envoy_cc_test( envoy_cc_test( name = "metric_impl_test", srcs = ["metric_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/stats:allocator_lib", "//source/common/stats:utility_lib", @@ -66,7 +66,7 @@ envoy_cc_test( envoy_cc_test( name = "recent_lookups_test", srcs = ["recent_lookups_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/common:utility_lib", "//source/common/stats:recent_lookups_lib", @@ -81,7 +81,7 @@ envoy_cc_benchmark_binary( external_deps = [ "benchmark", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/common:random_generator_lib", "//source/common/common:utility_lib", @@ -98,7 +98,7 @@ envoy_benchmark_test( envoy_cc_test( name = "stat_merger_test", srcs = ["stat_merger_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":stat_test_utility_lib", "//source/common/stats:isolated_store_lib", @@ -140,7 +140,7 @@ envoy_cc_test_library( envoy_cc_test( name = "stat_test_utility_test", srcs = ["stat_test_utility_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":stat_test_utility_lib", "//source/common/stats:isolated_store_lib", @@ -150,7 +150,7 @@ envoy_cc_test( envoy_cc_test( name = "stats_matcher_impl_test", srcs = ["stats_matcher_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/memory:stats_lib", "//source/common/stats:stats_matcher_lib", @@ -164,7 +164,7 @@ envoy_cc_test( envoy_cc_test( name = "refcount_ptr_test", srcs = ["refcount_ptr_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = ["//envoy/stats:refcount_ptr_interface"], ) @@ -172,7 +172,7 @@ envoy_cc_test( name = "symbol_table_impl_test", srcs = ["symbol_table_impl_test.cc"], external_deps = ["abseil_hash_testing"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":stat_test_utility_lib", "//source/common/common:mutex_tracer_lib", @@ -189,7 +189,7 @@ envoy_cc_fuzz_test( name = "stat_merger_fuzz_test", srcs = ["stat_merger_fuzz_test.cc"], corpus = "stat_merger_corpus", - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/common:assert_lib", "//source/common/stats:symbol_table_lib", @@ -201,7 +201,7 @@ envoy_cc_fuzz_test( name = "symbol_table_fuzz_test", srcs = ["symbol_table_fuzz_test.cc"], corpus = "symbol_table_corpus", - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":stat_test_utility_lib", "//source/common/buffer:buffer_lib", @@ -215,7 +215,7 @@ envoy_cc_fuzz_test( name = "utility_fuzz_test", srcs = ["utility_fuzz_test.cc"], corpus = "utility_corpus", - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/stats:utility_lib", ], @@ -236,7 +236,7 @@ envoy_cc_benchmark_binary( "abseil_strings", "benchmark", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":make_elements_helper_lib", ":stat_test_utility_lib", @@ -254,7 +254,7 @@ envoy_cc_benchmark_binary( envoy_cc_test( name = "deferred_creation_stats_test", srcs = ["deferred_creation_stats_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/stats:stats_interface", "//source/common/memory:stats_lib", @@ -270,7 +270,7 @@ envoy_cc_benchmark_binary( external_deps = [ "benchmark", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":real_thread_test_base", "//source/common/common:random_generator_lib", @@ -303,7 +303,7 @@ envoy_cc_benchmark_binary( "abseil_strings", "benchmark", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/memory:stats_lib", "//source/common/stats:stats_matcher_lib", @@ -323,7 +323,7 @@ envoy_benchmark_test( envoy_cc_test( name = "tag_extractor_impl_test", srcs = ["tag_extractor_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/stats:tag_extractor_lib", "//source/common/stats:tag_producer_lib", @@ -335,7 +335,7 @@ envoy_cc_test( envoy_cc_test( name = "tag_producer_impl_test", srcs = ["tag_producer_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/stats:tag_producer_lib", "//test/test_common:utility_lib", @@ -351,7 +351,7 @@ envoy_cc_benchmark_binary( external_deps = [ "benchmark", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/stats:tag_producer_lib", "@envoy_api//envoy/config/metrics/v3:pkg_cc_proto", @@ -366,7 +366,7 @@ envoy_benchmark_test( envoy_cc_test( name = "thread_local_store_test", srcs = ["thread_local_store_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":real_thread_test_base", ":stat_test_utility_lib", @@ -395,7 +395,7 @@ envoy_cc_benchmark_binary( "abseil_strings", "benchmark", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":stat_test_utility_lib", "//source/common/common:thread_lib", @@ -419,7 +419,7 @@ envoy_benchmark_test( envoy_cc_test( name = "utility_test", srcs = ["utility_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":stat_test_utility_lib", "//source/common/stats:isolated_store_lib", diff --git a/test/common/stream_info/BUILD b/test/common/stream_info/BUILD index 0f37c52e0e..63d39eb6a3 100644 --- a/test/common/stream_info/BUILD +++ b/test/common/stream_info/BUILD @@ -12,7 +12,7 @@ envoy_package() envoy_cc_test( name = "filter_state_impl_test", srcs = ["filter_state_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/stream_info:filter_state_lib", "//test/test_common:utility_lib", @@ -22,7 +22,7 @@ envoy_cc_test( envoy_cc_test( name = "stream_info_impl_test", srcs = ["stream_info_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":test_int_accessor_lib", "//envoy/http:protocol_interface", @@ -65,7 +65,7 @@ envoy_cc_test_library( envoy_cc_test( name = "utility_test", srcs = ["utility_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/stream_info:utility_lib", "//test/mocks/stream_info:stream_info_mocks", @@ -77,7 +77,7 @@ envoy_cc_test( envoy_cc_test( name = "uint32_accessor_impl_test", srcs = ["uint32_accessor_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/stream_info:uint32_accessor_lib", ], @@ -86,7 +86,7 @@ envoy_cc_test( envoy_cc_test( name = "uint64_accessor_impl_test", srcs = ["uint64_accessor_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/stream_info:uint64_accessor_lib", ], @@ -95,7 +95,7 @@ envoy_cc_test( envoy_cc_test( name = "bool_accessor_impl_test", srcs = ["bool_accessor_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/stream_info:bool_accessor_lib", ], diff --git a/test/common/tcp/BUILD b/test/common/tcp/BUILD index 3da91d29ba..72eab15f2d 100644 --- a/test/common/tcp/BUILD +++ b/test/common/tcp/BUILD @@ -11,7 +11,7 @@ envoy_package() envoy_cc_test( name = "conn_pool_test", srcs = ["conn_pool_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/event:dispatcher_lib", "//source/common/network:utility_lib", @@ -34,7 +34,7 @@ envoy_cc_test( envoy_cc_test( name = "async_tcp_client_impl_test", srcs = ["async_tcp_client_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/network:utility_lib", "//source/common/tcp:async_tcp_client_lib", diff --git a/test/common/tcp_proxy/BUILD b/test/common/tcp_proxy/BUILD index a8996ad30c..5de59b0f34 100644 --- a/test/common/tcp_proxy/BUILD +++ b/test/common/tcp_proxy/BUILD @@ -52,7 +52,7 @@ envoy_cc_test( srcs = [ "config_test.cc", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":tcp_proxy_test_base", "//envoy/common:hashable_interface", @@ -64,7 +64,7 @@ envoy_cc_test( srcs = [ "tcp_proxy_test.cc", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":tcp_proxy_test_base", "@envoy_api//envoy/config/accesslog/v3:pkg_cc_proto", @@ -78,7 +78,7 @@ envoy_cc_test( envoy_cc_test( name = "upstream_test", srcs = ["upstream_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/tcp_proxy", "//test/common/memory:memory_test_utility_lib", diff --git a/test/common/thread_local/BUILD b/test/common/thread_local/BUILD index e42e5574ea..1abb3c0dc0 100644 --- a/test/common/thread_local/BUILD +++ b/test/common/thread_local/BUILD @@ -11,7 +11,7 @@ envoy_package() envoy_cc_test( name = "thread_local_impl_test", srcs = ["thread_local_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/api:api_lib", "//source/common/event:dispatcher_lib", diff --git a/test/common/tls/BUILD b/test/common/tls/BUILD index a7483c83a9..d021d32080 100644 --- a/test/common/tls/BUILD +++ b/test/common/tls/BUILD @@ -30,7 +30,7 @@ envoy_cc_test( "//test/common/tls/test_data:certs", ], external_deps = ["ssl"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":ssl_certs_test_lib", ":test_private_key_method_provider_test_lib", @@ -85,7 +85,7 @@ envoy_cc_test( "//test/common/tls/ocsp/test_data:certs", "//test/common/tls/test_data:certs", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "ssl_certs_test_lib", ":ssl_test_utils", @@ -116,7 +116,7 @@ envoy_cc_test( name = "io_handle_bio_test", srcs = ["io_handle_bio_test.cc"], external_deps = ["ssl"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":ssl_test_utils", "//source/common/tls:ssl_socket_lib", @@ -133,7 +133,7 @@ envoy_cc_test( "//test/common/tls/test_data:certs", ], external_deps = ["ssl"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":ssl_test_utils", "//source/common/tls:utility_lib", @@ -182,7 +182,7 @@ envoy_cc_test( "//test/common/tls/test_data:certs", ], external_deps = ["ssl"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":ssl_socket_test", ":ssl_test_utils", @@ -201,7 +201,7 @@ envoy_cc_test( envoy_cc_test( name = "handshaker_factory_test", srcs = ["handshaker_factory_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/stream_info:stream_info_lib", "//source/common/tls:context_lib", @@ -231,7 +231,7 @@ envoy_cc_benchmark_binary( "benchmark", "ssl", ], - rbe_pool = "2core", + rbe_pool = "6gig", # Uses raw POSIX syscalls, does not build on Windows. tags = ["skip_on_windows"], deps = [ diff --git a/test/common/tls/cert_validator/BUILD b/test/common/tls/cert_validator/BUILD index 9c63cf28a9..67ef47884e 100644 --- a/test/common/tls/cert_validator/BUILD +++ b/test/common/tls/cert_validator/BUILD @@ -17,7 +17,7 @@ envoy_cc_test( data = [ "//test/common/tls/test_data:certs", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/tls/cert_validator:cert_validator_lib", "//test/common/tls:ssl_test_utils", @@ -33,7 +33,7 @@ envoy_cc_test( srcs = [ "factory_test.cc", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/tls/cert_validator:cert_validator_lib", "//test/common/tls/cert_validator:test_common", @@ -56,7 +56,7 @@ envoy_cc_test( srcs = [ "san_matcher_test.cc", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/protobuf:utility_lib", "//source/common/tls/cert_validator:cert_validator_lib", @@ -81,7 +81,7 @@ envoy_cc_test( "//test/common/tls/test_data:certs", "//test/config/integration/certs", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":default_validator_integration_test_lib", "//test/integration:http_integration_lib", diff --git a/test/common/tls/integration/BUILD b/test/common/tls/integration/BUILD index 75376be474..f29f7e4e15 100644 --- a/test/common/tls/integration/BUILD +++ b/test/common/tls/integration/BUILD @@ -15,7 +15,7 @@ envoy_cc_test_library( "ssl_integration_test_base.cc", ], hdrs = ["ssl_integration_test_base.h"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//test/common/config:dummy_config_proto_cc_proto", "//test/integration:http_integration_lib", @@ -33,7 +33,7 @@ envoy_cc_test( data = [ "//test/config/integration/certs", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":sni_to_header_filter_lib", ":ssl_integration_test_lib", diff --git a/test/common/tls/ocsp/BUILD b/test/common/tls/ocsp/BUILD index 23a7393ed9..0a1c4da04f 100644 --- a/test/common/tls/ocsp/BUILD +++ b/test/common/tls/ocsp/BUILD @@ -17,7 +17,7 @@ envoy_cc_test( "//test/common/tls/ocsp/test_data:certs", ], external_deps = ["ssl"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/filesystem:filesystem_lib", "//source/common/tls:utility_lib", @@ -36,7 +36,7 @@ envoy_cc_test( "asn1_utility_test.cc", ], external_deps = ["ssl"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/tls/ocsp:asn1_utility_lib", "//test/common/tls:ssl_test_utils", diff --git a/test/common/tracing/BUILD b/test/common/tracing/BUILD index 6549c8e190..7a7de1fd55 100644 --- a/test/common/tracing/BUILD +++ b/test/common/tracing/BUILD @@ -13,7 +13,7 @@ envoy_cc_test( srcs = [ "http_tracer_impl_test.cc", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/common:base64_lib", "//source/common/http:header_map_lib", @@ -42,7 +42,7 @@ envoy_cc_test( srcs = [ "tracer_impl_test.cc", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/network:address_lib", "//source/common/tracing:custom_tag_lib", @@ -65,7 +65,7 @@ envoy_cc_test( srcs = [ "tracer_manager_impl_test.cc", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/tracing:tracer_config_lib", "//source/common/tracing:tracer_lib", @@ -83,7 +83,7 @@ envoy_cc_test( srcs = [ "tracer_config_impl_test.cc", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/tracing:tracer_config_lib", ], @@ -94,7 +94,7 @@ envoy_cc_test( srcs = [ "trace_context_impl_test.cc", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/tracing:http_tracer_lib", "//source/common/tracing:trace_context_lib", diff --git a/test/common/upstream/BUILD b/test/common/upstream/BUILD index 0f8c61db7d..781743a625 100644 --- a/test/common/upstream/BUILD +++ b/test/common/upstream/BUILD @@ -16,7 +16,7 @@ envoy_package() envoy_cc_test( name = "od_cds_api_impl_test", srcs = ["od_cds_api_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/config:subscription_interface", "//source/common/stats:isolated_store_lib", @@ -31,7 +31,7 @@ envoy_cc_test( envoy_cc_test( name = "cds_api_impl_test", srcs = ["cds_api_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":utility_lib", "//source/common/config:utility_lib", @@ -51,7 +51,7 @@ envoy_cc_test( envoy_cc_test( name = "cluster_discovery_manager_test", srcs = ["cluster_discovery_manager_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/upstream:cluster_manager_interface", "//source/common/common:cleanup_lib", @@ -66,7 +66,7 @@ envoy_cc_test( external_deps = [ "abseil_base", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":test_cluster_manager", "//envoy/upstream:cluster_manager_interface", @@ -92,7 +92,7 @@ envoy_cc_test( external_deps = [ "abseil_optional", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":test_cluster_manager", "//source/common/router:context_lib", @@ -139,7 +139,7 @@ envoy_cc_test( envoy_cc_test( name = "cluster_update_tracker_test", srcs = ["cluster_update_tracker_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/upstream:cluster_update_tracker_lib", "//test/mocks/upstream:cluster_manager_mocks", @@ -150,7 +150,7 @@ envoy_cc_test( envoy_cc_test( name = "conn_pool_map_impl_test", srcs = ["conn_pool_map_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/http:conn_pool_interface", "//source/common/upstream:conn_pool_map_impl_lib", @@ -165,7 +165,7 @@ envoy_cc_test( envoy_cc_test( name = "wrsq_scheduler_test", srcs = ["wrsq_scheduler_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/upstream:scheduler_lib", "//test/mocks:common_lib", @@ -175,7 +175,7 @@ envoy_cc_test( envoy_cc_test( name = "edf_scheduler_test", srcs = ["edf_scheduler_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/upstream:scheduler_lib", "//test/test_common:utility_lib", @@ -190,7 +190,7 @@ envoy_cc_test_library( hdrs = [ "health_check_fuzz_test_utils.h", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":utility_lib", "//source/extensions/health_checkers/grpc:health_checker_lib", @@ -211,7 +211,7 @@ envoy_cc_test( srcs = [ "health_checker_impl_test.cc", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":utility_lib", "//source/common/buffer:buffer_lib", @@ -253,7 +253,7 @@ envoy_cc_test( envoy_cc_test( name = "host_stats_test", srcs = ["host_stats_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/upstream:host_description_interface", ], @@ -262,7 +262,7 @@ envoy_cc_test( envoy_cc_test( name = "host_utility_test", srcs = ["host_utility_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":utility_lib", "//source/common/network:utility_lib", @@ -280,7 +280,7 @@ envoy_cc_test( envoy_cc_test( name = "load_balancer_context_base_test", srcs = ["load_balancer_context_base_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/upstream:load_balancer_context_base_lib", "//test/mocks/upstream:host_mocks", @@ -291,7 +291,7 @@ envoy_cc_test( envoy_cc_test( name = "load_balancer_simulation_test", srcs = ["load_balancer_simulation_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":utility_lib", "//source/common/common:random_generator_lib", @@ -316,7 +316,7 @@ envoy_cc_test( envoy_cc_test( name = "load_stats_reporter_test", srcs = ["load_stats_reporter_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/stats:stats_lib", "//source/common/upstream:load_stats_reporter_lib", @@ -336,7 +336,7 @@ envoy_cc_test( envoy_cc_test( name = "hds_test", srcs = ["hds_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/tls:context_lib", "//source/common/upstream:health_discovery_service_lib", @@ -370,7 +370,7 @@ envoy_cc_test( name = "outlier_detection_impl_test", srcs = ["outlier_detection_impl_test.cc"], external_deps = ["abseil_optional"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":utility_lib", "//envoy/common:time_interface", @@ -397,7 +397,7 @@ envoy_cc_test( envoy_cc_test( name = "priority_conn_pool_map_impl_test", srcs = ["priority_conn_pool_map_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/http:conn_pool_interface", "//source/common/upstream:priority_conn_pool_map_impl_lib", @@ -412,7 +412,7 @@ envoy_cc_test( envoy_cc_test( name = "resource_manager_impl_test", srcs = ["resource_manager_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/upstream:upstream_interface", "//source/common/upstream:resource_manager_lib", @@ -424,7 +424,7 @@ envoy_cc_test( envoy_cc_test( name = "transport_socket_matcher_test", srcs = ["transport_socket_matcher_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/api:api_interface", "//source/common/config:metadata_lib", @@ -445,7 +445,7 @@ envoy_cc_test( name = "upstream_impl_test", srcs = ["upstream_impl_test.cc"], data = ["//test/common/tls/test_data:certs"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":utility_lib", ":test_local_address_selector", @@ -562,7 +562,7 @@ envoy_cc_test_library( envoy_cc_test( name = "cluster_factory_impl_test", srcs = ["cluster_factory_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":utility_lib", "//envoy/api:api_interface", @@ -599,7 +599,7 @@ envoy_cc_test_library( name = "health_check_fuzz_lib", srcs = ["health_check_fuzz.cc"], hdrs = ["health_check_fuzz.h"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":health_check_fuzz_proto_cc_proto", ":health_check_fuzz_utils_lib", @@ -621,7 +621,7 @@ envoy_cc_fuzz_test( name = "health_check_fuzz_test", srcs = ["health_check_fuzz_test.cc"], corpus = "health_check_corpus", - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":health_check_fuzz_lib", ":health_check_fuzz_proto_cc_proto", @@ -645,7 +645,7 @@ envoy_cc_test( name = "default_local_address_selector_test", size = "small", srcs = ["default_local_address_selector_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/common:base_includes", "//envoy/network:socket_interface", @@ -661,7 +661,7 @@ envoy_cc_test( name = "local_address_selector_integration_test", size = "large", srcs = ["local_address_selector_integration_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "test_local_address_selector", "//source/extensions/load_balancing_policies/round_robin:config", diff --git a/test/common/watchdog/BUILD b/test/common/watchdog/BUILD index a4ec040cfc..99a85ba049 100644 --- a/test/common/watchdog/BUILD +++ b/test/common/watchdog/BUILD @@ -14,7 +14,7 @@ envoy_cc_test( external_deps = [ "abseil_synchronization", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/common:time_interface", "//envoy/registry", @@ -31,7 +31,7 @@ envoy_cc_test( envoy_cc_test( name = "abort_action_config_test", srcs = ["abort_action_config_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/registry", "//envoy/server:guarddog_config_interface", diff --git a/test/common/websocket/BUILD b/test/common/websocket/BUILD index 55734055f2..eee183f89f 100644 --- a/test/common/websocket/BUILD +++ b/test/common/websocket/BUILD @@ -11,7 +11,7 @@ envoy_package() envoy_cc_test( name = "codec_test", srcs = ["codec_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/buffer:buffer_lib", "//source/common/websocket:codec_lib", diff --git a/test/config_test/BUILD b/test/config_test/BUILD index 5020066471..6304e1a5ab 100644 --- a/test/config_test/BUILD +++ b/test/config_test/BUILD @@ -40,7 +40,7 @@ envoy_cc_test( "EXAMPLE_CONFIGS_TAR_PATH": "envoy/configs/example_configs.tar", "GODEBUG": "cgocheck=0", }, - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":example_configs_test_lib", ], @@ -50,7 +50,7 @@ envoy_cc_test_library( name = "config_test_lib", srcs = ["config_test.cc"], hdrs = ["config_test.h"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/api:api_lib", "//source/common/protobuf:utility_lib", diff --git a/test/dependencies/BUILD b/test/dependencies/BUILD index 43c33fb8a1..3d292c345c 100644 --- a/test/dependencies/BUILD +++ b/test/dependencies/BUILD @@ -14,5 +14,5 @@ envoy_cc_test( external_deps = [ "curl", ], - rbe_pool = "2core", + rbe_pool = "6gig", ) diff --git a/test/exe/BUILD b/test/exe/BUILD index 10cea8ba2d..cae23c8ea0 100644 --- a/test/exe/BUILD +++ b/test/exe/BUILD @@ -68,7 +68,7 @@ envoy_cc_test_library( data = [ "//test/config/integration:google_com_proxy_port_0", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/api:api_lib", "//source/common/stats:isolated_store_lib", @@ -88,7 +88,7 @@ envoy_cc_test( data = [ "//test/config/integration:google_com_proxy_port_0", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = envoy_select_admin_functionality([":main_common_test_base_lib"]) + [ "//source/common/api:api_lib", "//source/exe:envoy_main_common_with_core_extensions_lib", @@ -106,7 +106,7 @@ envoy_cc_test( data = [ "//test/config/integration:google_com_proxy_port_0", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = envoy_select_admin_functionality([":main_common_test_base_lib"]) + [ "//source/common/api:api_lib", "//source/exe:envoy_main_common_with_core_extensions_lib", @@ -122,7 +122,7 @@ envoy_cc_test( name = "extra_extensions_test", size = "large", srcs = ["extra_extensions_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//test/test_common:environment_lib", ] + select({ @@ -136,7 +136,7 @@ envoy_cc_test( envoy_cc_test( name = "terminate_handler_test", srcs = ["terminate_handler_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["backtrace"], deps = [ "//source/exe:terminate_handler_lib", @@ -151,7 +151,7 @@ envoy_cc_test( data = [ "//source/extensions:extensions_metadata.yaml", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//test/test_common:environment_lib", ] + select({ @@ -170,7 +170,7 @@ envoy_cc_test( "//source/exe:envoy-static", "//test/config/integration:google_com_proxy_port_0", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/api:api_lib", "//source/exe:envoy_main_common_with_core_extensions_lib", @@ -206,7 +206,7 @@ envoy_cc_test( envoy_cc_test( name = "platform_impl_test", srcs = ["platform_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/exe:platform_impl_lib", "//test/mocks/runtime:runtime_mocks", diff --git a/test/extensions/access_loggers/common/BUILD b/test/extensions/access_loggers/common/BUILD index 90f00365ad..5236fc07bb 100644 --- a/test/extensions/access_loggers/common/BUILD +++ b/test/extensions/access_loggers/common/BUILD @@ -11,7 +11,7 @@ envoy_package() envoy_cc_test( name = "access_log_base_test", srcs = ["access_log_base_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/access_loggers/common:access_log_base", "//test/mocks/access_log:access_log_mocks", @@ -22,7 +22,7 @@ envoy_cc_test( envoy_cc_test( name = "grpc_access_logger_test", srcs = ["grpc_access_logger_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/protobuf", "//source/extensions/access_loggers/common:grpc_access_logger", diff --git a/test/extensions/access_loggers/file/BUILD b/test/extensions/access_loggers/file/BUILD index ae90136d5a..6dbac4a445 100644 --- a/test/extensions/access_loggers/file/BUILD +++ b/test/extensions/access_loggers/file/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.access_loggers.file"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/access_loggers/file:config", "//test/mocks/server:factory_context_mocks", diff --git a/test/extensions/access_loggers/fluentd/BUILD b/test/extensions/access_loggers/fluentd/BUILD index 890bbb4d96..f2e202b279 100644 --- a/test/extensions/access_loggers/fluentd/BUILD +++ b/test/extensions/access_loggers/fluentd/BUILD @@ -18,7 +18,7 @@ envoy_extension_cc_test( external_deps = [ "msgpack", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/access_loggers/fluentd:config", "//test/mocks/server:factory_context_mocks", @@ -33,7 +33,7 @@ envoy_extension_cc_test( name = "substitution_formatter_test", srcs = ["substitution_formatter_test.cc"], extension_names = ["envoy.access_loggers.fluentd"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/access_loggers/fluentd:substitution_formatter_lib", "//test/mocks/server:factory_context_mocks", @@ -47,7 +47,7 @@ envoy_extension_cc_test( size = "large", srcs = ["fluentd_access_log_integration_test.cc"], extension_names = ["envoy.access_loggers.fluentd"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/access_loggers/fluentd:config", "//source/extensions/filters/network/tcp_proxy:config", diff --git a/test/extensions/access_loggers/grpc/BUILD b/test/extensions/access_loggers/grpc/BUILD index 395067adc6..3898b5256c 100644 --- a/test/extensions/access_loggers/grpc/BUILD +++ b/test/extensions/access_loggers/grpc/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "grpc_access_log_impl_test", srcs = ["grpc_access_log_impl_test.cc"], extension_names = ["envoy.access_loggers.http_grpc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/buffer:zero_copy_input_stream_lib", "//source/extensions/access_loggers/grpc:http_grpc_access_log_lib", @@ -40,7 +40,7 @@ envoy_extension_cc_test( ], }), extension_names = ["envoy.access_loggers.http_grpc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/access_loggers/grpc:grpc_access_log_utils", "//test/mocks/local_info:local_info_mocks", @@ -59,7 +59,7 @@ envoy_extension_cc_test( name = "http_grpc_access_log_impl_test", srcs = ["http_grpc_access_log_impl_test.cc"], extension_names = ["envoy.access_loggers.http_grpc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/router:string_accessor_lib", "//source/common/stream_info:uint32_accessor_lib", @@ -79,7 +79,7 @@ envoy_extension_cc_test( name = "http_config_test", srcs = ["http_config_test.cc"], extension_names = ["envoy.access_loggers.http_grpc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/access_loggers/grpc:http_config", "//test/mocks/server:factory_context_mocks", @@ -93,7 +93,7 @@ envoy_extension_cc_test( size = "large", srcs = ["http_grpc_access_log_integration_test.cc"], extension_names = ["envoy.access_loggers.http_grpc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/buffer:zero_copy_input_stream_lib", "//source/common/grpc:codec_lib", @@ -113,7 +113,7 @@ envoy_extension_cc_test( name = "tcp_config_test", srcs = ["tcp_config_test.cc"], extension_names = ["envoy.access_loggers.tcp_grpc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/access_loggers/grpc:tcp_config", "//test/mocks/server:factory_context_mocks", @@ -133,7 +133,7 @@ envoy_extension_cc_test( ], }), extension_names = ["envoy.access_loggers.tcp_grpc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/buffer:zero_copy_input_stream_lib", "//source/common/grpc:codec_lib", diff --git a/test/extensions/access_loggers/open_telemetry/BUILD b/test/extensions/access_loggers/open_telemetry/BUILD index 8ce2d3233d..89ea7cac9f 100644 --- a/test/extensions/access_loggers/open_telemetry/BUILD +++ b/test/extensions/access_loggers/open_telemetry/BUILD @@ -17,7 +17,7 @@ envoy_extension_cc_test( name = "grpc_access_log_impl_test", srcs = ["grpc_access_log_impl_test.cc"], extension_names = ["envoy.access_loggers.open_telemetry"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/buffer:zero_copy_input_stream_lib", "//source/common/protobuf", @@ -36,7 +36,7 @@ envoy_extension_cc_test( name = "access_log_impl_test", srcs = ["access_log_impl_test.cc"], extension_names = ["envoy.access_loggers.open_telemetry"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/common:time_interface", "//source/common/protobuf", @@ -60,7 +60,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.access_loggers.open_telemetry"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/access_loggers/open_telemetry:access_log_lib", "//source/extensions/access_loggers/open_telemetry:config", @@ -75,7 +75,7 @@ envoy_extension_cc_test( size = "large", srcs = ["access_log_integration_test.cc"], extension_names = ["envoy.access_loggers.open_telemetry"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/buffer:zero_copy_input_stream_lib", "//source/common/grpc:codec_lib", @@ -102,7 +102,7 @@ envoy_extension_cc_test( ], }), extension_names = ["envoy.access_loggers.open_telemetry"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["skip_on_windows"], deps = [ "//source/common/formatter:substitution_formatter_lib", @@ -134,7 +134,7 @@ envoy_cc_benchmark_binary( external_deps = [ "benchmark", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/http:header_map_lib", "//source/common/network:address_lib", diff --git a/test/extensions/access_loggers/stream/BUILD b/test/extensions/access_loggers/stream/BUILD index 8a86d60ccd..9eb1e7472c 100644 --- a/test/extensions/access_loggers/stream/BUILD +++ b/test/extensions/access_loggers/stream/BUILD @@ -12,7 +12,7 @@ envoy_package() envoy_cc_test( name = "stdout_config_test", srcs = ["stdout_config_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":stream_test_base", "@envoy_api//envoy/extensions/access_loggers/stream/v3:pkg_cc_proto", @@ -22,7 +22,7 @@ envoy_cc_test( envoy_cc_test( name = "stderr_config_test", srcs = ["stderr_config_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":stream_test_base", "@envoy_api//envoy/extensions/access_loggers/stream/v3:pkg_cc_proto", diff --git a/test/extensions/access_loggers/wasm/BUILD b/test/extensions/access_loggers/wasm/BUILD index 04f3c66840..584d50e336 100644 --- a/test/extensions/access_loggers/wasm/BUILD +++ b/test/extensions/access_loggers/wasm/BUILD @@ -22,7 +22,7 @@ envoy_extension_cc_test( "//test/extensions/access_loggers/wasm/test_data:test_cpp.wasm", ]), extension_names = ["envoy.access_loggers.wasm"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["skip_on_windows"], deps = [ "//source/extensions/access_loggers/wasm:config", diff --git a/test/extensions/bootstrap/internal_listener/BUILD b/test/extensions/bootstrap/internal_listener/BUILD index ce3e3d2d0f..d5672d87bf 100644 --- a/test/extensions/bootstrap/internal_listener/BUILD +++ b/test/extensions/bootstrap/internal_listener/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "client_connection_factory_test", srcs = ["client_connection_factory_test.cc"], extension_names = ["envoy.bootstrap.internal_listener"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/common:utility_lib", "//source/common/network:address_lib", @@ -31,7 +31,7 @@ envoy_extension_cc_test( size = "large", srcs = ["internal_listener_registry_test.cc"], extension_names = ["envoy.bootstrap.internal_listener"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/bootstrap/internal_listener:config", "//test/mocks/thread_local:thread_local_mocks", @@ -45,7 +45,7 @@ envoy_extension_cc_test( "internal_listener_integration_test.cc", ], extension_names = ["envoy.bootstrap.internal_listener"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/config:api_version_lib", "//source/common/event:dispatcher_includes", @@ -74,7 +74,7 @@ envoy_extension_cc_test( size = "large", srcs = ["active_internal_listener_test.cc"], extension_names = ["envoy.bootstrap.internal_listener"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/listener_manager:connection_handler_lib", "//source/common/network:address_lib", diff --git a/test/extensions/bootstrap/wasm/BUILD b/test/extensions/bootstrap/wasm/BUILD index 72d1f08e9a..51c2d1cb42 100644 --- a/test/extensions/bootstrap/wasm/BUILD +++ b/test/extensions/bootstrap/wasm/BUILD @@ -32,7 +32,7 @@ envoy_extension_cc_test( ]), extension_names = ["envoy.bootstrap.wasm"], external_deps = ["abseil_optional"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["skip_on_windows"], deps = [ "//source/common/event:dispatcher_lib", @@ -57,7 +57,7 @@ envoy_extension_cc_test( "//test/extensions/bootstrap/wasm/test_data:http_cpp.wasm", ]), extension_names = ["envoy.bootstrap.wasm"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["skip_on_windows"], deps = [ "//source/extensions/bootstrap/wasm:config", @@ -75,7 +75,7 @@ envoy_extension_cc_test( "//test/extensions/bootstrap/wasm/test_data:start_cpp.wasm", ]), extension_names = ["envoy.bootstrap.wasm"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["skip_on_windows"], deps = [ "//envoy/registry", @@ -104,7 +104,7 @@ envoy_extension_cc_test_binary( "abseil_optional", "benchmark", ], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["skip_on_windows"], deps = [ "//source/common/event:dispatcher_lib", diff --git a/test/extensions/clusters/aggregate/BUILD b/test/extensions/clusters/aggregate/BUILD index 7d8c739d35..41bc27f105 100644 --- a/test/extensions/clusters/aggregate/BUILD +++ b/test/extensions/clusters/aggregate/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "cluster_test", srcs = ["cluster_test.cc"], extension_names = ["envoy.clusters.aggregate"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/clusters/aggregate:cluster", "//source/extensions/load_balancing_policies/cluster_provided:config", @@ -39,7 +39,7 @@ envoy_extension_cc_test( name = "cluster_update_test", srcs = ["cluster_update_test.cc"], extension_names = ["envoy.clusters.aggregate"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/router:context_lib", "//source/common/upstream:cluster_factory_lib", @@ -67,7 +67,7 @@ envoy_extension_cc_test( size = "large", srcs = ["cluster_integration_test.cc"], extension_names = ["envoy.clusters.aggregate"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/config:protobuf_link_hacks", "//source/common/protobuf:utility_lib", diff --git a/test/extensions/clusters/common/BUILD b/test/extensions/clusters/common/BUILD index 65f9d13c76..e3b6361029 100644 --- a/test/extensions/clusters/common/BUILD +++ b/test/extensions/clusters/common/BUILD @@ -11,7 +11,7 @@ envoy_package() envoy_cc_test( name = "logical_host_test", srcs = ["logical_host_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/clusters/common:logical_host_lib", "//test/mocks/network:transport_socket_mocks", @@ -22,7 +22,7 @@ envoy_cc_test( envoy_cc_test( name = "logical_host_integration_test", srcs = ["logical_host_integration_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/config:utility_lib", "//source/extensions/clusters/common:logical_host_lib", diff --git a/test/extensions/clusters/dynamic_forward_proxy/BUILD b/test/extensions/clusters/dynamic_forward_proxy/BUILD index 9d7d8cfff8..33d9f5adfa 100644 --- a/test/extensions/clusters/dynamic_forward_proxy/BUILD +++ b/test/extensions/clusters/dynamic_forward_proxy/BUILD @@ -16,7 +16,7 @@ envoy_extension_cc_test( srcs = ["cluster_test.cc"], data = ["//test/common/tls/test_data:certs"], extension_names = ["envoy.filters.http.dynamic_forward_proxy"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/router:string_accessor_lib", "//source/extensions/clusters/dynamic_forward_proxy:cluster", diff --git a/test/extensions/clusters/eds/BUILD b/test/extensions/clusters/eds/BUILD index dd86877129..8ccd488e41 100644 --- a/test/extensions/clusters/eds/BUILD +++ b/test/extensions/clusters/eds/BUILD @@ -13,7 +13,7 @@ envoy_package() envoy_cc_test( name = "eds_test", srcs = ["eds_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/config:utility_lib", "//source/extensions/clusters/eds:eds_lib", @@ -49,7 +49,7 @@ envoy_cc_benchmark_binary( external_deps = [ "benchmark", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/config:xds_resources_delegate_interface", "//source/common/config:protobuf_link_hacks", @@ -86,7 +86,7 @@ envoy_benchmark_test( envoy_cc_test( name = "leds_test", srcs = ["leds_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/config:utility_lib", "//source/extensions/clusters/eds:leds_lib", diff --git a/test/extensions/clusters/logical_dns/BUILD b/test/extensions/clusters/logical_dns/BUILD index 2d4104964a..cee514c078 100644 --- a/test/extensions/clusters/logical_dns/BUILD +++ b/test/extensions/clusters/logical_dns/BUILD @@ -11,7 +11,7 @@ envoy_package() envoy_cc_test( name = "logical_dns_cluster_test", srcs = ["logical_dns_cluster_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/event:dispatcher_lib", "//source/common/network:utility_lib", diff --git a/test/extensions/clusters/original_dst/BUILD b/test/extensions/clusters/original_dst/BUILD index 42db02dd22..7e170231e1 100644 --- a/test/extensions/clusters/original_dst/BUILD +++ b/test/extensions/clusters/original_dst/BUILD @@ -11,7 +11,7 @@ envoy_package() envoy_cc_test( name = "original_dst_cluster_test", srcs = ["original_dst_cluster_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/event:dispatcher_lib", "//source/common/network:filter_state_dst_address_lib", diff --git a/test/extensions/clusters/redis/BUILD b/test/extensions/clusters/redis/BUILD index 6a03cb0540..6f0a607172 100644 --- a/test/extensions/clusters/redis/BUILD +++ b/test/extensions/clusters/redis/BUILD @@ -17,7 +17,7 @@ envoy_extension_cc_test( name = "redis_cluster_test", srcs = ["redis_cluster_test.cc"], extension_names = ["envoy.clusters.redis"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/event:dispatcher_lib", "//source/common/network:utility_lib", @@ -59,7 +59,7 @@ envoy_extension_cc_test( name = "redis_cluster_lb_test", srcs = ["redis_cluster_lb_test.cc"], extension_names = ["envoy.clusters.redis"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/upstream:cluster_manager_interface", "//source/common/event:dispatcher_lib", @@ -98,7 +98,7 @@ envoy_extension_cc_test( size = "large", srcs = ["redis_cluster_integration_test.cc"], extension_names = ["envoy.clusters.redis"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/clusters/redis:redis_cluster", "//source/extensions/clusters/redis:redis_cluster_lb", @@ -128,6 +128,6 @@ envoy_cc_mock( envoy_cc_test( name = "crc16_test", srcs = ["crc16_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = ["//source/extensions/clusters/redis:crc16_lib"], ) diff --git a/test/extensions/common/async_files/BUILD b/test/extensions/common/async_files/BUILD index 505f9a1251..4c26b5dbef 100644 --- a/test/extensions/common/async_files/BUILD +++ b/test/extensions/common/async_files/BUILD @@ -12,7 +12,7 @@ envoy_package() envoy_cc_test( name = "async_file_handle_thread_pool_test", srcs = ["async_file_handle_thread_pool_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["skip_on_windows"], deps = [ "//source/extensions/common/async_files", @@ -29,7 +29,7 @@ envoy_cc_test( "async_file_manager_thread_pool_test.cc", "async_file_manager_thread_pool_with_mocks_test.cc", ], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["skip_on_windows"], deps = [ "//source/extensions/common/async_files", @@ -45,7 +45,7 @@ envoy_cc_test( srcs = [ "async_file_manager_factory_test.cc", ], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["skip_on_windows"], deps = [ "//source/extensions/common/async_files", @@ -59,7 +59,7 @@ envoy_cc_test( envoy_cc_test( name = "status_after_file_error_test", srcs = ["status_after_file_error_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["skip_on_windows"], deps = [ "//source/extensions/common/async_files:status_after_file_error", diff --git a/test/extensions/common/aws/BUILD b/test/extensions/common/aws/BUILD index ffd64da052..1e9d7c8cdb 100644 --- a/test/extensions/common/aws/BUILD +++ b/test/extensions/common/aws/BUILD @@ -14,7 +14,7 @@ envoy_cc_mock( name = "aws_mocks", srcs = ["mocks.cc"], hdrs = ["mocks.h"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/http:message_lib", "//source/extensions/common/aws:credentials_provider_interface", @@ -27,7 +27,7 @@ envoy_cc_mock( envoy_cc_test( name = "sigv4_signer_impl_test", srcs = ["sigv4_signer_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/buffer:buffer_lib", "//source/common/http:message_lib", @@ -42,7 +42,7 @@ envoy_cc_test( envoy_cc_test( name = "sigv4a_signer_impl_test", srcs = ["sigv4a_signer_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/buffer:buffer_lib", "//source/common/http:message_lib", @@ -63,7 +63,7 @@ envoy_cc_test( "-DENVOY_SSL_FIPS", ], ), - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/common/aws:utility_lib", "//test/extensions/common/aws:aws_mocks", @@ -75,7 +75,7 @@ envoy_cc_test( envoy_cc_test( name = "region_provider_impl_test", srcs = ["region_provider_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/common/aws:region_provider_impl_lib", "//test/test_common:environment_lib", @@ -85,7 +85,7 @@ envoy_cc_test( envoy_cc_test( name = "metadata_fetcher_test", srcs = ["metadata_fetcher_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/common/aws:metadata_fetcher_lib", "//test/extensions/common/aws:aws_mocks", @@ -102,7 +102,7 @@ envoy_cc_test( envoy_cc_test( name = "credentials_provider_impl_test", srcs = ["credentials_provider_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/common/aws:credentials_provider_impl_lib", "//source/extensions/common/aws:metadata_fetcher_lib", @@ -126,7 +126,7 @@ envoy_cc_test( envoy_cc_test( name = "credentials_provider_test", srcs = ["credentials_provider_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/common/aws:credentials_provider_interface", ], @@ -138,7 +138,7 @@ envoy_cc_test( srcs = [ "aws_metadata_fetcher_integration_test.cc", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/common:fmt_lib", "//source/extensions/common/aws:utility_lib", diff --git a/test/extensions/common/dubbo/BUILD b/test/extensions/common/dubbo/BUILD index acba5b782e..fb47ecf64d 100644 --- a/test/extensions/common/dubbo/BUILD +++ b/test/extensions/common/dubbo/BUILD @@ -12,7 +12,7 @@ envoy_package() envoy_cc_test( name = "message_test", srcs = ["message_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/common/dubbo:message_lib", "//test/test_common:printers_lib", @@ -23,7 +23,7 @@ envoy_cc_test( envoy_cc_test( name = "metadata_test", srcs = ["metadata_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/common/dubbo:metadata_lib", "//test/test_common:printers_lib", @@ -34,7 +34,7 @@ envoy_cc_test( envoy_cc_test( name = "hessian2_utils_test", srcs = ["hessian2_utils_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/common/dubbo:hessian2_utils_lib", "//test/test_common:printers_lib", @@ -45,7 +45,7 @@ envoy_cc_test( envoy_cc_test( name = "hessian2_serializer_impl_test", srcs = ["hessian2_serializer_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/common/dubbo:hessian2_serializer_lib", "//test/test_common:printers_lib", @@ -65,7 +65,7 @@ envoy_cc_mock( envoy_cc_test( name = "codec_test", srcs = ["codec_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":mocks_lib", "//source/extensions/common/dubbo:codec_lib", diff --git a/test/extensions/common/dynamic_forward_proxy/BUILD b/test/extensions/common/dynamic_forward_proxy/BUILD index 2af4a0e81a..d7d0b8127a 100644 --- a/test/extensions/common/dynamic_forward_proxy/BUILD +++ b/test/extensions/common/dynamic_forward_proxy/BUILD @@ -12,7 +12,7 @@ envoy_package() envoy_cc_test( name = "dns_cache_impl_test", srcs = ["dns_cache_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":mocks", "//source/common/config:utility_lib", @@ -36,7 +36,7 @@ envoy_cc_test( envoy_cc_test( name = "dns_cache_resource_manager_test", srcs = ["dns_cache_resource_manager_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":mocks", "//source/common/config:utility_lib", diff --git a/test/extensions/common/matcher/BUILD b/test/extensions/common/matcher/BUILD index d19ab97b4d..df49136c28 100644 --- a/test/extensions/common/matcher/BUILD +++ b/test/extensions/common/matcher/BUILD @@ -11,7 +11,7 @@ envoy_package() envoy_cc_test( name = "matcher_test", srcs = ["matcher_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/common/matcher:matcher_lib", "//test/mocks/server:server_factory_context_mocks", @@ -23,7 +23,7 @@ envoy_cc_test( envoy_cc_test( name = "trie_matcher_test", srcs = ["trie_matcher_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/matcher:matcher_lib", "//source/common/network:address_lib", diff --git a/test/extensions/common/proxy_protocol/BUILD b/test/extensions/common/proxy_protocol/BUILD index a043c7ab0e..87cdf69c2e 100644 --- a/test/extensions/common/proxy_protocol/BUILD +++ b/test/extensions/common/proxy_protocol/BUILD @@ -11,7 +11,7 @@ envoy_package() envoy_cc_test( name = "proxy_protocol_header_test", srcs = ["proxy_protocol_header_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/buffer:buffer_lib", "//source/extensions/common/proxy_protocol:proxy_protocol_header_lib", @@ -23,7 +23,7 @@ envoy_cc_test( envoy_cc_test( name = "proxy_protocol_regression_test", srcs = ["proxy_protocol_regression_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/buffer:buffer_lib", "//source/common/event:dispatcher_includes", diff --git a/test/extensions/common/redis/BUILD b/test/extensions/common/redis/BUILD index 7c54f2c91b..c75ce918e4 100644 --- a/test/extensions/common/redis/BUILD +++ b/test/extensions/common/redis/BUILD @@ -25,7 +25,7 @@ envoy_extension_cc_test( name = "cluster_refresh_manager_test", srcs = ["cluster_refresh_manager_test.cc"], extension_names = ["envoy.filters.network.redis_proxy"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/common:lock_guard_lib", "//source/common/common:thread_lib", diff --git a/test/extensions/common/tap/BUILD b/test/extensions/common/tap/BUILD index fc28f125dd..ccfb7cddc3 100644 --- a/test/extensions/common/tap/BUILD +++ b/test/extensions/common/tap/BUILD @@ -24,7 +24,7 @@ envoy_cc_test_library( envoy_cc_test( name = "admin_test", srcs = envoy_select_admin_functionality(["admin_test.cc"]), - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/common/tap:admin", "//source/extensions/common/tap:tap_config_base", @@ -40,7 +40,7 @@ envoy_cc_test( envoy_cc_test( name = "tap_config_base_test", srcs = ["tap_config_base_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/buffer:buffer_lib", "//source/extensions/common/tap:tap_config_base", diff --git a/test/extensions/common/wasm/BUILD b/test/extensions/common/wasm/BUILD index 48a3ec1dd2..6fc9f6885b 100644 --- a/test/extensions/common/wasm/BUILD +++ b/test/extensions/common/wasm/BUILD @@ -21,7 +21,7 @@ envoy_cc_test( data = envoy_select_wasm_rust_tests([ "//test/extensions/common/wasm/test_data:test_rust.wasm", ]), - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["skip_on_windows"], deps = [ "//source/extensions/common/wasm:wasm_lib", @@ -42,7 +42,7 @@ envoy_cc_test( "//test/extensions/common/wasm/test_data:test_restriction_cpp.wasm", ]), external_deps = ["abseil_optional"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["skip_on_windows"], deps = [ "//source/common/common:hex_lib", @@ -67,7 +67,7 @@ envoy_cc_test( envoy_cc_test( name = "plugin_test", srcs = ["plugin_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["skip_on_windows"], deps = [ "//source/extensions/common/wasm:wasm_lib", @@ -82,7 +82,7 @@ envoy_cc_test_binary( "abseil_optional", "benchmark", ], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["skip_on_windows"], deps = [ "//source/common/event:dispatcher_lib", @@ -110,7 +110,7 @@ envoy_cc_test_library( envoy_cc_test( name = "wasm_runtime_factory_test", srcs = ["wasm_runtime_factory_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["skip_on_windows"], deps = [ "//envoy/registry", @@ -122,7 +122,7 @@ envoy_cc_test( envoy_cc_test( name = "context_test", srcs = ["context_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["skip_on_windows"], deps = [ "//envoy/common:base_includes", @@ -142,7 +142,7 @@ envoy_cc_test( "-DWASM_USE_CEL_PARSER", ], }), - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["skip_on_windows"], deps = [ "//source/common/network:filter_state_dst_address_lib", @@ -162,7 +162,7 @@ envoy_cc_test( envoy_cc_test( name = "remote_async_datasource_test", srcs = ["remote_async_datasource_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/common:empty_string", "//source/common/crypto:utility_lib", diff --git a/test/extensions/compression/brotli/compressor/BUILD b/test/extensions/compression/brotli/compressor/BUILD index 53fefe7273..72622a5ebd 100644 --- a/test/extensions/compression/brotli/compressor/BUILD +++ b/test/extensions/compression/brotli/compressor/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "compressor_test", srcs = ["brotli_compressor_impl_test.cc"], extension_names = ["envoy.compression.brotli.compressor"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/compression/brotli/compressor:config", "//source/extensions/compression/brotli/decompressor:decompressor_lib", diff --git a/test/extensions/compression/brotli/decompressor/BUILD b/test/extensions/compression/brotli/decompressor/BUILD index 394abd604d..12df888dfb 100644 --- a/test/extensions/compression/brotli/decompressor/BUILD +++ b/test/extensions/compression/brotli/decompressor/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "brotli_decompressor_impl_test", srcs = ["brotli_decompressor_impl_test.cc"], extension_names = ["envoy.compression.brotli.decompressor"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/stats:isolated_store_lib", "//source/extensions/compression/brotli/compressor:compressor_lib", diff --git a/test/extensions/compression/gzip/BUILD b/test/extensions/compression/gzip/BUILD index 3a568d7356..e2209be629 100644 --- a/test/extensions/compression/gzip/BUILD +++ b/test/extensions/compression/gzip/BUILD @@ -12,7 +12,7 @@ envoy_cc_fuzz_test( name = "compressor_fuzz_test", srcs = ["compressor_fuzz_test.cc"], corpus = "compressor_corpus", - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/buffer:buffer_lib", "//source/common/common:assert_lib", diff --git a/test/extensions/compression/gzip/compressor/BUILD b/test/extensions/compression/gzip/compressor/BUILD index b226695927..63a54c09ec 100644 --- a/test/extensions/compression/gzip/compressor/BUILD +++ b/test/extensions/compression/gzip/compressor/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "compressor_test", srcs = ["zlib_compressor_impl_test.cc"], extension_names = ["envoy.compression.gzip.compressor"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/common:assert_lib", "//source/common/common:hex_lib", diff --git a/test/extensions/compression/gzip/decompressor/BUILD b/test/extensions/compression/gzip/decompressor/BUILD index ed621da5ea..6ff46fcad6 100644 --- a/test/extensions/compression/gzip/decompressor/BUILD +++ b/test/extensions/compression/gzip/decompressor/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "zlib_decompressor_impl_test", srcs = ["zlib_decompressor_impl_test.cc"], extension_names = ["envoy.compression.gzip.decompressor"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/common:assert_lib", "//source/common/common:hex_lib", diff --git a/test/extensions/compression/zstd/BUILD b/test/extensions/compression/zstd/BUILD index 098821e1b8..ef3e3394b7 100644 --- a/test/extensions/compression/zstd/BUILD +++ b/test/extensions/compression/zstd/BUILD @@ -22,7 +22,7 @@ envoy_extension_cc_test( "envoy.compression.zstd.compressor", "envoy.compression.zstd.decompressor", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/compression/zstd/compressor:config", "//source/extensions/compression/zstd/decompressor:config", diff --git a/test/extensions/compression/zstd/compressor/BUILD b/test/extensions/compression/zstd/compressor/BUILD index 70c995d0c5..4412edd29c 100644 --- a/test/extensions/compression/zstd/compressor/BUILD +++ b/test/extensions/compression/zstd/compressor/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "compressor_test", srcs = ["zstd_compressor_impl_test.cc"], extension_names = ["envoy.compression.zstd.compressor"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/compression/zstd/compressor:config", "//source/extensions/compression/zstd/decompressor:decompressor_lib", diff --git a/test/extensions/compression/zstd/decompressor/BUILD b/test/extensions/compression/zstd/decompressor/BUILD index 8f74ca4860..82dfca5382 100644 --- a/test/extensions/compression/zstd/decompressor/BUILD +++ b/test/extensions/compression/zstd/decompressor/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "decompressor_test", srcs = ["zstd_decompressor_impl_test.cc"], extension_names = ["envoy.compression.zstd.decompressor"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/stats:isolated_store_lib", "//source/extensions/compression/zstd/compressor:compressor_lib", diff --git a/test/extensions/config/validators/minimum_clusters/BUILD b/test/extensions/config/validators/minimum_clusters/BUILD index bc6dc64ed0..ba1aea991f 100644 --- a/test/extensions/config/validators/minimum_clusters/BUILD +++ b/test/extensions/config/validators/minimum_clusters/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.config.validators.minimum_clusters_validator"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/registry", "//source/common/protobuf:message_validator_lib", @@ -28,7 +28,7 @@ envoy_extension_cc_test( name = "minimum_clusters_validator_test", srcs = ["minimum_clusters_validator_test.cc"], extension_names = ["envoy.config.validators.minimum_clusters_validator"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/config:decoded_resource_lib", "//source/extensions/config/validators/minimum_clusters:minimum_clusters_validator", @@ -42,7 +42,7 @@ envoy_extension_cc_test( size = "large", srcs = ["minimum_clusters_validator_integration_test.cc"], extension_names = ["envoy.config.validators.minimum_clusters_validator"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/config:protobuf_link_hacks", "//source/common/protobuf:utility_lib", diff --git a/test/extensions/config_subscription/common/BUILD b/test/extensions/config_subscription/common/BUILD index 78c62f9a00..ad91aafa48 100644 --- a/test/extensions/config_subscription/common/BUILD +++ b/test/extensions/config_subscription/common/BUILD @@ -11,7 +11,7 @@ envoy_package() envoy_cc_test( name = "subscription_factory_impl_test", srcs = ["subscription_factory_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/config:xds_config_tracker_interface", "//envoy/config:xds_resources_delegate_interface", @@ -43,7 +43,7 @@ envoy_cc_test( envoy_cc_test( name = "subscription_impl_test", srcs = ["subscription_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//test/common/config:grpc_subscription_test_harness", "//test/common/config:subscription_test_harness", diff --git a/test/extensions/config_subscription/filesystem/BUILD b/test/extensions/config_subscription/filesystem/BUILD index f92f11ec03..dab83bc9e9 100644 --- a/test/extensions/config_subscription/filesystem/BUILD +++ b/test/extensions/config_subscription/filesystem/BUILD @@ -12,7 +12,7 @@ envoy_package() envoy_cc_test( name = "filesystem_subscription_impl_test", srcs = ["filesystem_subscription_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":filesystem_subscription_test_harness", "//test/mocks/event:event_mocks", diff --git a/test/extensions/config_subscription/grpc/BUILD b/test/extensions/config_subscription/grpc/BUILD index 748128ae88..ce32c76796 100644 --- a/test/extensions/config_subscription/grpc/BUILD +++ b/test/extensions/config_subscription/grpc/BUILD @@ -13,7 +13,7 @@ envoy_package() envoy_cc_test( name = "new_grpc_mux_impl_test", srcs = ["new_grpc_mux_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/config:protobuf_link_hacks", "//source/common/protobuf", @@ -42,7 +42,7 @@ envoy_cc_test( envoy_cc_test( name = "grpc_mux_impl_test", srcs = ["grpc_mux_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/config:xds_config_tracker_interface", "//envoy/config:xds_resources_delegate_interface", @@ -74,7 +74,7 @@ envoy_cc_test( envoy_cc_test( name = "delta_subscription_impl_test", srcs = ["delta_subscription_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":delta_subscription_test_harness", "//envoy/config:xds_config_tracker_interface", @@ -98,7 +98,7 @@ envoy_cc_test( envoy_cc_test( name = "delta_subscription_state_test", srcs = ["delta_subscription_state_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/stats:isolated_store_lib", "//source/extensions/config_subscription/grpc:delta_subscription_state_lib", @@ -141,7 +141,7 @@ envoy_cc_test( name = "sotw_subscription_state_test", srcs = ["sotw_subscription_state_test.cc"], external_deps = ["abseil_flat_hash_set"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/config:resource_name_lib", "//source/common/stats:isolated_store_lib", @@ -161,7 +161,7 @@ envoy_cc_test( envoy_cc_test( name = "xds_grpc_mux_impl_test", srcs = ["xds_grpc_mux_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/config:protobuf_link_hacks", "//source/common/config:resource_name_lib", @@ -191,7 +191,7 @@ envoy_cc_test( envoy_cc_test( name = "grpc_stream_test", srcs = ["grpc_stream_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/config_subscription/grpc:grpc_stream_lib", "//test/common/stats:stat_test_utility_lib", @@ -208,7 +208,7 @@ envoy_cc_test( envoy_cc_test( name = "pausable_ack_queue_test", srcs = ["pausable_ack_queue_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/config_subscription/grpc:pausable_ack_queue_lib", ], @@ -217,7 +217,7 @@ envoy_cc_test( envoy_cc_test( name = "watch_map_test", srcs = ["watch_map_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/config:xds_config_tracker_interface", "//source/extensions/config_subscription/grpc:watch_map_lib", @@ -233,7 +233,7 @@ envoy_cc_test( envoy_cc_test( name = "xds_source_id_test", srcs = ["xds_source_id_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/config_subscription/grpc:xds_source_id_lib", ], @@ -242,7 +242,7 @@ envoy_cc_test( envoy_cc_test( name = "eds_resources_cache_impl_test", srcs = ["eds_resources_cache_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/config_subscription/grpc:eds_resources_cache_lib", "//test/mocks/event:event_mocks", @@ -262,7 +262,7 @@ envoy_cc_mock( envoy_cc_test( name = "grpc_mux_failover_test", srcs = ["grpc_mux_failover_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":grpc_stream_mocks", "//source/extensions/config_subscription/grpc:grpc_mux_failover_lib", @@ -278,7 +278,7 @@ envoy_cc_test( name = "xds_failover_integration_test", srcs = ["xds_failover_integration_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/config:protobuf_link_hacks", "//source/common/protobuf:utility_lib", diff --git a/test/extensions/config_subscription/rest/BUILD b/test/extensions/config_subscription/rest/BUILD index f1c96653bc..db6f973b8a 100644 --- a/test/extensions/config_subscription/rest/BUILD +++ b/test/extensions/config_subscription/rest/BUILD @@ -12,7 +12,7 @@ envoy_package() envoy_cc_test( name = "http_subscription_impl_test", srcs = ["http_subscription_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":http_subscription_test_harness", ], diff --git a/test/extensions/filters/common/expr/BUILD b/test/extensions/filters/common/expr/BUILD index 2e0a58656f..5c90292935 100644 --- a/test/extensions/filters/common/expr/BUILD +++ b/test/extensions/filters/common/expr/BUILD @@ -17,7 +17,7 @@ envoy_extension_cc_test( name = "context_test", srcs = ["context_test.cc"], extension_names = ["envoy.filters.http.rbac"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["skip_on_windows"], deps = [ "//source/common/network:filter_state_dst_address_lib", @@ -41,7 +41,7 @@ envoy_extension_cc_test( name = "evaluator_test", srcs = ["evaluator_test.cc"], extension_names = ["envoy.filters.http.rbac"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["skip_on_windows"], deps = [ "//source/extensions/filters/common/expr:evaluator_lib", @@ -64,7 +64,7 @@ envoy_cc_fuzz_test( name = "evaluator_fuzz_test", srcs = ["evaluator_fuzz_test.cc"], corpus = "evaluator_corpus", - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["skip_on_windows"], deps = [ ":evaluator_fuzz_proto_cc_proto", diff --git a/test/extensions/filters/common/ext_authz/BUILD b/test/extensions/filters/common/ext_authz/BUILD index 88f89fb547..2d072af222 100644 --- a/test/extensions/filters/common/ext_authz/BUILD +++ b/test/extensions/filters/common/ext_authz/BUILD @@ -12,7 +12,7 @@ envoy_package() envoy_cc_test( name = "check_request_utils_test", srcs = ["check_request_utils_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/network:address_lib", "//source/common/protobuf", @@ -33,7 +33,7 @@ envoy_cc_test( envoy_cc_test( name = "ext_authz_grpc_impl_test", srcs = ["ext_authz_grpc_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/common/ext_authz:ext_authz_grpc_lib", "//test/extensions/filters/common/ext_authz:ext_authz_test_common", @@ -46,7 +46,7 @@ envoy_cc_test( envoy_cc_test( name = "ext_authz_http_impl_test", srcs = ["ext_authz_http_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/common/ext_authz:ext_authz_http_lib", "//test/extensions/filters/common/ext_authz:ext_authz_test_common", diff --git a/test/extensions/filters/common/fault/BUILD b/test/extensions/filters/common/fault/BUILD index e73194fd04..fb41c3ae78 100644 --- a/test/extensions/filters/common/fault/BUILD +++ b/test/extensions/filters/common/fault/BUILD @@ -11,7 +11,7 @@ envoy_package() envoy_cc_test( name = "fault_config_test", srcs = ["fault_config_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/common/fault:fault_config_lib", "//test/test_common:utility_lib", diff --git a/test/extensions/filters/common/local_ratelimit/BUILD b/test/extensions/filters/common/local_ratelimit/BUILD index d86cf58975..1b12970f0c 100644 --- a/test/extensions/filters/common/local_ratelimit/BUILD +++ b/test/extensions/filters/common/local_ratelimit/BUILD @@ -11,7 +11,7 @@ envoy_package() envoy_cc_test( name = "local_ratelimit_test", srcs = ["local_ratelimit_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/singleton:manager_impl_lib", "//source/extensions/filters/common/local_ratelimit:local_ratelimit_lib", diff --git a/test/extensions/filters/common/lua/BUILD b/test/extensions/filters/common/lua/BUILD index 40f2d6baea..0cb9b292f3 100644 --- a/test/extensions/filters/common/lua/BUILD +++ b/test/extensions/filters/common/lua/BUILD @@ -12,7 +12,7 @@ envoy_package() envoy_cc_test( name = "lua_test", srcs = ["lua_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/thread_local:thread_local_lib", "//source/extensions/filters/common/lua:lua_lib", @@ -25,7 +25,7 @@ envoy_cc_test( envoy_cc_test( name = "wrappers_test", srcs = ["wrappers_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":lua_wrappers_lib", "//source/common/buffer:buffer_lib", diff --git a/test/extensions/filters/common/mutation_rules/BUILD b/test/extensions/filters/common/mutation_rules/BUILD index cb1e654226..84af3beff6 100644 --- a/test/extensions/filters/common/mutation_rules/BUILD +++ b/test/extensions/filters/common/mutation_rules/BUILD @@ -11,7 +11,7 @@ envoy_package() envoy_cc_test( name = "mutation_rules_test", srcs = ["mutation_rules_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/common/mutation_rules:mutation_rules_lib", ], diff --git a/test/extensions/filters/common/original_src/BUILD b/test/extensions/filters/common/original_src/BUILD index 8af958d473..87fcb34185 100644 --- a/test/extensions/filters/common/original_src/BUILD +++ b/test/extensions/filters/common/original_src/BUILD @@ -11,7 +11,7 @@ envoy_package() envoy_cc_test( name = "original_src_socket_option_test", srcs = ["original_src_socket_option_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/network:address_lib", "//source/extensions/filters/common/original_src:original_src_socket_option_lib", diff --git a/test/extensions/filters/common/ratelimit/BUILD b/test/extensions/filters/common/ratelimit/BUILD index b35a3c8ccf..95c4f8f3c0 100644 --- a/test/extensions/filters/common/ratelimit/BUILD +++ b/test/extensions/filters/common/ratelimit/BUILD @@ -13,7 +13,7 @@ envoy_package() envoy_cc_test( name = "ratelimit_impl_test", srcs = ["ratelimit_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/http:header_map_lib", "//source/common/http:headers_lib", diff --git a/test/extensions/filters/common/rbac/BUILD b/test/extensions/filters/common/rbac/BUILD index b13ac82b87..bad6ae4625 100644 --- a/test/extensions/filters/common/rbac/BUILD +++ b/test/extensions/filters/common/rbac/BUILD @@ -16,7 +16,7 @@ envoy_extension_cc_test( name = "matchers_test", srcs = ["matchers_test.cc"], extension_names = ["envoy.filters.http.rbac"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["skip_on_windows"], deps = [ "//source/common/stream_info:filter_state_lib", @@ -37,7 +37,7 @@ envoy_extension_cc_test( name = "engine_impl_test", srcs = ["engine_impl_test.cc"], extension_names = ["envoy.filters.http.rbac"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["skip_on_windows"], deps = [ "//source/extensions/filters/common/rbac:engine_lib", @@ -58,7 +58,7 @@ envoy_extension_cc_test( name = "utility_test", srcs = ["utility_test.cc"], extension_names = ["envoy.filters.http.rbac"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["skip_on_windows"], deps = [ "//source/extensions/filters/common/rbac:utility_lib", diff --git a/test/extensions/filters/common/set_filter_state/BUILD b/test/extensions/filters/common/set_filter_state/BUILD index 553f663098..36d713b969 100644 --- a/test/extensions/filters/common/set_filter_state/BUILD +++ b/test/extensions/filters/common/set_filter_state/BUILD @@ -11,7 +11,7 @@ envoy_package() envoy_cc_test( name = "filter_config_test", srcs = ["filter_config_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/router:string_accessor_lib", "//source/extensions/filters/common/set_filter_state:filter_config_lib", diff --git a/test/extensions/filters/http/adaptive_concurrency/BUILD b/test/extensions/filters/http/adaptive_concurrency/BUILD index 4b0ef3bf10..f4807f5871 100644 --- a/test/extensions/filters/http/adaptive_concurrency/BUILD +++ b/test/extensions/filters/http/adaptive_concurrency/BUILD @@ -16,7 +16,7 @@ envoy_extension_cc_test( name = "adaptive_concurrency_filter_test", srcs = ["adaptive_concurrency_filter_test.cc"], extension_names = ["envoy.filters.http.adaptive_concurrency"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/http:header_map_lib", "//source/common/http:headers_lib", @@ -41,7 +41,7 @@ envoy_extension_cc_test( "adaptive_concurrency_filter_integration_test.cc", ], extension_names = ["envoy.filters.http.adaptive_concurrency"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":adaptive_concurrency_filter_integration_test_lib", "//source/extensions/filters/http/adaptive_concurrency:config", diff --git a/test/extensions/filters/http/adaptive_concurrency/controller/BUILD b/test/extensions/filters/http/adaptive_concurrency/controller/BUILD index 00a2572715..fded078c3d 100644 --- a/test/extensions/filters/http/adaptive_concurrency/controller/BUILD +++ b/test/extensions/filters/http/adaptive_concurrency/controller/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "gradient_controller_test", srcs = ["gradient_controller_test.cc"], extension_names = ["envoy.filters.http.adaptive_concurrency"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/stats:isolated_store_lib", "//source/extensions/filters/http/adaptive_concurrency:adaptive_concurrency_filter_lib", diff --git a/test/extensions/filters/http/admission_control/BUILD b/test/extensions/filters/http/admission_control/BUILD index 703674afc9..c7e148f35d 100644 --- a/test/extensions/filters/http/admission_control/BUILD +++ b/test/extensions/filters/http/admission_control/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "admission_control_filter_test", srcs = ["admission_control_filter_test.cc"], extension_names = ["envoy.filters.http.admission_control"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/common:enum_to_int", "//source/common/http:header_map_lib", @@ -34,7 +34,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.filters.http.admission_control"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/http:header_map_lib", "//source/common/http:headers_lib", @@ -53,7 +53,7 @@ envoy_extension_cc_test( name = "success_criteria_evaluator_test", srcs = ["success_criteria_evaluator_test.cc"], extension_names = ["envoy.filters.http.admission_control"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/admission_control:admission_control_filter_lib", "@envoy_api//envoy/extensions/filters/http/admission_control/v3:pkg_cc_proto", @@ -65,7 +65,7 @@ envoy_extension_cc_test( size = "large", srcs = ["admission_control_integration_test.cc"], extension_names = ["envoy.filters.http.admission_control"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/admission_control:config", "//test/integration:http_integration_lib", @@ -77,7 +77,7 @@ envoy_extension_cc_test( name = "admission_controller_test", srcs = ["controller_test.cc"], extension_names = ["envoy.filters.http.admission_control"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/http:headers_lib", "//source/extensions/filters/http/admission_control:admission_control_filter_lib", diff --git a/test/extensions/filters/http/alternate_protocols_cache/BUILD b/test/extensions/filters/http/alternate_protocols_cache/BUILD index 4aefe5debb..9808fc35a1 100644 --- a/test/extensions/filters/http/alternate_protocols_cache/BUILD +++ b/test/extensions/filters/http/alternate_protocols_cache/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "filter_test", srcs = ["filter_test.cc"], extension_names = ["envoy.filters.http.alternate_protocols_cache"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/alternate_protocols_cache:config", "//test/mocks/http:http_mocks", @@ -34,7 +34,7 @@ envoy_extension_cc_test( "//test/config/integration/certs", ], extension_names = ["envoy.filters.http.alternate_protocols_cache"], - rbe_pool = "2core", + rbe_pool = "6gig", shard_count = 2, tags = [ "cpu:3", diff --git a/test/extensions/filters/http/aws_lambda/BUILD b/test/extensions/filters/http/aws_lambda/BUILD index 6a7f07d481..ff95981d53 100644 --- a/test/extensions/filters/http/aws_lambda/BUILD +++ b/test/extensions/filters/http/aws_lambda/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "aws_lambda_filter_test", srcs = ["aws_lambda_filter_test.cc"], extension_names = ["envoy.filters.http.aws_lambda"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/aws_lambda:aws_lambda_filter_lib", "//test/extensions/common/aws:aws_mocks", @@ -29,7 +29,7 @@ envoy_extension_cc_test( size = "large", srcs = ["aws_lambda_filter_integration_test.cc"], extension_names = ["envoy.filters.http.aws_lambda"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/http:header_map_lib", "//source/extensions/filters/http/aws_lambda:aws_lambda_filter_lib", @@ -44,7 +44,7 @@ envoy_extension_cc_test( name = "arn_test", srcs = ["arn_test.cc"], extension_names = ["envoy.filters.http.aws_lambda"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/aws_lambda:aws_lambda_filter_lib", "//test/mocks/http:http_mocks", @@ -55,7 +55,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.filters.http.aws_lambda"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/aws_lambda:config", "//test/mocks/server:factory_context_mocks", diff --git a/test/extensions/filters/http/aws_request_signing/BUILD b/test/extensions/filters/http/aws_request_signing/BUILD index bb15efa6df..b1d387a3b9 100644 --- a/test/extensions/filters/http/aws_request_signing/BUILD +++ b/test/extensions/filters/http/aws_request_signing/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "aws_request_signing_filter_test", srcs = ["aws_request_signing_filter_test.cc"], extension_names = ["envoy.filters.http.aws_request_signing"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/aws_request_signing:aws_request_signing_filter_lib", "//test/extensions/common/aws:aws_mocks", @@ -27,7 +27,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.filters.http.aws_request_signing"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/aws_request_signing:config", "//test/mocks/server:factory_context_mocks", @@ -39,7 +39,7 @@ envoy_extension_cc_test( name = "aws_request_signing_integration_test", srcs = ["aws_request_signing_integration_test.cc"], extension_names = ["envoy.filters.http.aws_request_signing"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/clusters/logical_dns:logical_dns_cluster_lib", "//source/extensions/filters/http/aws_request_signing:aws_request_signing_filter_lib", diff --git a/test/extensions/filters/http/bandwidth_limit/BUILD b/test/extensions/filters/http/bandwidth_limit/BUILD index 93d1e94faf..a313436bac 100644 --- a/test/extensions/filters/http/bandwidth_limit/BUILD +++ b/test/extensions/filters/http/bandwidth_limit/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "filter_test", srcs = ["filter_test.cc"], extension_names = ["envoy.filters.http.bandwidth_limit"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/common:utility_lib", "//source/common/http:header_utility_lib", @@ -32,7 +32,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.filters.http.bandwidth_limit"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/bandwidth_limit:config", "//test/mocks/server:server_mocks", diff --git a/test/extensions/filters/http/basic_auth/BUILD b/test/extensions/filters/http/basic_auth/BUILD index b2c5c3f7e1..e34f036789 100644 --- a/test/extensions/filters/http/basic_auth/BUILD +++ b/test/extensions/filters/http/basic_auth/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "filter_test", srcs = ["filter_test.cc"], extension_names = ["envoy.filters.http.basic_auth"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/basic_auth:basic_auth_lib", "//test/mocks/server:server_mocks", @@ -27,7 +27,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.filters.http.basic_auth"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/basic_auth:config", "//test/mocks/server:server_mocks", @@ -40,7 +40,7 @@ envoy_extension_cc_test( size = "large", srcs = ["basic_auth_integration_test.cc"], extension_names = ["envoy.filters.http.basic_auth"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/basic_auth:config", "//test/integration:http_protocol_integration_lib", diff --git a/test/extensions/filters/http/buffer/BUILD b/test/extensions/filters/http/buffer/BUILD index 7510a282de..dd9bbce49d 100644 --- a/test/extensions/filters/http/buffer/BUILD +++ b/test/extensions/filters/http/buffer/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "buffer_filter_test", srcs = ["buffer_filter_test.cc"], extension_names = ["envoy.filters.http.buffer"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/event:dispatcher_interface", "//source/common/http:header_map_lib", @@ -38,7 +38,7 @@ envoy_extension_cc_test( size = "large", srcs = ["buffer_filter_integration_test.cc"], extension_names = ["envoy.filters.http.buffer"], - rbe_pool = "2core", + rbe_pool = "6gig", shard_count = 4, deps = [ "//source/extensions/filters/http/buffer:config", @@ -53,7 +53,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.filters.http.buffer"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/buffer:config", "//test/mocks/server:factory_context_mocks", diff --git a/test/extensions/filters/http/cache/BUILD b/test/extensions/filters/http/cache/BUILD index 1e9f5d6832..9cce4811ed 100644 --- a/test/extensions/filters/http/cache/BUILD +++ b/test/extensions/filters/http/cache/BUILD @@ -21,7 +21,7 @@ envoy_extension_cc_test( name = "cache_headers_utils_test", srcs = ["cache_headers_utils_test.cc"], extension_names = ["envoy.filters.http.cache"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/http:header_map_interface", "//source/common/http:header_map_lib", @@ -36,7 +36,7 @@ envoy_extension_cc_test( name = "cache_filter_logging_info_test", srcs = ["cache_filter_logging_info_test.cc"], extension_names = ["envoy.filters.http.cache"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/cache:cache_filter_logging_info_lib", ], @@ -46,7 +46,7 @@ envoy_extension_cc_test( name = "cache_entry_utils_test", srcs = ["cache_entry_utils_test.cc"], extension_names = ["envoy.filters.http.cache"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/cache:cache_entry_utils_lib", ], @@ -56,7 +56,7 @@ envoy_extension_cc_test( name = "http_cache_test", srcs = ["http_cache_test.cc"], extension_names = ["envoy.filters.http.cache"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/cache:http_cache_lib", "//source/extensions/http/cache/simple_http_cache:config", @@ -72,7 +72,7 @@ envoy_extension_cc_test( name = "range_utils_test", srcs = ["range_utils_test.cc"], extension_names = ["envoy.filters.http.cache"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/cache:range_utils_lib", "//test/test_common:utility_lib", @@ -83,7 +83,7 @@ envoy_extension_cc_test( name = "cache_filter_test", srcs = ["cache_filter_test.cc"], extension_names = ["envoy.filters.http.cache"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":mocks", "//source/extensions/filters/http/cache:cache_filter_lib", @@ -102,7 +102,7 @@ envoy_extension_cc_test( name = "cacheability_utils_test", srcs = ["cacheability_utils_test.cc"], extension_names = ["envoy.filters.http.cache"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/cache:cacheability_utils_lib", "//test/mocks/server:server_factory_context_mocks", @@ -114,7 +114,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.filters.http.cache"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/cache:config", "//source/extensions/http/cache/simple_http_cache:config", @@ -132,7 +132,7 @@ envoy_extension_cc_test( "cache_filter_integration_test.cc", ], extension_names = ["envoy.filters.http.cache"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/cache:config", "//source/extensions/filters/http/cache:http_cache_lib", @@ -148,7 +148,7 @@ envoy_extension_cc_test( "cache_custom_headers_test.cc", ], extension_names = ["envoy.filters.http.cache"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/cache:cache_custom_headers", ], @@ -159,7 +159,7 @@ envoy_extension_cc_test_library( srcs = ["http_cache_implementation_test_common.cc"], hdrs = ["http_cache_implementation_test_common.h"], extension_names = ["envoy.filters.http.cache"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/cache:cache_headers_utils_lib", "//source/extensions/filters/http/cache:http_cache_lib", diff --git a/test/extensions/filters/http/cdn_loop/BUILD b/test/extensions/filters/http/cdn_loop/BUILD index 6cfb0ae405..2a5584fda6 100644 --- a/test/extensions/filters/http/cdn_loop/BUILD +++ b/test/extensions/filters/http/cdn_loop/BUILD @@ -17,7 +17,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.filters.http.cdn_loop"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/cdn_loop:config", "//test/mocks/http:http_mocks", @@ -32,7 +32,7 @@ envoy_extension_cc_test( size = "large", srcs = ["filter_integration_test.cc"], extension_names = ["envoy.filters.http.cdn_loop"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/cdn_loop:config", "//test/integration:http_protocol_integration_lib", @@ -44,7 +44,7 @@ envoy_extension_cc_test( envoy_cc_test( name = "filter_test", srcs = ["filter_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/http:codes_interface", "//envoy/http:filter_interface", @@ -57,7 +57,7 @@ envoy_cc_test( envoy_cc_test( name = "parser_test", srcs = ["parser_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/cdn_loop:parser_lib", "//test/test_common:status_utility_lib", @@ -68,7 +68,7 @@ envoy_cc_fuzz_test( name = "parser_fuzz_test", srcs = ["parser_fuzz_test.cc"], corpus = "parser_corpus", - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/common:statusor_lib", "//source/extensions/filters/http/cdn_loop:parser_lib", @@ -79,7 +79,7 @@ envoy_cc_fuzz_test( envoy_cc_test( name = "utils_test", srcs = ["utils_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/cdn_loop:utils_lib", "//test/test_common:status_utility_lib", diff --git a/test/extensions/filters/http/common/BUILD b/test/extensions/filters/http/common/BUILD index d2e3760818..224c4f98c2 100644 --- a/test/extensions/filters/http/common/BUILD +++ b/test/extensions/filters/http/common/BUILD @@ -21,7 +21,7 @@ envoy_cc_test_library( hdrs = [ "mock.h", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/common:jwks_fetcher_lib", "//test/mocks/upstream:upstream_mocks", @@ -43,7 +43,7 @@ envoy_extension_cc_test( "jwks_fetcher_test.cc", ], extension_names = ["envoy.filters.http.jwt_authn"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/common:jwks_fetcher_lib", "//test/extensions/filters/http/common:mock_lib", @@ -57,7 +57,7 @@ envoy_extension_cc_test( envoy_cc_test( name = "stream_rate_limiter_test", srcs = ["stream_rate_limiter_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/event:dispatcher_interface", "//source/common/buffer:buffer_lib", diff --git a/test/extensions/filters/http/common/fuzz/BUILD b/test/extensions/filters/http/common/fuzz/BUILD index 734cec0871..c061d6a31d 100644 --- a/test/extensions/filters/http/common/fuzz/BUILD +++ b/test/extensions/filters/http/common/fuzz/BUILD @@ -42,7 +42,7 @@ envoy_cc_test_library( "uber_per_filter.cc", ], hdrs = ["uber_filter.h"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":filter_fuzz_proto_cc_proto", ":http_filter_fuzzer_lib", @@ -68,7 +68,7 @@ envoy_cc_fuzz_test( name = "filter_fuzz_test", srcs = ["filter_fuzz_test.cc"], corpus = "filter_corpus", - rbe_pool = "2core", + rbe_pool = "6gig", # All Envoy extensions must be linked to the test in order for the fuzzer to pick # these up via the NamedHttpFilterConfigFactory. deps = [ diff --git a/test/extensions/filters/http/composite/BUILD b/test/extensions/filters/http/composite/BUILD index a3826537ae..98b3de4f8e 100644 --- a/test/extensions/filters/http/composite/BUILD +++ b/test/extensions/filters/http/composite/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "filter_test", srcs = ["filter_test.cc"], extension_names = ["envoy.filters.http.composite"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/http:header_map_lib", "//source/extensions/filters/http/composite:config", @@ -35,7 +35,7 @@ envoy_extension_cc_test( size = "large", srcs = ["composite_filter_integration_test.cc"], extension_names = ["envoy.filters.http.composite"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/http:header_map_lib", "//source/extensions/filters/http/composite:config", diff --git a/test/extensions/filters/http/compressor/BUILD b/test/extensions/filters/http/compressor/BUILD index 3e75150472..417cfdf048 100644 --- a/test/extensions/filters/http/compressor/BUILD +++ b/test/extensions/filters/http/compressor/BUILD @@ -22,7 +22,7 @@ envoy_extension_cc_test( "compressor_filter_test.cc", ], extension_names = ["envoy.filters.http.compressor"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/compression/gzip/compressor:config", "//source/extensions/filters/http/compressor:compressor_filter_lib", @@ -40,7 +40,7 @@ envoy_extension_cc_test( "compressor_filter_integration_test.cc", ], extension_names = ["envoy.filters.http.compressor"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/compression/gzip/compressor:config", "//source/extensions/compression/gzip/decompressor:config", @@ -63,7 +63,7 @@ envoy_extension_cc_test( "config_test.cc", ], extension_names = ["envoy.filters.http.compressor"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":mock_config_cc_proto", "//source/extensions/filters/http/compressor:config", @@ -80,7 +80,7 @@ envoy_cc_benchmark_binary( "benchmark", "googletest", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/compression/compressor:compressor_factory_interface", "//source/common/protobuf:utility_lib", @@ -102,7 +102,7 @@ envoy_cc_benchmark_binary( envoy_benchmark_test( name = "compressor_filter_speed_test_benchmark_test", benchmark_binary = "compressor_filter_speed_test", - rbe_pool = "2core", + rbe_pool = "6gig", # TODO(envoyproxy/windows-dev): diagnose clang-cl build test failure tags = ["fails_on_windows"], ) @@ -118,7 +118,7 @@ envoy_cc_test( srcs = [ "compressor_integration_tests.cc", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":compressor_integration_tests_lib", "//source/common/http:header_map_lib", diff --git a/test/extensions/filters/http/connect_grpc_bridge/BUILD b/test/extensions/filters/http/connect_grpc_bridge/BUILD index 1607114d9b..ddde4547a4 100644 --- a/test/extensions/filters/http/connect_grpc_bridge/BUILD +++ b/test/extensions/filters/http/connect_grpc_bridge/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.filters.http.connect_grpc_bridge"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/connect_grpc_bridge:config", "//test/mocks/server:factory_context_mocks", @@ -27,7 +27,7 @@ envoy_extension_cc_test( name = "connect_grpc_bridge_filter_test", srcs = ["connect_grpc_bridge_filter_test.cc"], extension_names = ["envoy.filters.http.connect_grpc_bridge"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/buffer:buffer_lib", "//source/common/http:header_map_lib", @@ -45,7 +45,7 @@ envoy_extension_cc_test( "connect_grpc_bridge_integration_test.cc", ], extension_names = ["envoy.filters.http.connect_grpc_bridge"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/http:header_map_lib", "//source/common/http:headers_lib", @@ -60,7 +60,7 @@ envoy_extension_cc_test( name = "end_stream_response_test", srcs = ["end_stream_response_test.cc"], extension_names = ["envoy.filters.http.connect_grpc_bridge"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/connect_grpc_bridge:end_stream_response_lib", "//test/test_common:global_lib", diff --git a/test/extensions/filters/http/cors/BUILD b/test/extensions/filters/http/cors/BUILD index 7c24ffc44b..4e1eef940f 100644 --- a/test/extensions/filters/http/cors/BUILD +++ b/test/extensions/filters/http/cors/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "cors_filter_test", srcs = ["cors_filter_test.cc"], extension_names = ["envoy.filters.http.cors"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/http:header_map_lib", "//source/extensions/filters/http/cors:config", @@ -33,7 +33,7 @@ envoy_extension_cc_test( size = "large", srcs = ["cors_filter_integration_test.cc"], extension_names = ["envoy.filters.http.cors"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/buffer:buffer_lib", "//source/common/http:header_map_lib", diff --git a/test/extensions/filters/http/credential_injector/BUILD b/test/extensions/filters/http/credential_injector/BUILD index cfeaa16df7..f6d2388c6c 100644 --- a/test/extensions/filters/http/credential_injector/BUILD +++ b/test/extensions/filters/http/credential_injector/BUILD @@ -16,7 +16,7 @@ envoy_extension_cc_test( name = "filter_test", srcs = ["filter_test.cc"], extension_names = ["envoy.filters.http.credential_injector"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/credential_injector:credential_injector_lib", "//source/extensions/http/injected_credentials/generic:generic_lib", @@ -34,7 +34,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.filters.http.credential_injector"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":mock_credentail_cc_proto", "//source/extensions/filters/http/credential_injector:config", diff --git a/test/extensions/filters/http/csrf/BUILD b/test/extensions/filters/http/csrf/BUILD index a7e15d8094..d2377e0bb9 100644 --- a/test/extensions/filters/http/csrf/BUILD +++ b/test/extensions/filters/http/csrf/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "csrf_filter_test", srcs = ["csrf_filter_test.cc"], extension_names = ["envoy.filters.http.csrf"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/http:header_map_lib", "//source/extensions/filters/http/csrf:config", @@ -34,7 +34,7 @@ envoy_extension_cc_test( size = "large", srcs = ["csrf_filter_integration_test.cc"], extension_names = ["envoy.filters.http.csrf"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/csrf:config", "//test/config:utility_lib", diff --git a/test/extensions/filters/http/custom_response/BUILD b/test/extensions/filters/http/custom_response/BUILD index ec9a452539..e3395a1f49 100644 --- a/test/extensions/filters/http/custom_response/BUILD +++ b/test/extensions/filters/http/custom_response/BUILD @@ -36,7 +36,7 @@ envoy_extension_cc_test( size = "small", srcs = ["config_test.cc"], extension_names = ["envoy.filters.http.custom_response"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":utility_lib", "//source/common/http:message_lib", @@ -56,7 +56,7 @@ envoy_extension_cc_test( size = "small", srcs = ["custom_response_filter_test.cc"], extension_names = ["envoy.filters.http.custom_response"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":utility_lib", "//source/common/http:message_lib", @@ -83,7 +83,7 @@ envoy_extension_cc_test( "custom_response_integration_test.cc", ], extension_names = ["envoy.filters.http.custom_response"], - rbe_pool = "2core", + rbe_pool = "6gig", shard_count = 2, tags = [ "cpu:3", diff --git a/test/extensions/filters/http/decompressor/BUILD b/test/extensions/filters/http/decompressor/BUILD index 07117fbb29..19b962efdf 100644 --- a/test/extensions/filters/http/decompressor/BUILD +++ b/test/extensions/filters/http/decompressor/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "decompressor_filter_test", srcs = ["decompressor_filter_test.cc"], extension_names = ["envoy.filters.http.decompressor"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/http:headers_lib", "//source/common/protobuf:utility_lib", @@ -37,7 +37,7 @@ envoy_extension_cc_test( "decompressor_filter_integration_test.cc", ], extension_names = ["envoy.filters.http.decompressor"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/compression/gzip/compressor:config", "//source/extensions/compression/gzip/decompressor:config", diff --git a/test/extensions/filters/http/dynamic_forward_proxy/BUILD b/test/extensions/filters/http/dynamic_forward_proxy/BUILD index 7362dfbb01..db838f3284 100644 --- a/test/extensions/filters/http/dynamic_forward_proxy/BUILD +++ b/test/extensions/filters/http/dynamic_forward_proxy/BUILD @@ -17,7 +17,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.filters.http.dynamic_forward_proxy"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/dynamic_forward_proxy:config", "//test/mocks/server:factory_context_mocks", @@ -30,7 +30,7 @@ envoy_extension_cc_test( name = "proxy_filter_test", srcs = ["proxy_filter_test.cc"], extension_names = ["envoy.filters.http.dynamic_forward_proxy"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/stats:isolated_store_lib", "//source/extensions/common/dynamic_forward_proxy:dns_cache_impl", @@ -74,7 +74,7 @@ envoy_extension_cc_test( "//test/config/integration/certs", ], extension_names = ["envoy.filters.http.dynamic_forward_proxy"], - rbe_pool = "2core", + rbe_pool = "6gig", # TODO(envoyproxy/windows-dev): Diagnose failure shown on clang-cl build, see: # https://gist.github.com/wrowe/a152cb1d12c2f751916122aed39d8517 tags = ["fails_on_clang_cl"], diff --git a/test/extensions/filters/http/ext_authz/BUILD b/test/extensions/filters/http/ext_authz/BUILD index ebcbfd01fe..4a9d82bf60 100644 --- a/test/extensions/filters/http/ext_authz/BUILD +++ b/test/extensions/filters/http/ext_authz/BUILD @@ -18,7 +18,7 @@ envoy_extension_cc_test( name = "ext_authz_test", srcs = ["ext_authz_test.cc"], extension_names = ["envoy.filters.http.ext_authz"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/http:codes_interface", "//source/common/buffer:buffer_lib", @@ -51,7 +51,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.filters.http.ext_authz"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/grpc:async_client_manager_lib", "//source/common/network:address_lib", @@ -74,7 +74,7 @@ envoy_extension_cc_test( "ext_authz.yaml", ], extension_names = ["envoy.filters.http.ext_authz"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/clusters/strict_dns:strict_dns_cluster_lib", "//source/extensions/filters/http/ext_authz:config", @@ -106,7 +106,7 @@ envoy_cc_fuzz_test( name = "ext_authz_grpc_fuzz_test", srcs = ["ext_authz_grpc_fuzz_test.cc"], corpus = "ext_authz_grpc_corpus", - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":ext_authz_fuzz_lib", ":ext_authz_fuzz_proto_cc_proto", @@ -124,7 +124,7 @@ envoy_cc_fuzz_test( name = "ext_authz_http_fuzz_test", srcs = ["ext_authz_http_fuzz_test.cc"], corpus = "ext_authz_http_corpus", - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":ext_authz_fuzz_lib", ":ext_authz_fuzz_proto_cc_proto", @@ -144,7 +144,7 @@ envoy_cc_test_library( name = "ext_authz_fuzz_lib", srcs = ["ext_authz_fuzz_lib.cc"], hdrs = ["ext_authz_fuzz_lib.h"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":ext_authz_fuzz_proto_cc_proto", "//source/common/http:context_lib", diff --git a/test/extensions/filters/http/ext_proc/BUILD b/test/extensions/filters/http/ext_proc/BUILD index 3fd0c1b429..3ecc8ed945 100644 --- a/test/extensions/filters/http/ext_proc/BUILD +++ b/test/extensions/filters/http/ext_proc/BUILD @@ -19,7 +19,7 @@ envoy_extension_cc_test( size = "small", srcs = ["config_test.cc"], extension_names = ["envoy.filters.http.ext_proc"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["skip_on_windows"], deps = [ "//source/extensions/filters/http/ext_proc:config", @@ -39,7 +39,7 @@ envoy_extension_cc_test( ], }), extension_names = ["envoy.filters.http.ext_proc"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["skip_on_windows"], deps = [ ":mock_server_lib", @@ -72,7 +72,7 @@ envoy_extension_cc_test( size = "small", srcs = ["state_test.cc"], extension_names = ["envoy.filters.http.ext_proc"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["skip_on_windows"], deps = [ "//source/extensions/filters/http/ext_proc", @@ -84,7 +84,7 @@ envoy_extension_cc_test( size = "small", srcs = ["ordering_test.cc"], extension_names = ["envoy.filters.http.ext_proc"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["skip_on_windows"], deps = [ ":mock_server_lib", @@ -103,7 +103,7 @@ envoy_extension_cc_test( size = "small", srcs = ["client_test.cc"], extension_names = ["envoy.filters.http.ext_proc"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["skip_on_windows"], deps = [ "//source/common/http:header_map_lib", @@ -127,7 +127,7 @@ envoy_extension_cc_test( ], }), extension_names = ["envoy.filters.http.ext_proc"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["skip_on_windows"], deps = [ ":utils_lib", @@ -144,7 +144,7 @@ envoy_extension_cc_test( size = "small", srcs = ["mutation_utils_test.cc"], extension_names = ["envoy.filters.http.ext_proc"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["skip_on_windows"], deps = [ ":utils_lib", @@ -213,7 +213,7 @@ envoy_extension_cc_test( ], }), extension_names = ["envoy.filters.http.ext_proc"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = [ "cpu:3", "skip_on_windows", @@ -322,7 +322,7 @@ envoy_cc_fuzz_test( srcs = ["ext_proc_grpc_fuzz.cc"], hdrs = ["ext_proc_grpc_fuzz.h"], corpus = "ext_proc_grpc_corpus", - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["skip_on_windows"], deps = EXT_PROC_GRPC_FUZZ_TEST_DEPS, ) @@ -332,7 +332,7 @@ envoy_cc_fuzz_test( srcs = ["ext_proc_grpc_fuzz_persistent.cc"], hdrs = ["ext_proc_grpc_fuzz.h"], corpus = "ext_proc_grpc_corpus", - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["skip_on_windows"], deps = EXT_PROC_GRPC_FUZZ_TEST_DEPS, ) @@ -341,7 +341,7 @@ envoy_extension_cc_test( name = "ext_proc_benchmark_test", srcs = ["ext_proc_benchmark_test.cc"], extension_names = ["envoy.filters.http.ext_proc"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["skip_on_windows"], deps = [ ":test_processor_lib", diff --git a/test/extensions/filters/http/fault/BUILD b/test/extensions/filters/http/fault/BUILD index ee17d03c03..edfa5985df 100644 --- a/test/extensions/filters/http/fault/BUILD +++ b/test/extensions/filters/http/fault/BUILD @@ -16,7 +16,7 @@ envoy_extension_cc_test( name = "fault_filter_test", srcs = ["fault_filter_test.cc"], extension_names = ["envoy.filters.http.fault"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":utility_lib", "//envoy/event:dispatcher_interface", @@ -43,7 +43,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.filters.http.fault"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":utility_lib", "//source/extensions/filters/http/fault:config", @@ -58,7 +58,7 @@ envoy_extension_cc_test( size = "large", srcs = ["fault_filter_integration_test.cc"], extension_names = ["envoy.filters.http.fault"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/fault:config", "//test/integration:http_protocol_integration_lib", diff --git a/test/extensions/filters/http/file_system_buffer/BUILD b/test/extensions/filters/http/file_system_buffer/BUILD index a42d1358c7..938bf923ce 100644 --- a/test/extensions/filters/http/file_system_buffer/BUILD +++ b/test/extensions/filters/http/file_system_buffer/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "fragment_test", srcs = ["fragment_test.cc"], extension_names = ["envoy.filters.http.file_system_buffer"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["skip_on_windows"], deps = [ "//source/extensions/filters/http/file_system_buffer:fragment", @@ -32,7 +32,7 @@ envoy_extension_cc_test( "filter_test.cc", ], extension_names = ["envoy.filters.http.file_system_buffer"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["skip_on_windows"], deps = [ "//source/extensions/filters/http/file_system_buffer:config", @@ -49,7 +49,7 @@ envoy_extension_cc_test( "filter_integration_test.cc", ], extension_names = ["envoy.filters.http.file_system_buffer"], - rbe_pool = "2core", + rbe_pool = "6gig", shard_count = 4, tags = [ "cpu:3", diff --git a/test/extensions/filters/http/gcp_authn/BUILD b/test/extensions/filters/http/gcp_authn/BUILD index f6bb4df1b7..d8cb865c6b 100644 --- a/test/extensions/filters/http/gcp_authn/BUILD +++ b/test/extensions/filters/http/gcp_authn/BUILD @@ -17,7 +17,7 @@ envoy_extension_cc_test( size = "small", srcs = ["filter_config_test.cc"], extension_names = ["envoy.filters.http.gcp_authn"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/http:message_lib", "//source/extensions/filters/http/gcp_authn:config", @@ -32,7 +32,7 @@ envoy_extension_cc_test( size = "small", srcs = ["gcp_authn_filter_test.cc"], extension_names = ["envoy.filters.http.gcp_authn"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":gcp_authn_mocks", "//source/extensions/filters/http/gcp_authn", @@ -61,7 +61,7 @@ envoy_extension_cc_test( size = "large", srcs = ["gcp_authn_filter_integration_test.cc"], extension_names = ["envoy.filters.http.gcp_authn"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/gcp_authn", "//source/extensions/filters/http/gcp_authn:config", @@ -80,7 +80,7 @@ envoy_extension_cc_test( name = "token_cache_test", srcs = ["token_cache_test.cc"], extension_names = ["envoy.filters.http.gcp_authn"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/gcp_authn", "//source/extensions/filters/http/gcp_authn:config", diff --git a/test/extensions/filters/http/geoip/BUILD b/test/extensions/filters/http/geoip/BUILD index 471d9b5e39..e6639d4628 100644 --- a/test/extensions/filters/http/geoip/BUILD +++ b/test/extensions/filters/http/geoip/BUILD @@ -23,7 +23,7 @@ envoy_extension_cc_test( size = "small", srcs = ["config_test.cc"], extension_names = ["envoy.filters.http.geoip"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["skip_on_windows"], deps = [ ":geoip_mocks", @@ -41,7 +41,7 @@ envoy_extension_cc_test( size = "small", srcs = ["geoip_filter_test.cc"], extension_names = ["envoy.filters.http.geoip"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["skip_on_windows"], deps = [ ":dummy_cc_proto", @@ -69,7 +69,7 @@ envoy_extension_cc_test( extension_names = [ "envoy.filters.http.geoip", ], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["skip_on_windows"], deps = [ "//source/extensions/filters/http/geoip:config", diff --git a/test/extensions/filters/http/grpc_field_extraction/BUILD b/test/extensions/filters/http/grpc_field_extraction/BUILD index 72726101f4..70621c98a2 100644 --- a/test/extensions/filters/http/grpc_field_extraction/BUILD +++ b/test/extensions/filters/http/grpc_field_extraction/BUILD @@ -16,7 +16,7 @@ envoy_cc_test( name = "filter_test", srcs = ["filter_test.cc"], data = ["//test/proto:apikeys_proto_descriptor"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/grpc_field_extraction:extractor", "//source/extensions/filters/http/grpc_field_extraction:filter", @@ -36,7 +36,7 @@ envoy_cc_test( "//test/config/integration/certs", "//test/proto:apikeys_proto_descriptor", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/grpc_field_extraction:extractor", "//source/extensions/filters/http/grpc_field_extraction:extractor_impl", @@ -57,7 +57,7 @@ envoy_extension_cc_test( ], data = ["//test/proto:apikeys_proto_descriptor"], extension_names = ["envoy.filters.http.grpc_field_extraction"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/grpc_field_extraction:config", "//test/extensions/filters/http/grpc_field_extraction/message_converter:message_converter_test_lib", diff --git a/test/extensions/filters/http/grpc_field_extraction/message_converter/BUILD b/test/extensions/filters/http/grpc_field_extraction/message_converter/BUILD index 27f70de50e..1a289e12e0 100644 --- a/test/extensions/filters/http/grpc_field_extraction/message_converter/BUILD +++ b/test/extensions/filters/http/grpc_field_extraction/message_converter/BUILD @@ -26,7 +26,7 @@ envoy_cc_test_library( envoy_cc_test( name = "message_converter_utility_test", srcs = ["message_converter_utility_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":message_converter_test_lib", "//source/extensions/filters/http/grpc_field_extraction/message_converter:message_converter_utility_lib", @@ -40,7 +40,7 @@ envoy_cc_test( envoy_cc_test( name = "message_converter_test", srcs = ["message_converter_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":message_converter_test_lib", "//source/extensions/filters/http/grpc_field_extraction/message_converter:message_converter_lib", @@ -55,7 +55,7 @@ envoy_cc_test( envoy_cc_test( name = "stream_message_test", srcs = ["stream_message_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/grpc_field_extraction/message_converter:stream_message_lib", ], diff --git a/test/extensions/filters/http/grpc_http1_bridge/BUILD b/test/extensions/filters/http/grpc_http1_bridge/BUILD index 7ce56dc32f..268b40f7e5 100644 --- a/test/extensions/filters/http/grpc_http1_bridge/BUILD +++ b/test/extensions/filters/http/grpc_http1_bridge/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "http1_bridge_filter_test", srcs = ["http1_bridge_filter_test.cc"], extension_names = ["envoy.filters.http.grpc_http1_bridge"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/buffer:buffer_lib", "//source/common/http:header_map_lib", @@ -31,7 +31,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.filters.http.grpc_http1_bridge"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/grpc_http1_bridge:config", "//test/mocks/server:factory_context_mocks", @@ -45,7 +45,7 @@ envoy_extension_cc_test( "grpc_http1_bridge_integration_test.cc", ], extension_names = ["envoy.filters.http.grpc_http1_bridge"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/http:header_map_lib", "//source/common/http:headers_lib", diff --git a/test/extensions/filters/http/grpc_http1_reverse_bridge/BUILD b/test/extensions/filters/http/grpc_http1_reverse_bridge/BUILD index d5aa790196..50010f98ad 100644 --- a/test/extensions/filters/http/grpc_http1_reverse_bridge/BUILD +++ b/test/extensions/filters/http/grpc_http1_reverse_bridge/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "reverse_bridge_test", srcs = ["reverse_bridge_test.cc"], extension_names = ["envoy.filters.http.grpc_http1_reverse_bridge"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/buffer:buffer_lib", "//source/common/http:header_map_lib", @@ -30,7 +30,7 @@ envoy_extension_cc_test( size = "large", srcs = ["reverse_bridge_integration_test.cc"], extension_names = ["envoy.filters.http.grpc_http1_reverse_bridge"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/buffer:buffer_lib", "//source/common/http:header_map_lib", @@ -47,7 +47,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.filters.http.grpc_http1_reverse_bridge"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/grpc_http1_reverse_bridge:config", "//test/mocks/server:factory_context_mocks", diff --git a/test/extensions/filters/http/grpc_json_transcoder/BUILD b/test/extensions/filters/http/grpc_json_transcoder/BUILD index 4fed96f851..e45bb375e9 100644 --- a/test/extensions/filters/http/grpc_json_transcoder/BUILD +++ b/test/extensions/filters/http/grpc_json_transcoder/BUILD @@ -19,7 +19,7 @@ envoy_extension_cc_test( "//test/proto:bookstore_proto_descriptor", ], extension_names = ["envoy.filters.http.grpc_json_transcoder"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/grpc_json_transcoder:json_transcoder_filter_lib", "//test/mocks/http:http_mocks", @@ -35,7 +35,7 @@ envoy_extension_cc_test( name = "http_body_utils_test", srcs = ["http_body_utils_test.cc"], extension_names = ["envoy.filters.http.grpc_json_transcoder"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/buffer:buffer_lib", "//source/common/buffer:zero_copy_input_stream_lib", @@ -49,7 +49,7 @@ envoy_extension_cc_test( name = "transcoder_input_stream_test", srcs = ["transcoder_input_stream_test.cc"], extension_names = ["envoy.filters.http.grpc_json_transcoder"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/buffer:buffer_lib", "//source/extensions/filters/http/grpc_json_transcoder:transcoder_input_stream_lib", @@ -66,7 +66,7 @@ envoy_extension_cc_test( "//test/proto:bookstore_proto_descriptor", ], extension_names = ["envoy.filters.http.grpc_json_transcoder"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = [ "cpu:3", ], @@ -85,7 +85,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.filters.http.grpc_json_transcoder"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/grpc_json_transcoder:config", "//test/mocks/server:factory_context_mocks", @@ -101,7 +101,7 @@ envoy_extension_cc_test( "//test/proto:bookstore_proto_descriptor", ], extension_names = ["envoy.filters.http.grpc_json_transcoder"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/http:utility_lib", "//source/common/protobuf", diff --git a/test/extensions/filters/http/grpc_stats/BUILD b/test/extensions/filters/http/grpc_stats/BUILD index 1b15be6251..c96762d7cd 100644 --- a/test/extensions/filters/http/grpc_stats/BUILD +++ b/test/extensions/filters/http/grpc_stats/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.filters.http.grpc_stats"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/grpc:common_lib", "//source/extensions/filters/http/grpc_stats:config", diff --git a/test/extensions/filters/http/grpc_web/BUILD b/test/extensions/filters/http/grpc_web/BUILD index fdf246403a..975e16af33 100644 --- a/test/extensions/filters/http/grpc_web/BUILD +++ b/test/extensions/filters/http/grpc_web/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "grpc_web_filter_test", srcs = ["grpc_web_filter_test.cc"], extension_names = ["envoy.filters.http.grpc_web"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/grpc_web:grpc_web_filter_lib", "//test/mocks/http:http_mocks", @@ -28,7 +28,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.filters.http.grpc_web"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/grpc_web:config", "//test/mocks/server:factory_context_mocks", @@ -40,7 +40,7 @@ envoy_extension_cc_test( size = "large", srcs = ["grpc_web_filter_integration_test.cc"], extension_names = ["envoy.filters.http.grpc_web"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/buffer:buffer_lib", "//source/common/http:header_map_lib", diff --git a/test/extensions/filters/http/header_mutation/BUILD b/test/extensions/filters/http/header_mutation/BUILD index 06dd7b38b1..575c984fa3 100644 --- a/test/extensions/filters/http/header_mutation/BUILD +++ b/test/extensions/filters/http/header_mutation/BUILD @@ -17,7 +17,7 @@ envoy_extension_cc_test( "header_mutation_test.cc", ], extension_names = ["envoy.filters.http.header_mutation"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/header_mutation:config", "//test/mocks/api:api_mocks", @@ -32,7 +32,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.filters.http.header_mutation"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/header_mutation:config", "//test/mocks/server:factory_context_mocks", @@ -47,7 +47,7 @@ envoy_extension_cc_test( size = "large", srcs = ["header_mutation_integration_test.cc"], extension_names = ["envoy.filters.http.header_mutation"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/header_mutation:config", "//test/integration:http_integration_lib", diff --git a/test/extensions/filters/http/header_to_metadata/BUILD b/test/extensions/filters/http/header_to_metadata/BUILD index ac1e2f6d53..79f377c6da 100644 --- a/test/extensions/filters/http/header_to_metadata/BUILD +++ b/test/extensions/filters/http/header_to_metadata/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "header_to_metadata_filter_test", srcs = ["header_to_metadata_filter_test.cc"], extension_names = ["envoy.filters.http.header_to_metadata"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/common:base64_lib", "//source/extensions/filters/http/header_to_metadata:header_to_metadata_filter_lib", @@ -28,7 +28,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.filters.http.header_to_metadata"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/header_to_metadata:config", "//test/mocks/server:factory_context_mocks", diff --git a/test/extensions/filters/http/health_check/BUILD b/test/extensions/filters/http/health_check/BUILD index d7268b8954..b113a0e72d 100644 --- a/test/extensions/filters/http/health_check/BUILD +++ b/test/extensions/filters/http/health_check/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "health_check_test", srcs = ["health_check_test.cc"], extension_names = ["envoy.filters.http.health_check"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/buffer:buffer_lib", "//source/common/http:header_utility_lib", @@ -30,7 +30,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.filters.http.health_check"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/health_check:config", "//test/mocks/server:factory_context_mocks", @@ -47,7 +47,7 @@ envoy_extension_cc_test( "health_check_integration_test.cc", ], extension_names = ["envoy.filters.http.health_check"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/buffer:config", "//source/extensions/filters/http/health_check:config", diff --git a/test/extensions/filters/http/ip_tagging/BUILD b/test/extensions/filters/http/ip_tagging/BUILD index 8f68c8f188..f801cdd0aa 100644 --- a/test/extensions/filters/http/ip_tagging/BUILD +++ b/test/extensions/filters/http/ip_tagging/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "ip_tagging_filter_test", srcs = ["ip_tagging_filter_test.cc"], extension_names = ["envoy.filters.http.ip_tagging"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/buffer:buffer_lib", "//source/common/http:header_map_lib", @@ -36,7 +36,7 @@ envoy_extension_cc_test( size = "large", srcs = ["ip_tagging_integration_test.cc"], extension_names = ["envoy.filters.http.ip_tagging"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/ip_tagging:config", "//test/integration:http_integration_lib", diff --git a/test/extensions/filters/http/json_to_metadata/BUILD b/test/extensions/filters/http/json_to_metadata/BUILD index 93572fdf29..d7e6410721 100644 --- a/test/extensions/filters/http/json_to_metadata/BUILD +++ b/test/extensions/filters/http/json_to_metadata/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "filter_test", srcs = ["filter_test.cc"], extension_names = ["envoy.filters.http.json_to_metadata"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/json_to_metadata:json_to_metadata_lib", "//test/common/stream_info:test_util", @@ -28,7 +28,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.filters.http.json_to_metadata"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/json_to_metadata:config", "//test/mocks/server:server_mocks", @@ -40,7 +40,7 @@ envoy_extension_cc_test( size = "large", srcs = ["integration_test.cc"], extension_names = ["envoy.filters.http.json_to_metadata"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/json_to_metadata:config", "//test/integration:http_protocol_integration_lib", diff --git a/test/extensions/filters/http/jwt_authn/BUILD b/test/extensions/filters/http/jwt_authn/BUILD index 9b766a5fa7..bcfa2eb2c4 100644 --- a/test/extensions/filters/http/jwt_authn/BUILD +++ b/test/extensions/filters/http/jwt_authn/BUILD @@ -35,7 +35,7 @@ envoy_extension_cc_test( name = "extractor_test", srcs = ["extractor_test.cc"], extension_names = ["envoy.filters.http.jwt_authn"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/jwt_authn:extractor_lib", "//test/extensions/filters/http/jwt_authn:test_common_lib", @@ -49,7 +49,7 @@ envoy_extension_cc_test( name = "filter_test", srcs = ["filter_test.cc"], extension_names = ["envoy.filters.http.jwt_authn"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":mock_lib", "//source/extensions/filters/http/jwt_authn:filter_lib", @@ -62,7 +62,7 @@ envoy_extension_cc_test( name = "filter_config_test", srcs = ["filter_config_test.cc"], extension_names = ["envoy.filters.http.jwt_authn"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/router:string_accessor_lib", "//source/common/stream_info:filter_state_lib", @@ -79,7 +79,7 @@ envoy_extension_cc_test( name = "jwks_async_fetcher_test", srcs = ["jwks_async_fetcher_test.cc"], extension_names = ["envoy.filters.http.jwt_authn"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/jwt_authn:jwks_async_fetcher_lib", "//test/extensions/filters/http/jwt_authn:test_common_lib", @@ -91,7 +91,7 @@ envoy_extension_cc_test( name = "filter_factory_test", srcs = ["filter_factory_test.cc"], extension_names = ["envoy.filters.http.jwt_authn"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/jwt_authn:config", "//test/extensions/filters/http/jwt_authn:test_common_lib", @@ -104,7 +104,7 @@ envoy_extension_cc_test( name = "jwks_cache_test", srcs = ["jwks_cache_test.cc"], extension_names = ["envoy.filters.http.jwt_authn"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/stats:isolated_store_lib", "//source/extensions/filters/http/common:jwks_fetcher_lib", @@ -120,7 +120,7 @@ envoy_extension_cc_test( name = "jwt_cache_test", srcs = ["jwt_cache_test.cc"], extension_names = ["envoy.filters.http.jwt_authn"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/jwt_authn:jwt_cache_lib", "//test/extensions/filters/http/jwt_authn:test_common_lib", @@ -134,7 +134,7 @@ envoy_extension_cc_test( name = "authenticator_test", srcs = ["authenticator_test.cc"], extension_names = ["envoy.filters.http.jwt_authn"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":mock_lib", "//source/common/common:base64_lib", @@ -159,7 +159,7 @@ envoy_extension_cc_test( "envoy.filters.http.jwt_authn", "envoy.filters.http.set_filter_state", ], - rbe_pool = "2core", + rbe_pool = "6gig", shard_count = 4, tags = [ "cpu:3", @@ -182,7 +182,7 @@ envoy_extension_cc_test( name = "matcher_test", srcs = ["matcher_test.cc"], extension_names = ["envoy.filters.http.jwt_authn"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":mock_lib", ":test_common_lib", @@ -197,7 +197,7 @@ envoy_extension_cc_test( name = "group_verifier_test", srcs = ["group_verifier_test.cc"], extension_names = ["envoy.filters.http.jwt_authn"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":mock_lib", ":test_common_lib", @@ -214,7 +214,7 @@ envoy_extension_cc_test( "provider_verifier_test.cc", ], extension_names = ["envoy.filters.http.jwt_authn"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":mock_lib", ":test_common_lib", @@ -239,7 +239,7 @@ envoy_cc_fuzz_test( name = "jwt_authn_fuzz_test", srcs = ["jwt_authn_fuzz_test.cc"], corpus = "jwt_authn_corpus", - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":jwt_authn_fuzz_proto_cc_proto", "//source/common/common:regex_lib", diff --git a/test/extensions/filters/http/kill_request/BUILD b/test/extensions/filters/http/kill_request/BUILD index 06c670dc01..2c31eff6ff 100644 --- a/test/extensions/filters/http/kill_request/BUILD +++ b/test/extensions/filters/http/kill_request/BUILD @@ -16,7 +16,7 @@ envoy_extension_cc_test( name = "kill_request_filter_test", srcs = ["kill_request_filter_test.cc"], extension_names = ["envoy.filters.http.kill_request"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/http:metadata_interface", "//source/common/buffer:buffer_lib", @@ -33,7 +33,7 @@ envoy_extension_cc_test( name = "kill_request_config_test", srcs = ["kill_request_config_test.cc"], extension_names = ["envoy.filters.http.kill_request"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/kill_request:kill_request_config", "//test/mocks/server:factory_context_mocks", @@ -47,7 +47,7 @@ envoy_extension_cc_test( size = "large", srcs = ["kill_request_filter_integration_test.cc"], extension_names = ["envoy.filters.http.kill_request"], - rbe_pool = "2core", + rbe_pool = "6gig", shard_count = 8, deps = [ "//source/extensions/filters/http/kill_request:kill_request_config", @@ -60,7 +60,7 @@ envoy_cc_test( size = "large", srcs = ["crash_integration_test.cc"], coverage = False, - rbe_pool = "2core", + rbe_pool = "6gig", shard_count = 8, deps = [ "//source/extensions/filters/http/kill_request:kill_request_config", diff --git a/test/extensions/filters/http/local_ratelimit/BUILD b/test/extensions/filters/http/local_ratelimit/BUILD index 0da3cf1105..ec05f181f9 100644 --- a/test/extensions/filters/http/local_ratelimit/BUILD +++ b/test/extensions/filters/http/local_ratelimit/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "filter_test", srcs = ["filter_test.cc"], extension_names = ["envoy.filters.http.local_ratelimit"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/singleton:manager_impl_lib", "//source/extensions/filters/http/local_ratelimit:local_ratelimit_lib", @@ -33,7 +33,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.filters.http.local_ratelimit"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/local_ratelimit:config", "//test/mocks/server:server_mocks", @@ -45,7 +45,7 @@ envoy_extension_cc_test( size = "large", srcs = ["local_ratelimit_integration_test.cc"], extension_names = ["envoy.filters.http.local_ratelimit"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = [ "cpu:3", ], diff --git a/test/extensions/filters/http/lua/BUILD b/test/extensions/filters/http/lua/BUILD index c29134bdaf..85e7e1ecae 100644 --- a/test/extensions/filters/http/lua/BUILD +++ b/test/extensions/filters/http/lua/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "lua_filter_test", srcs = ["lua_filter_test.cc"], extension_names = ["envoy.filters.http.lua"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/stream_info:stream_info_lib", "//source/extensions/filters/http/lua:lua_filter_lib", @@ -37,7 +37,7 @@ envoy_extension_cc_test( name = "wrappers_test", srcs = ["wrappers_test.cc"], extension_names = ["envoy.filters.http.lua"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/network:address_lib", "//source/common/stream_info:stream_info_lib", @@ -54,7 +54,7 @@ envoy_extension_cc_test( size = "large", srcs = ["lua_integration_test.cc"], extension_names = ["envoy.filters.http.lua"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/lua:config", "//test/config:v2_link_hacks", @@ -69,7 +69,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.filters.http.lua"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/lua:config", "//test/mocks/server:factory_context_mocks", diff --git a/test/extensions/filters/http/match_delegate/BUILD b/test/extensions/filters/http/match_delegate/BUILD index bc2ffd4124..951063f706 100644 --- a/test/extensions/filters/http/match_delegate/BUILD +++ b/test/extensions/filters/http/match_delegate/BUILD @@ -11,7 +11,7 @@ envoy_package() envoy_cc_test( name = "config_test", srcs = ["config_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/match_delegate:config", "//test/mocks/server:factory_context_mocks", @@ -22,7 +22,7 @@ envoy_cc_test( envoy_cc_test( name = "match_delegate_integration_test", srcs = ["match_delegate_integration_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/common:factory_base_lib", "//source/extensions/filters/http/match_delegate:config", diff --git a/test/extensions/filters/http/oauth2/BUILD b/test/extensions/filters/http/oauth2/BUILD index 027fd92d2e..8d7bce78a6 100644 --- a/test/extensions/filters/http/oauth2/BUILD +++ b/test/extensions/filters/http/oauth2/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.filters.http.oauth2"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/oauth2:config", "//test/mocks/server:factory_context_mocks", @@ -28,7 +28,7 @@ envoy_extension_cc_test( size = "large", srcs = ["oauth_integration_test.cc"], extension_names = ["envoy.filters.http.oauth2"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/common:base64_lib", "//source/common/http:utility_lib", @@ -44,7 +44,7 @@ envoy_extension_cc_test( name = "filter_test", srcs = ["filter_test.cc"], extension_names = ["envoy.filters.http.oauth2"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/secret:secret_manager_impl_lib", "//source/extensions/filters/http/oauth2:config", @@ -63,7 +63,7 @@ envoy_extension_cc_test( name = "oauth_client_test", srcs = ["oauth_test.cc"], extension_names = ["envoy.filters.http.oauth2"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/oauth2:oauth_client", "//test/integration:http_integration_lib", diff --git a/test/extensions/filters/http/on_demand/BUILD b/test/extensions/filters/http/on_demand/BUILD index 8a0923fb3e..145fc0ff8f 100644 --- a/test/extensions/filters/http/on_demand/BUILD +++ b/test/extensions/filters/http/on_demand/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "on_demand_filter_test", srcs = ["on_demand_filter_test.cc"], extension_names = ["envoy.filters.http.on_demand"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/http:header_map_lib", "//source/common/protobuf:utility_lib", @@ -33,7 +33,7 @@ envoy_extension_cc_test( size = "large", srcs = ["on_demand_integration_test.cc"], extension_names = ["envoy.filters.http.on_demand"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = [ "cpu:3", ], @@ -57,7 +57,7 @@ envoy_extension_cc_test( size = "large", srcs = ["odcds_integration_test.cc"], extension_names = ["envoy.filters.http.on_demand"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/common:macros", "//source/extensions/filters/http/on_demand:config", diff --git a/test/extensions/filters/http/original_src/BUILD b/test/extensions/filters/http/original_src/BUILD index 217a3663ef..5b9390d0aa 100644 --- a/test/extensions/filters/http/original_src/BUILD +++ b/test/extensions/filters/http/original_src/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.filters.http.original_src"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/original_src:config_lib", "@envoy_api//envoy/extensions/filters/http/original_src/v3:pkg_cc_proto", @@ -26,7 +26,7 @@ envoy_extension_cc_test( name = "original_src_config_factory_test", srcs = ["original_src_config_factory_test.cc"], extension_names = ["envoy.filters.http.original_src"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/original_src:config", "//source/extensions/filters/http/original_src:config_lib", @@ -40,7 +40,7 @@ envoy_extension_cc_test( name = "original_src_test", srcs = ["original_src_test.cc"], extension_names = ["envoy.filters.http.original_src"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/network:socket_option_lib", "//source/extensions/filters/http/original_src:original_src_lib", diff --git a/test/extensions/filters/http/rate_limit_quota/BUILD b/test/extensions/filters/http/rate_limit_quota/BUILD index 0c1a850bef..ed43b1c5cb 100644 --- a/test/extensions/filters/http/rate_limit_quota/BUILD +++ b/test/extensions/filters/http/rate_limit_quota/BUILD @@ -29,7 +29,7 @@ envoy_extension_cc_test( size = "small", srcs = ["config_test.cc"], extension_names = ["envoy.filters.http.rate_limit_quota"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["skip_on_windows"], deps = [ "//source/common/http:message_lib", @@ -45,7 +45,7 @@ envoy_extension_cc_test( size = "small", srcs = ["filter_test.cc"], extension_names = ["envoy.filters.http.rate_limit_quota"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["skip_on_windows"], deps = [ ":client_test_utils", @@ -67,7 +67,7 @@ envoy_extension_cc_test( size = "small", srcs = ["client_test.cc"], extension_names = ["envoy.filters.http.rate_limit_quota"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["skip_on_windows"], deps = [ ":client_test_utils", @@ -107,7 +107,7 @@ envoy_extension_cc_test( size = "large", srcs = ["integration_test.cc"], extension_names = ["envoy.filters.http.rate_limit_quota"], - rbe_pool = "2core", + rbe_pool = "6gig", shard_count = 2, tags = [ "cpu:3", diff --git a/test/extensions/filters/http/ratelimit/BUILD b/test/extensions/filters/http/ratelimit/BUILD index 66ace82fef..db8ba366d5 100644 --- a/test/extensions/filters/http/ratelimit/BUILD +++ b/test/extensions/filters/http/ratelimit/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "ratelimit_test", srcs = ["ratelimit_test.cc"], extension_names = ["envoy.filters.http.ratelimit"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/buffer:buffer_lib", "//source/common/common:empty_string", @@ -39,7 +39,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.filters.http.ratelimit"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/ratelimit:config", "//test/mocks/server:factory_context_mocks", @@ -54,7 +54,7 @@ envoy_extension_cc_test( size = "large", srcs = ["ratelimit_integration_test.cc"], extension_names = ["envoy.filters.http.ratelimit"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/buffer:zero_copy_input_stream_lib", "//source/common/grpc:codec_lib", @@ -75,7 +75,7 @@ envoy_extension_cc_test( name = "ratelimit_headers_test", srcs = ["ratelimit_headers_test.cc"], extension_names = ["envoy.filters.http.cache"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/ratelimit:ratelimit_headers_lib", "//test/extensions/filters/common/ratelimit:ratelimit_utils", diff --git a/test/extensions/filters/http/rbac/BUILD b/test/extensions/filters/http/rbac/BUILD index 27a5404936..31bded9653 100644 --- a/test/extensions/filters/http/rbac/BUILD +++ b/test/extensions/filters/http/rbac/BUILD @@ -18,7 +18,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.filters.http.rbac"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["skip_on_windows"], deps = [ "//source/extensions/filters/http/rbac:config", @@ -33,7 +33,7 @@ envoy_extension_cc_test( name = "rbac_filter_test", srcs = ["rbac_filter_test.cc"], extension_names = ["envoy.filters.http.rbac"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["skip_on_windows"], deps = [ "//source/extensions/common/matcher:matcher_lib", @@ -62,7 +62,7 @@ envoy_extension_cc_test( size = "large", srcs = ["rbac_filter_integration_test.cc"], extension_names = ["envoy.filters.http.rbac"], - rbe_pool = "2core", + rbe_pool = "6gig", shard_count = 3, tags = ["skip_on_windows"], deps = [ @@ -108,7 +108,7 @@ envoy_cc_fuzz_test( name = "rbac_filter_fuzz_test", srcs = ["rbac_filter_fuzz_test.cc"], corpus = "rbac_filter_corpus", - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":rbac_filter_fuzz_proto_cc_proto", "//source/common/buffer:buffer_lib", diff --git a/test/extensions/filters/http/router/BUILD b/test/extensions/filters/http/router/BUILD index 20e86f4464..8d8b56e6bc 100644 --- a/test/extensions/filters/http/router/BUILD +++ b/test/extensions/filters/http/router/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.filters.http.router"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/router:config", "//test/mocks/server:factory_context_mocks", @@ -32,7 +32,7 @@ envoy_extension_cc_test( "//test/config/integration/certs", ], extension_names = ["envoy.filters.http.router"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/router:config", "//test/integration:http_integration_lib", diff --git a/test/extensions/filters/http/set_filter_state/BUILD b/test/extensions/filters/http/set_filter_state/BUILD index 5e29e5e2f5..e9911715a0 100644 --- a/test/extensions/filters/http/set_filter_state/BUILD +++ b/test/extensions/filters/http/set_filter_state/BUILD @@ -17,7 +17,7 @@ envoy_extension_cc_test( "integration_test.cc", ], extension_names = ["envoy.filters.http.set_filter_state"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/router:string_accessor_lib", "//source/extensions/filters/http/set_filter_state:config", diff --git a/test/extensions/filters/http/set_metadata/BUILD b/test/extensions/filters/http/set_metadata/BUILD index 9d813831ba..082967d48d 100644 --- a/test/extensions/filters/http/set_metadata/BUILD +++ b/test/extensions/filters/http/set_metadata/BUILD @@ -17,7 +17,7 @@ envoy_extension_cc_test( "set_metadata_filter_test.cc", ], extension_names = ["envoy.filters.http.set_metadata"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/set_metadata:config", "//test/integration:http_integration_lib", @@ -30,7 +30,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.filters.http.set_metadata"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/set_metadata:config", "//test/mocks/server:factory_context_mocks", diff --git a/test/extensions/filters/http/stateful_session/BUILD b/test/extensions/filters/http/stateful_session/BUILD index 52ccd62d2f..0a9f28e34a 100644 --- a/test/extensions/filters/http/stateful_session/BUILD +++ b/test/extensions/filters/http/stateful_session/BUILD @@ -17,7 +17,7 @@ envoy_extension_cc_test( "stateful_session_test.cc", ], extension_names = ["envoy.filters.http.stateful_session"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/stateful_session:config", "//source/server:generic_factory_context_lib", @@ -37,7 +37,7 @@ envoy_extension_cc_test( "stateful_session_integration_test.cc", ], extension_names = ["envoy.filters.http.stateful_session"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/protobuf", "//source/extensions/filters/http/stateful_session:config", @@ -53,7 +53,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.filters.http.stateful_session"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/stateful_session:config", "//test/mocks/http:stateful_session_mock", diff --git a/test/extensions/filters/http/tap/BUILD b/test/extensions/filters/http/tap/BUILD index ab90c65d03..e692767264 100644 --- a/test/extensions/filters/http/tap/BUILD +++ b/test/extensions/filters/http/tap/BUILD @@ -25,7 +25,7 @@ envoy_extension_cc_test( name = "tap_filter_test", srcs = envoy_select_admin_functionality(["tap_filter_test.cc"]), extension_names = ["envoy.filters.http.tap"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":common", "//source/extensions/filters/http/tap:config", @@ -41,7 +41,7 @@ envoy_extension_cc_test( name = "tap_config_impl_test", srcs = envoy_select_admin_functionality(["tap_config_impl_test.cc"]), extension_names = ["envoy.filters.http.tap"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":common", "//source/extensions/filters/http/tap:tap_config_impl", @@ -58,7 +58,7 @@ envoy_extension_cc_test( size = "large", srcs = envoy_select_admin_functionality(["tap_filter_integration_test.cc"]), extension_names = ["envoy.filters.http.tap"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/tap:config", "//test/extensions/common/tap:common", diff --git a/test/extensions/filters/http/thrift_to_metadata/BUILD b/test/extensions/filters/http/thrift_to_metadata/BUILD index 963232e13e..89dec79622 100644 --- a/test/extensions/filters/http/thrift_to_metadata/BUILD +++ b/test/extensions/filters/http/thrift_to_metadata/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "filter_test", srcs = ["filter_test.cc"], extension_names = ["envoy.filters.http.thrift_to_metadata"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/thrift_to_metadata:thrift_to_metadata_lib", "//source/extensions/filters/network/thrift_proxy:protocol_converter_lib", @@ -30,7 +30,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.filters.http.thrift_to_metadata"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/thrift_to_metadata:config", "//test/mocks/server:server_mocks", @@ -42,7 +42,7 @@ envoy_extension_cc_test( size = "large", srcs = ["integration_test.cc"], extension_names = ["envoy.filters.http.thrift_to_metadata"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/thrift_to_metadata:config", "//source/extensions/filters/network/thrift_proxy:protocol_converter_lib", diff --git a/test/extensions/filters/http/wasm/BUILD b/test/extensions/filters/http/wasm/BUILD index a0e557e96a..130216302e 100644 --- a/test/extensions/filters/http/wasm/BUILD +++ b/test/extensions/filters/http/wasm/BUILD @@ -61,7 +61,7 @@ envoy_extension_cc_test( "//test/extensions/filters/http/wasm/test_data:test_cpp.wasm", ]), extension_names = ["envoy.filters.http.wasm"], - rbe_pool = "2core", + rbe_pool = "6gig", shard_count = 16, tags = ["skip_on_windows"], deps = [ diff --git a/test/extensions/filters/listener/common/fuzz/BUILD b/test/extensions/filters/listener/common/fuzz/BUILD index b373f7f561..e617239b2d 100644 --- a/test/extensions/filters/listener/common/fuzz/BUILD +++ b/test/extensions/filters/listener/common/fuzz/BUILD @@ -18,7 +18,7 @@ envoy_cc_test_library( name = "listener_filter_fuzzer_lib", srcs = ["listener_filter_fuzzer.cc"], hdrs = ["listener_filter_fuzzer.h"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":listener_filter_fakes", ":listener_filter_fuzzer_proto_cc_proto", @@ -35,7 +35,7 @@ envoy_cc_test_library( name = "listener_filter_fakes", srcs = ["listener_filter_fakes.cc"], hdrs = ["listener_filter_fakes.h"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/api:os_sys_calls_lib", "//test/mocks/network:network_mocks", diff --git a/test/extensions/filters/listener/http_inspector/BUILD b/test/extensions/filters/listener/http_inspector/BUILD index 09eace060f..a919bb7306 100644 --- a/test/extensions/filters/listener/http_inspector/BUILD +++ b/test/extensions/filters/listener/http_inspector/BUILD @@ -16,7 +16,7 @@ envoy_extension_cc_test( name = "http_inspector_test", srcs = ["http_inspector_test.cc"], extension_names = ["envoy.filters.listener.http_inspector"], - rbe_pool = "2core", + rbe_pool = "6gig", #TODO(davinci26): The test passes on Windows *but* http inspector # *used* to rely on Event::FileTriggerType::Edge and we got away with it # because we mock the dispatcher. Need to verify that the scenario is @@ -38,7 +38,7 @@ envoy_extension_cc_test( name = "http_inspector_config_test", srcs = ["http_inspector_config_test.cc"], extension_names = ["envoy.filters.listener.http_inspector"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/listener/http_inspector:config", "//source/extensions/filters/listener/http_inspector:http_inspector_lib", @@ -54,7 +54,7 @@ envoy_cc_fuzz_test( name = "http_inspector_fuzz_test", srcs = ["http_inspector_fuzz_test.cc"], corpus = "http_inspector_corpus", - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/listener/http_inspector:http_inspector_lib", "//test/extensions/filters/listener/common/fuzz:listener_filter_fuzzer_lib", @@ -68,7 +68,7 @@ envoy_extension_cc_test( "http_inspector_integration_test.cc", ], extension_names = ["envoy.filters.listener.http_inspector"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/access_loggers/file:config", "//source/extensions/filters/listener/http_inspector:config", diff --git a/test/extensions/filters/listener/local_ratelimit/BUILD b/test/extensions/filters/listener/local_ratelimit/BUILD index 184d5402a6..0250be60ee 100644 --- a/test/extensions/filters/listener/local_ratelimit/BUILD +++ b/test/extensions/filters/listener/local_ratelimit/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "local_ratelimit_test", srcs = ["local_ratelimit_test.cc"], extension_names = ["envoy.filters.listener.local_ratelimit"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/network:default_socket_interface_lib", "//source/common/network:listener_filter_buffer_lib", @@ -34,7 +34,7 @@ envoy_extension_cc_test( "local_ratelimit_integration_test.cc", ], extension_names = ["envoy.filters.listener.local_ratelimit"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/access_loggers/file:config", "//source/extensions/filters/listener/local_ratelimit:config", diff --git a/test/extensions/filters/listener/original_dst/BUILD b/test/extensions/filters/listener/original_dst/BUILD index 028b63f94f..bfa07afe7e 100644 --- a/test/extensions/filters/listener/original_dst/BUILD +++ b/test/extensions/filters/listener/original_dst/BUILD @@ -13,7 +13,7 @@ envoy_cc_fuzz_test( name = "original_dst_fuzz_test", srcs = ["original_dst_fuzz_test.cc"], corpus = "original_dst_corpus", - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/listener/original_dst:original_dst_lib", "//test/extensions/filters/listener/common/fuzz:listener_filter_fuzzer_lib", @@ -26,7 +26,7 @@ envoy_cc_test( srcs = [ "original_dst_integration_test.cc", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/http:header_map_lib", "//source/extensions/clusters/original_dst:original_dst_cluster_lib", @@ -45,7 +45,7 @@ envoy_cc_test( envoy_cc_test( name = "original_dst_test", srcs = ["original_dst_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/network:filter_state_dst_address_lib", "//source/common/network:listener_filter_buffer_lib", diff --git a/test/extensions/filters/listener/original_src/BUILD b/test/extensions/filters/listener/original_src/BUILD index 69c090532d..6eea6c81ac 100644 --- a/test/extensions/filters/listener/original_src/BUILD +++ b/test/extensions/filters/listener/original_src/BUILD @@ -17,7 +17,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.filters.listener.original_src"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/listener/original_src:config_lib", "@envoy_api//envoy/extensions/filters/listener/original_src/v3:pkg_cc_proto", @@ -28,7 +28,7 @@ envoy_extension_cc_test( name = "original_src_config_factory_test", srcs = ["original_src_config_factory_test.cc"], extension_names = ["envoy.filters.listener.original_src"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/listener/original_src:config", "//source/extensions/filters/listener/original_src:config_lib", @@ -41,7 +41,7 @@ envoy_extension_cc_test( name = "original_src_test", srcs = ["original_src_test.cc"], extension_names = ["envoy.filters.listener.original_src"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/network:socket_option_lib", "//source/extensions/filters/listener/original_src:original_src_lib", @@ -67,7 +67,7 @@ envoy_cc_fuzz_test( name = "original_src_fuzz_test", srcs = ["original_src_fuzz_test.cc"], corpus = "original_src_corpus", - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":original_src_fuzz_test_proto_cc_proto", "//source/extensions/filters/listener/original_src:original_src_lib", diff --git a/test/extensions/filters/listener/proxy_protocol/BUILD b/test/extensions/filters/listener/proxy_protocol/BUILD index f93935a9b3..34fce14255 100644 --- a/test/extensions/filters/listener/proxy_protocol/BUILD +++ b/test/extensions/filters/listener/proxy_protocol/BUILD @@ -18,7 +18,7 @@ envoy_extension_cc_test( name = "proxy_protocol_test", srcs = ["proxy_protocol_test.cc"], extension_names = ["envoy.filters.listener.proxy_protocol"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/buffer:buffer_lib", "//source/common/event:dispatcher_includes", @@ -57,7 +57,7 @@ envoy_cc_fuzz_test( name = "proxy_protocol_fuzz_test", srcs = ["proxy_protocol_fuzz_test.cc"], corpus = "proxy_protocol_corpus", - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":proxy_protocol_fuzz_test_proto_cc_proto", "//source/extensions/filters/listener/proxy_protocol:proxy_protocol_lib", @@ -76,7 +76,7 @@ envoy_extension_cc_test( size = "large", srcs = ["proxy_proto_integration_test.cc"], extension_names = ["envoy.filters.listener.proxy_protocol"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":proxy_proto_integration_test_lib", "//source/common/buffer:buffer_lib", diff --git a/test/extensions/filters/listener/tls_inspector/BUILD b/test/extensions/filters/listener/tls_inspector/BUILD index 17a3b3475c..f79f6a904a 100644 --- a/test/extensions/filters/listener/tls_inspector/BUILD +++ b/test/extensions/filters/listener/tls_inspector/BUILD @@ -19,7 +19,7 @@ envoy_package() envoy_cc_test( name = "tls_inspector_test", srcs = ["tls_inspector_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":tls_utility_lib", "//source/common/http:utility_lib", @@ -48,7 +48,7 @@ envoy_cc_fuzz_test( name = "tls_inspector_fuzz_test", srcs = ["tls_inspector_fuzz_test.cc"], corpus = "tls_inspector_corpus", - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":tls_inspector_fuzz_test_proto_cc_proto", "//source/extensions/filters/listener/tls_inspector:tls_inspector_lib", @@ -63,7 +63,7 @@ envoy_extension_cc_benchmark_binary( external_deps = [ "benchmark", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":tls_utility_lib", "//source/common/http:utility_lib", @@ -102,7 +102,7 @@ envoy_cc_test( data = [ "//test/config/integration/certs", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/config:api_version_lib", "//source/common/event:dispatcher_includes", diff --git a/test/extensions/filters/network/common/fuzz/BUILD b/test/extensions/filters/network/common/fuzz/BUILD index 97d15b8b07..7f1e0277fe 100644 --- a/test/extensions/filters/network/common/fuzz/BUILD +++ b/test/extensions/filters/network/common/fuzz/BUILD @@ -68,7 +68,7 @@ envoy_cc_test_library( "uber_readfilter.cc", ], hdrs = ["uber_readfilter.h"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":network_readfilter_fuzz_proto_cc_proto", "//source/common/config:utility_lib", @@ -90,7 +90,7 @@ envoy_cc_fuzz_test( srcs = ["network_readfilter_fuzz_test.cc"], corpus = "network_readfilter_corpus", dictionaries = ["network_readfilter_fuzz_test.dict"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":uber_readfilter_lib", ":vig_anymap_ext_lib", @@ -120,7 +120,7 @@ envoy_cc_test_library( "uber_writefilter.cc", ], hdrs = ["uber_writefilter.h"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":network_writefilter_fuzz_proto_cc_proto", "//source/common/config:utility_lib", @@ -135,7 +135,7 @@ envoy_cc_fuzz_test( name = "network_writefilter_fuzz_test", srcs = ["network_writefilter_fuzz_test.cc"], corpus = "network_writefilter_corpus", - rbe_pool = "2core", + rbe_pool = "6gig", # All Envoy network filters must be linked to the test in order for the fuzzer to pick # these up via the NamedNetworkFilterConfigFactory. deps = [ diff --git a/test/extensions/filters/network/common/redis/BUILD b/test/extensions/filters/network/common/redis/BUILD index 57d97d5e47..6c22955d84 100644 --- a/test/extensions/filters/network/common/redis/BUILD +++ b/test/extensions/filters/network/common/redis/BUILD @@ -34,7 +34,7 @@ envoy_cc_test_library( envoy_cc_test( name = "codec_impl_test", srcs = ["codec_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":redis_mocks", "//source/common/buffer:buffer_lib", @@ -47,7 +47,7 @@ envoy_cc_test( envoy_cc_test( name = "client_impl_test", srcs = ["client_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":redis_mocks", ":test_utils_lib", @@ -67,7 +67,7 @@ envoy_cc_test( envoy_cc_test( name = "fault_test", srcs = ["fault_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":redis_mocks", "//source/common/common:assert_lib", diff --git a/test/extensions/filters/network/connection_limit/BUILD b/test/extensions/filters/network/connection_limit/BUILD index 3eb9888d29..54545f1f87 100644 --- a/test/extensions/filters/network/connection_limit/BUILD +++ b/test/extensions/filters/network/connection_limit/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "connection_limit_test", srcs = ["connection_limit_test.cc"], extension_names = ["envoy.filters.network.connection_limit"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/network/connection_limit:connection_limit_lib", "//test/mocks/event:event_mocks", @@ -30,7 +30,7 @@ envoy_extension_cc_test( size = "large", srcs = ["connection_limit_integration_test.cc"], extension_names = ["envoy.filters.network.connection_limit"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/network/connection_limit:config", "//source/extensions/filters/network/tcp_proxy:config", diff --git a/test/extensions/filters/network/direct_response/BUILD b/test/extensions/filters/network/direct_response/BUILD index 60a46d7fc7..e8631fb750 100644 --- a/test/extensions/filters/network/direct_response/BUILD +++ b/test/extensions/filters/network/direct_response/BUILD @@ -18,7 +18,7 @@ envoy_extension_cc_test( "direct_response_integration_test.cc", ], extension_names = ["envoy.filters.network.direct_response"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/network/direct_response:config", "//test/integration:integration_lib", @@ -30,7 +30,7 @@ envoy_extension_cc_test( name = "direct_response_test", srcs = ["direct_response_test.cc"], extension_names = ["envoy.filters.network.direct_response"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/network/direct_response:filter", "//test/mocks/api:api_mocks", diff --git a/test/extensions/filters/network/dubbo_proxy/BUILD b/test/extensions/filters/network/dubbo_proxy/BUILD index 8350d7b230..dc2e6e2a1f 100644 --- a/test/extensions/filters/network/dubbo_proxy/BUILD +++ b/test/extensions/filters/network/dubbo_proxy/BUILD @@ -17,7 +17,7 @@ envoy_cc_mock( name = "mocks_lib", srcs = ["mocks.cc"], hdrs = ["mocks.h"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/protobuf", "//source/common/protobuf:utility_lib", @@ -47,7 +47,7 @@ envoy_extension_cc_test( name = "hessian_utils_test", srcs = ["hessian_utils_test.cc"], extension_names = ["envoy.filters.network.dubbo_proxy"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/buffer:buffer_lib", "//source/common/common:byte_order_lib", @@ -61,7 +61,7 @@ envoy_extension_cc_test( name = "message_impl_test", srcs = ["message_impl_test.cc"], extension_names = ["envoy.filters.network.dubbo_proxy"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/network/dubbo_proxy:message_lib", "//test/test_common:printers_lib", @@ -73,7 +73,7 @@ envoy_extension_cc_test( name = "dubbo_protocol_impl_test", srcs = ["dubbo_protocol_impl_test.cc"], extension_names = ["envoy.filters.network.dubbo_proxy"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":mocks_lib", ":utility_lib", @@ -86,7 +86,7 @@ envoy_extension_cc_test( name = "dubbo_hessian2_serializer_impl_test", srcs = ["dubbo_hessian2_serializer_impl_test.cc"], extension_names = ["envoy.filters.network.dubbo_proxy"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":mocks_lib", ":utility_lib", @@ -100,7 +100,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.filters.network.dubbo_proxy"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":mocks_lib", ":utility_lib", @@ -117,7 +117,7 @@ envoy_extension_cc_test( name = "metadata_test", srcs = ["metadata_test.cc"], extension_names = ["envoy.filters.network.dubbo_proxy"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/network/dubbo_proxy:metadata_lib", "//source/extensions/filters/network/dubbo_proxy:serializer_interface", @@ -128,7 +128,7 @@ envoy_extension_cc_test( name = "route_matcher_test", srcs = ["route_matcher_test.cc"], extension_names = ["envoy.filters.network.dubbo_proxy"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/network/dubbo_proxy:metadata_lib", "//source/extensions/filters/network/dubbo_proxy/router:route_matcher", @@ -141,7 +141,7 @@ envoy_extension_cc_test( name = "router_test", srcs = ["router_test.cc"], extension_names = ["envoy.filters.network.dubbo_proxy"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":mocks_lib", ":utility_lib", @@ -159,7 +159,7 @@ envoy_extension_cc_test( name = "app_exception_test", srcs = ["app_exception_test.cc"], extension_names = ["envoy.filters.network.dubbo_proxy"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":mocks_lib", ":utility_lib", @@ -175,7 +175,7 @@ envoy_extension_cc_test( name = "heartbeat_response_test", srcs = ["heartbeat_response_test.cc"], extension_names = ["envoy.filters.network.dubbo_proxy"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":mocks_lib", ":utility_lib", @@ -190,7 +190,7 @@ envoy_extension_cc_test( name = "router_filter_config_test", srcs = ["router_filter_config_test.cc"], extension_names = ["envoy.filters.network.dubbo_proxy"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":mocks_lib", "//source/extensions/filters/network/dubbo_proxy/router:config", @@ -203,7 +203,7 @@ envoy_extension_cc_test( name = "decoder_test", srcs = ["decoder_test.cc"], extension_names = ["envoy.filters.network.dubbo_proxy"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":mocks_lib", ":utility_lib", @@ -216,7 +216,7 @@ envoy_extension_cc_test( name = "conn_manager_test", srcs = ["conn_manager_test.cc"], extension_names = ["envoy.filters.network.dubbo_proxy"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":mocks_lib", ":utility_lib", diff --git a/test/extensions/filters/network/echo/BUILD b/test/extensions/filters/network/echo/BUILD index dd8fa642a3..8b7a454b64 100644 --- a/test/extensions/filters/network/echo/BUILD +++ b/test/extensions/filters/network/echo/BUILD @@ -13,7 +13,7 @@ envoy_cc_test( srcs = [ "echo_integration_test.cc", ], - rbe_pool = "2core", + rbe_pool = "6gig", tags = [ # Uncomment this line to run this test repeatedly in exclusive mode if not using docker-sandbox, # or RBE, see comments in AddRemoveListener. diff --git a/test/extensions/filters/network/ext_authz/BUILD b/test/extensions/filters/network/ext_authz/BUILD index 373c1f1df1..d5c3c37a91 100644 --- a/test/extensions/filters/network/ext_authz/BUILD +++ b/test/extensions/filters/network/ext_authz/BUILD @@ -17,7 +17,7 @@ envoy_extension_cc_test( name = "ext_authz_test", srcs = ["ext_authz_test.cc"], extension_names = ["envoy.filters.network.ext_authz"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/buffer:buffer_lib", "//source/common/event:dispatcher_lib", @@ -40,7 +40,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.filters.network.ext_authz"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/network/ext_authz:config", "//test/mocks/server:factory_context_mocks", @@ -61,7 +61,7 @@ envoy_cc_fuzz_test( name = "ext_authz_fuzz_test", srcs = ["ext_authz_fuzz_test.cc"], corpus = "ext_authz_corpus", - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":ext_authz_fuzz_proto_cc_proto", "//source/common/buffer:buffer_lib", diff --git a/test/extensions/filters/network/http_connection_manager/BUILD b/test/extensions/filters/network/http_connection_manager/BUILD index f5a46fc9cd..dfa89c0bd0 100644 --- a/test/extensions/filters/network/http_connection_manager/BUILD +++ b/test/extensions/filters/network/http_connection_manager/BUILD @@ -44,7 +44,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.filters.network.http_connection_manager"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":config_cc_proto", ":config_test_base", @@ -72,7 +72,7 @@ envoy_extension_cc_test( name = "config_filter_chain_test", srcs = ["config_filter_chain_test.cc"], extension_names = ["envoy.filters.network.http_connection_manager"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":config_cc_proto", ":config_test_base", @@ -84,7 +84,7 @@ envoy_extension_cc_test( name = "config_filter_dependencies_test", srcs = ["config_filter_dependencies_test.cc"], extension_names = ["envoy.filters.network.http_connection_manager"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":config_cc_proto", ":config_test_base", diff --git a/test/extensions/filters/network/local_ratelimit/BUILD b/test/extensions/filters/network/local_ratelimit/BUILD index 25d160adae..aa8d7bbeff 100644 --- a/test/extensions/filters/network/local_ratelimit/BUILD +++ b/test/extensions/filters/network/local_ratelimit/BUILD @@ -17,7 +17,7 @@ envoy_extension_cc_test( name = "local_ratelimit_test", srcs = ["local_ratelimit_test.cc"], extension_names = ["envoy.filters.network.local_ratelimit"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/singleton:manager_impl_lib", "//source/extensions/filters/network/local_ratelimit:local_ratelimit_lib", @@ -33,7 +33,7 @@ envoy_extension_cc_test( size = "large", srcs = ["local_ratelimit_integration_test.cc"], extension_names = ["envoy.filters.network.local_ratelimit"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = [ "cpu:3", ], @@ -56,7 +56,7 @@ envoy_cc_fuzz_test( name = "local_ratelimit_fuzz_test", srcs = ["local_ratelimit_fuzz_test.cc"], corpus = "local_ratelimit_corpus", - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":local_ratelimit_fuzz_proto_cc_proto", "//source/common/buffer:buffer_lib", diff --git a/test/extensions/filters/network/mongo_proxy/BUILD b/test/extensions/filters/network/mongo_proxy/BUILD index a403aac77e..af61f148d5 100644 --- a/test/extensions/filters/network/mongo_proxy/BUILD +++ b/test/extensions/filters/network/mongo_proxy/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "bson_impl_test", srcs = ["bson_impl_test.cc"], extension_names = ["envoy.filters.network.mongo_proxy"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/buffer:buffer_lib", "//source/extensions/filters/network/mongo_proxy:bson_lib", @@ -26,7 +26,7 @@ envoy_extension_cc_test( name = "codec_impl_test", srcs = ["codec_impl_test.cc"], extension_names = ["envoy.filters.network.mongo_proxy"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/buffer:buffer_lib", "//source/common/json:json_loader_lib", @@ -39,7 +39,7 @@ envoy_extension_cc_test( name = "proxy_test", srcs = ["proxy_test.cc"], extension_names = ["envoy.filters.network.mongo_proxy"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/event:dispatcher_lib", "//source/common/stats:stats_lib", @@ -61,7 +61,7 @@ envoy_extension_cc_test( name = "utility_test", srcs = ["utility_test.cc"], extension_names = ["envoy.filters.network.mongo_proxy"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/network/mongo_proxy:bson_lib", "//source/extensions/filters/network/mongo_proxy:codec_lib", @@ -73,7 +73,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.filters.network.mongo_proxy"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/network/mongo_proxy:config", "//test/mocks/server:factory_context_mocks", diff --git a/test/extensions/filters/network/ratelimit/BUILD b/test/extensions/filters/network/ratelimit/BUILD index ab8fe6b91c..fc78078a1f 100644 --- a/test/extensions/filters/network/ratelimit/BUILD +++ b/test/extensions/filters/network/ratelimit/BUILD @@ -18,7 +18,7 @@ envoy_extension_cc_test( "envoy.filters.network.ratelimit", "envoy.filters.network.tcp_proxy", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/buffer:buffer_lib", "//source/common/event:dispatcher_lib", @@ -42,7 +42,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.filters.network.ratelimit"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/network/ratelimit:config", "//test/mocks/server:factory_context_mocks", diff --git a/test/extensions/filters/network/rbac/BUILD b/test/extensions/filters/network/rbac/BUILD index b8a4c8a2d4..958f41682a 100644 --- a/test/extensions/filters/network/rbac/BUILD +++ b/test/extensions/filters/network/rbac/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.filters.network.rbac"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["skip_on_windows"], deps = [ "//source/extensions/filters/network/rbac:config", @@ -29,7 +29,7 @@ envoy_extension_cc_test( name = "filter_test", srcs = ["filter_test.cc"], extension_names = ["envoy.filters.network.rbac"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["skip_on_windows"], deps = [ "//source/extensions/filters/common/rbac:utility_lib", @@ -49,7 +49,7 @@ envoy_extension_cc_test( size = "large", srcs = ["integration_test.cc"], extension_names = ["envoy.filters.network.rbac"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["skip_on_windows"], deps = [ "//source/extensions/filters/network/echo:config", diff --git a/test/extensions/filters/network/redis_proxy/BUILD b/test/extensions/filters/network/redis_proxy/BUILD index 966bf37c38..5ce18070ca 100644 --- a/test/extensions/filters/network/redis_proxy/BUILD +++ b/test/extensions/filters/network/redis_proxy/BUILD @@ -40,7 +40,7 @@ envoy_extension_cc_test( name = "conn_pool_impl_test", srcs = ["conn_pool_impl_test.cc"], extension_names = ["envoy.filters.network.redis_proxy"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":redis_mocks", "//source/common/event:dispatcher_lib", @@ -75,7 +75,7 @@ envoy_extension_cc_test( name = "proxy_filter_test", srcs = ["proxy_filter_test.cc"], extension_names = ["envoy.filters.network.redis_proxy"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":redis_mocks", "//source/common/event:dispatcher_lib", @@ -112,7 +112,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.filters.network.redis_proxy"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/protobuf:utility_lib", "//source/extensions/filters/network/redis_proxy:config", @@ -128,7 +128,7 @@ envoy_extension_cc_benchmark_binary( external_deps = [ "benchmark", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":redis_mocks", "//source/common/stats:isolated_store_lib", @@ -151,7 +151,7 @@ envoy_extension_cc_test( name = "router_impl_test", srcs = ["router_impl_test.cc"], extension_names = ["envoy.filters.network.redis_proxy"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":redis_mocks", "//source/common/router:string_accessor_lib", @@ -171,7 +171,7 @@ envoy_extension_cc_test( size = "large", srcs = ["redis_proxy_integration_test.cc"], extension_names = ["envoy.filters.network.redis_proxy"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/network/common/redis:fault_lib", "//source/extensions/filters/network/redis_proxy:config", @@ -186,7 +186,7 @@ envoy_extension_cc_benchmark_binary( external_deps = [ "benchmark", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":redis_mocks", "//source/common/stats:isolated_store_lib", diff --git a/test/extensions/filters/network/set_filter_state/BUILD b/test/extensions/filters/network/set_filter_state/BUILD index 9860c8a41e..175a94ef5e 100644 --- a/test/extensions/filters/network/set_filter_state/BUILD +++ b/test/extensions/filters/network/set_filter_state/BUILD @@ -17,7 +17,7 @@ envoy_extension_cc_test( "integration_test.cc", ], extension_names = ["envoy.filters.network.set_filter_state"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/router:string_accessor_lib", "//source/extensions/filters/network/echo:config", diff --git a/test/extensions/filters/network/sni_cluster/BUILD b/test/extensions/filters/network/sni_cluster/BUILD index 4393895fc2..6b0c42c965 100644 --- a/test/extensions/filters/network/sni_cluster/BUILD +++ b/test/extensions/filters/network/sni_cluster/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "sni_cluster_test", srcs = ["sni_cluster_test.cc"], extension_names = ["envoy.filters.network.sni_cluster"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/network/sni_cluster", "//source/extensions/filters/network/sni_cluster:config", diff --git a/test/extensions/filters/network/sni_dynamic_forward_proxy/BUILD b/test/extensions/filters/network/sni_dynamic_forward_proxy/BUILD index b8e4565f1b..7955f5267b 100644 --- a/test/extensions/filters/network/sni_dynamic_forward_proxy/BUILD +++ b/test/extensions/filters/network/sni_dynamic_forward_proxy/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "proxy_filter_test", srcs = ["proxy_filter_test.cc"], extension_names = ["envoy.filters.network.sni_dynamic_forward_proxy"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/router:string_accessor_lib", "//source/common/stream_info:uint32_accessor_lib", @@ -37,7 +37,7 @@ envoy_extension_cc_test( "//test/config/integration/certs", ], extension_names = ["envoy.filters.network.sni_dynamic_forward_proxy"], - rbe_pool = "2core", + rbe_pool = "6gig", # TODO(envoyproxy/windows-dev): Diagnose failure shown only on clang-cl build, see: # https://gist.github.com/wrowe/12b0b7579791c541c789c98563999a2e tags = ["fails_on_clang_cl"], diff --git a/test/extensions/filters/network/tcp_proxy/BUILD b/test/extensions/filters/network/tcp_proxy/BUILD index 95405de2fb..de7bdd7289 100644 --- a/test/extensions/filters/network/tcp_proxy/BUILD +++ b/test/extensions/filters/network/tcp_proxy/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.filters.network.tcp_proxy"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/network/tcp_proxy:config", "//test/mocks/server:factory_context_mocks", diff --git a/test/extensions/filters/network/thrift_proxy/BUILD b/test/extensions/filters/network/thrift_proxy/BUILD index 29e20478af..e139799f02 100644 --- a/test/extensions/filters/network/thrift_proxy/BUILD +++ b/test/extensions/filters/network/thrift_proxy/BUILD @@ -18,7 +18,7 @@ envoy_extension_cc_mock( srcs = ["mocks.cc"], hdrs = ["mocks.h"], extension_names = ["envoy.filters.network.thrift_proxy"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/network/thrift_proxy:conn_manager_lib", "//source/extensions/filters/network/thrift_proxy:protocol_interface", @@ -39,7 +39,7 @@ envoy_extension_cc_test_library( srcs = ["integration.cc"], hdrs = ["integration.h"], extension_names = ["envoy.filters.network.thrift_proxy"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/network/thrift_proxy:config", "//source/extensions/filters/network/thrift_proxy:conn_manager_lib", @@ -67,7 +67,7 @@ envoy_extension_cc_test( name = "app_exception_impl_test", srcs = ["app_exception_impl_test.cc"], extension_names = ["envoy.filters.network.thrift_proxy"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":mocks", "//source/extensions/filters/network/thrift_proxy:app_exception_lib", @@ -80,7 +80,7 @@ envoy_extension_cc_test( name = "buffer_helper_test", srcs = ["buffer_helper_test.cc"], extension_names = ["envoy.filters.network.thrift_proxy"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":utility_lib", "//source/extensions/filters/network/thrift_proxy:buffer_helper_lib", @@ -93,7 +93,7 @@ envoy_extension_cc_test( name = "conn_state_test", srcs = ["conn_state_test.cc"], extension_names = ["envoy.filters.network.thrift_proxy"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/network/thrift_proxy:conn_state_lib", "//test/test_common:printers_lib", @@ -105,7 +105,7 @@ envoy_extension_cc_test( name = "auto_transport_impl_test", srcs = ["auto_transport_impl_test.cc"], extension_names = ["envoy.filters.network.thrift_proxy"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":mocks", ":utility_lib", @@ -119,7 +119,7 @@ envoy_extension_cc_test( name = "framed_transport_impl_test", srcs = ["framed_transport_impl_test.cc"], extension_names = ["envoy.filters.network.thrift_proxy"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":mocks", ":utility_lib", @@ -133,7 +133,7 @@ envoy_extension_cc_test( name = "header_transport_impl_test", srcs = ["header_transport_impl_test.cc"], extension_names = ["envoy.filters.network.thrift_proxy"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":mocks", ":utility_lib", @@ -148,7 +148,7 @@ envoy_extension_cc_test( name = "unframed_transport_impl_test", srcs = ["unframed_transport_impl_test.cc"], extension_names = ["envoy.filters.network.thrift_proxy"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":mocks", ":utility_lib", @@ -162,7 +162,7 @@ envoy_extension_cc_test( name = "auto_protocol_impl_test", srcs = ["auto_protocol_impl_test.cc"], extension_names = ["envoy.filters.network.thrift_proxy"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":mocks", ":utility_lib", @@ -176,7 +176,7 @@ envoy_extension_cc_test( name = "binary_protocol_impl_test", srcs = ["binary_protocol_impl_test.cc"], extension_names = ["envoy.filters.network.thrift_proxy"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":mocks", ":utility_lib", @@ -191,7 +191,7 @@ envoy_extension_cc_test( name = "compact_protocol_impl_test", srcs = ["compact_protocol_impl_test.cc"], extension_names = ["envoy.filters.network.thrift_proxy"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":mocks", ":utility_lib", @@ -206,7 +206,7 @@ envoy_extension_cc_test( name = "twitter_protocol_impl_test", srcs = ["twitter_protocol_impl_test.cc"], extension_names = ["envoy.filters.network.thrift_proxy"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":mocks", ":utility_lib", @@ -221,7 +221,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.filters.network.thrift_proxy"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":mocks", "//source/extensions/filters/network/thrift_proxy:config", @@ -238,7 +238,7 @@ envoy_extension_cc_test( name = "conn_manager_test", srcs = ["conn_manager_test.cc"], extension_names = ["envoy.filters.network.thrift_proxy"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":mocks", ":utility_lib", @@ -260,7 +260,7 @@ envoy_extension_cc_test( name = "decoder_test", srcs = ["decoder_test.cc"], extension_names = ["envoy.filters.network.thrift_proxy"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":mocks", ":utility_lib", @@ -275,7 +275,7 @@ envoy_extension_cc_test( name = "metadata_test", srcs = ["metadata_test.cc"], extension_names = ["envoy.filters.network.thrift_proxy"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/network/thrift_proxy:metadata_lib", "//test/test_common:printers_lib", @@ -287,7 +287,7 @@ envoy_extension_cc_test( name = "router_test", srcs = ["router_test.cc"], extension_names = ["envoy.filters.network.thrift_proxy"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":mocks", ":utility_lib", @@ -311,7 +311,7 @@ envoy_extension_cc_test( name = "router_ratelimit_test", srcs = ["router_ratelimit_test.cc"], extension_names = ["envoy.filters.network.thrift_proxy"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":mocks", ":utility_lib", @@ -332,7 +332,7 @@ envoy_extension_cc_test( name = "route_matcher_test", srcs = ["route_matcher_test.cc"], extension_names = ["envoy.filters.network.thrift_proxy"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":utility_lib", "//source/extensions/filters/network/thrift_proxy/router:config", @@ -349,7 +349,7 @@ envoy_extension_cc_test( name = "thrift_object_impl_test", srcs = ["thrift_object_impl_test.cc"], extension_names = ["envoy.filters.network.thrift_proxy"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":mocks", ":utility_lib", @@ -367,7 +367,7 @@ envoy_extension_cc_test( "//test/extensions/filters/network/thrift_proxy/driver:generate_fixture", ], extension_names = ["envoy.filters.network.thrift_proxy"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["skip_on_windows"], deps = [ ":integration_lib", @@ -386,7 +386,7 @@ envoy_extension_cc_test( "//test/extensions/filters/network/thrift_proxy/driver:generate_fixture", ], extension_names = ["envoy.filters.network.thrift_proxy"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":integration_lib", ":utility_lib", @@ -401,7 +401,7 @@ envoy_extension_cc_test( name = "shadow_writer_test", srcs = ["shadow_writer_test.cc"], extension_names = ["envoy.filters.network.thrift_proxy"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":mocks", ":utility_lib", @@ -426,7 +426,7 @@ envoy_extension_cc_test( "//test/extensions/filters/network/thrift_proxy/driver:generate_fixture", ], extension_names = ["envoy.filters.network.thrift_proxy"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":integration_lib", "//test/test_common:network_utility_lib", diff --git a/test/extensions/filters/network/thrift_proxy/filters/BUILD b/test/extensions/filters/network/thrift_proxy/filters/BUILD index fbca1ec6b5..57b8d91f86 100644 --- a/test/extensions/filters/network/thrift_proxy/filters/BUILD +++ b/test/extensions/filters/network/thrift_proxy/filters/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "pass_through_filter_test", srcs = ["pass_through_filter_test.cc"], extension_names = ["envoy.filters.network.thrift_proxy"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/network/thrift_proxy/filters:pass_through_filter_lib", "//test/extensions/filters/network/thrift_proxy:mocks", diff --git a/test/extensions/filters/network/thrift_proxy/filters/header_to_metadata/BUILD b/test/extensions/filters/network/thrift_proxy/filters/header_to_metadata/BUILD index c056b6f299..0814b7053d 100644 --- a/test/extensions/filters/network/thrift_proxy/filters/header_to_metadata/BUILD +++ b/test/extensions/filters/network/thrift_proxy/filters/header_to_metadata/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.filters.thrift.header_to_metadata"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/network/thrift_proxy/filters/header_to_metadata:config", "//source/extensions/filters/network/thrift_proxy/filters/header_to_metadata:header_to_metadata_filter_lib", @@ -29,7 +29,7 @@ envoy_extension_cc_test( name = "header_to_metadata_filter_test", srcs = ["header_to_metadata_filter_test.cc"], extension_names = ["envoy.filters.thrift.header_to_metadata"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/network/thrift_proxy/filters/header_to_metadata:header_to_metadata_filter_lib", "//test/extensions/filters/network/thrift_proxy:mocks", diff --git a/test/extensions/filters/network/thrift_proxy/filters/payload_to_metadata/BUILD b/test/extensions/filters/network/thrift_proxy/filters/payload_to_metadata/BUILD index fef1d287d8..3159ac46e9 100644 --- a/test/extensions/filters/network/thrift_proxy/filters/payload_to_metadata/BUILD +++ b/test/extensions/filters/network/thrift_proxy/filters/payload_to_metadata/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.filters.thrift.payload_to_metadata"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/network/thrift_proxy/filters/payload_to_metadata:config", "//source/extensions/filters/network/thrift_proxy/filters/payload_to_metadata:payload_to_metadata_filter_lib", @@ -29,7 +29,7 @@ envoy_extension_cc_test( name = "payload_to_metadata_filter_test", srcs = ["payload_to_metadata_filter_test.cc"], extension_names = ["envoy.filters.thrift.payload_to_metadata"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/network/thrift_proxy/filters/payload_to_metadata:payload_to_metadata_filter_lib", "//test/extensions/filters/network/thrift_proxy:mocks", diff --git a/test/extensions/filters/network/thrift_proxy/filters/ratelimit/BUILD b/test/extensions/filters/network/thrift_proxy/filters/ratelimit/BUILD index 77af483108..557390a3c5 100644 --- a/test/extensions/filters/network/thrift_proxy/filters/ratelimit/BUILD +++ b/test/extensions/filters/network/thrift_proxy/filters/ratelimit/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "ratelimit_test", srcs = ["ratelimit_test.cc"], extension_names = ["envoy.filters.thrift.rate_limit"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/buffer:buffer_lib", "//source/common/common:empty_string", @@ -36,7 +36,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.filters.thrift.rate_limit"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/network/thrift_proxy/filters/ratelimit:config", "//test/extensions/filters/network/thrift_proxy:mocks", diff --git a/test/extensions/filters/network/wasm/BUILD b/test/extensions/filters/network/wasm/BUILD index 43b61fc821..ad56dd8ec8 100644 --- a/test/extensions/filters/network/wasm/BUILD +++ b/test/extensions/filters/network/wasm/BUILD @@ -24,7 +24,7 @@ envoy_extension_cc_test( "//test/extensions/filters/network/wasm/test_data:test_cpp.wasm", ]), extension_names = ["envoy.filters.network.wasm"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["skip_on_windows"], deps = [ "//source/common/common:base64_lib", @@ -53,7 +53,7 @@ envoy_extension_cc_test( "//test/extensions/filters/network/wasm/test_data:resume_call_rust.wasm", ]), extension_names = ["envoy.filters.network.wasm"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["skip_on_windows"], deps = [ "//source/extensions/filters/network/wasm:wasm_filter_lib", diff --git a/test/extensions/filters/network/zookeeper_proxy/BUILD b/test/extensions/filters/network/zookeeper_proxy/BUILD index 3aa6c7733a..6ca309ec1b 100644 --- a/test/extensions/filters/network/zookeeper_proxy/BUILD +++ b/test/extensions/filters/network/zookeeper_proxy/BUILD @@ -17,7 +17,7 @@ envoy_extension_cc_test( "filter_test.cc", ], extension_names = ["envoy.filters.network.zookeeper_proxy"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/network/zookeeper_proxy:config", "//test/mocks/network:network_mocks", @@ -31,7 +31,7 @@ envoy_extension_cc_test( "config_test.cc", ], extension_names = ["envoy.filters.network.zookeeper_proxy"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/network/zookeeper_proxy:config", "//test/mocks/server:factory_context_mocks", diff --git a/test/extensions/filters/udp/dns_filter/BUILD b/test/extensions/filters/udp/dns_filter/BUILD index bcdfb761bd..d032779f09 100644 --- a/test/extensions/filters/udp/dns_filter/BUILD +++ b/test/extensions/filters/udp/dns_filter/BUILD @@ -32,7 +32,7 @@ envoy_extension_cc_test( name = "dns_filter_test", srcs = ["dns_filter_test.cc"], extension_names = ["envoy.filters.udp.dns_filter"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":dns_filter_test_lib", "//source/extensions/filters/udp/dns_filter:dns_filter_lib", @@ -51,7 +51,7 @@ envoy_extension_cc_test( size = "large", srcs = ["dns_filter_integration_test.cc"], extension_names = ["envoy.filters.udp.dns_filter"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":dns_filter_test_lib", "//source/extensions/filters/udp/dns_filter:config", @@ -65,7 +65,7 @@ envoy_extension_cc_test( name = "dns_filter_utils_test", srcs = ["dns_filter_utils_test.cc"], extension_names = ["envoy.filters.udp.dns_filter"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":dns_filter_test_lib", "//source/extensions/filters/udp/dns_filter:config", @@ -79,7 +79,7 @@ envoy_cc_fuzz_test( name = "dns_filter_fuzz_test", srcs = ["dns_filter_fuzz_test.cc"], corpus = "dns_filter_corpus", - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/udp/dns_filter:dns_filter_lib", "//test/fuzz:utility_lib", diff --git a/test/extensions/filters/udp/udp_proxy/BUILD b/test/extensions/filters/udp/udp_proxy/BUILD index f44e1ab6fa..efb8261e6a 100644 --- a/test/extensions/filters/udp/udp_proxy/BUILD +++ b/test/extensions/filters/udp/udp_proxy/BUILD @@ -17,7 +17,7 @@ envoy_extension_cc_mock( srcs = ["mocks.cc"], hdrs = ["mocks.h"], extension_names = ["envoy.filters.udp_listener.udp_proxy"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/udp/udp_proxy:udp_proxy_filter_lib", "//source/extensions/filters/udp/udp_proxy/session_filters:filter_interface", @@ -32,7 +32,7 @@ envoy_extension_cc_test( name = "udp_proxy_filter_test", srcs = ["udp_proxy_filter_test.cc"], extension_names = ["envoy.filters.udp_listener.udp_proxy"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":mocks", "//source/common/common:hash_lib", @@ -64,7 +64,7 @@ envoy_extension_cc_test( name = "hash_policy_impl_test", srcs = ["hash_policy_impl_test.cc"], extension_names = ["envoy.filters.udp_listener.udp_proxy"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/common:hash_lib", "//source/common/network:address_lib", @@ -77,7 +77,7 @@ envoy_extension_cc_test( name = "router_impl_test", srcs = ["router_impl_test.cc"], extension_names = ["envoy.filters.udp_listener.udp_proxy"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/network:address_lib", "//source/common/network:utility_lib", @@ -94,7 +94,7 @@ envoy_extension_cc_test( size = "large", srcs = ["udp_proxy_integration_test.cc"], extension_names = ["envoy.filters.udp_listener.udp_proxy"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/network:filter_interface", "//envoy/server:filter_config_interface", diff --git a/test/extensions/filters/udp/udp_proxy/session_filters/BUILD b/test/extensions/filters/udp/udp_proxy/session_filters/BUILD index 93773358e8..39d5ab9823 100644 --- a/test/extensions/filters/udp/udp_proxy/session_filters/BUILD +++ b/test/extensions/filters/udp/udp_proxy/session_filters/BUILD @@ -17,7 +17,7 @@ envoy_extension_cc_test( name = "pass_through_filter_test", srcs = ["pass_through_filter_test.cc"], extension_names = ["envoy.filters.udp_listener.udp_proxy"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/udp/udp_proxy/session_filters:pass_through_filter_lib", "//test/extensions/filters/udp/udp_proxy:mocks", diff --git a/test/extensions/filters/udp/udp_proxy/session_filters/dynamic_forward_proxy/BUILD b/test/extensions/filters/udp/udp_proxy/session_filters/dynamic_forward_proxy/BUILD index 31d3ed7705..fb0bd27745 100644 --- a/test/extensions/filters/udp/udp_proxy/session_filters/dynamic_forward_proxy/BUILD +++ b/test/extensions/filters/udp/udp_proxy/session_filters/dynamic_forward_proxy/BUILD @@ -37,7 +37,7 @@ envoy_extension_cc_test( name = "proxy_filter_test", srcs = ["proxy_filter_test.cc"], extension_names = ["envoy.filters.udp.session.dynamic_forward_proxy"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/router:string_accessor_lib", "//source/common/stream_info:uint32_accessor_lib", @@ -53,7 +53,7 @@ envoy_extension_cc_test( name = "dynamic_forward_proxy_filter_integration_test", srcs = ["proxy_filter_integration_test.cc"], extension_names = ["envoy.filters.udp.session.dynamic_forward_proxy"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":dfp_setter_filter_config_lib", ":dfp_setter_filter_proto_cc_proto", diff --git a/test/extensions/filters/udp/udp_proxy/session_filters/http_capsule/BUILD b/test/extensions/filters/udp/udp_proxy/session_filters/http_capsule/BUILD index 65f76a3525..1b948bd26e 100644 --- a/test/extensions/filters/udp/udp_proxy/session_filters/http_capsule/BUILD +++ b/test/extensions/filters/udp/udp_proxy/session_filters/http_capsule/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "http_capsule_filter_test", srcs = ["http_capsule_filter_test.cc"], extension_names = ["envoy.filters.udp.session.http_capsule"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/udp/udp_proxy/session_filters/http_capsule:config", "//test/extensions/filters/udp/udp_proxy:mocks", @@ -28,7 +28,7 @@ envoy_extension_cc_test( name = "http_capsule_integration_test", srcs = ["http_capsule_integration_test.cc"], extension_names = ["envoy.filters.udp.session.http_capsule"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/network:filter_interface", "//envoy/server:filter_config_interface", diff --git a/test/extensions/formatter/cel/BUILD b/test/extensions/formatter/cel/BUILD index b3cb54dfdc..7e253911c2 100644 --- a/test/extensions/formatter/cel/BUILD +++ b/test/extensions/formatter/cel/BUILD @@ -21,7 +21,7 @@ envoy_extension_cc_test( ], }), extension_names = ["envoy.formatter.cel"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["skip_on_windows"], deps = [ "//source/common/formatter:substitution_formatter_lib", diff --git a/test/extensions/formatter/metadata/BUILD b/test/extensions/formatter/metadata/BUILD index d6d9e6e9e4..abe2e490ac 100644 --- a/test/extensions/formatter/metadata/BUILD +++ b/test/extensions/formatter/metadata/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "metadata_test", srcs = ["metadata_test.cc"], extension_names = ["envoy.formatter.metadata"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/formatter:substitution_formatter_lib", "//source/common/json:json_loader_lib", diff --git a/test/extensions/formatter/req_without_query/BUILD b/test/extensions/formatter/req_without_query/BUILD index 0eff1eb420..54ffdb567b 100644 --- a/test/extensions/formatter/req_without_query/BUILD +++ b/test/extensions/formatter/req_without_query/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "req_without_query_test", srcs = ["req_without_query_test.cc"], extension_names = ["envoy.formatter.req_without_query"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/formatter:substitution_formatter_lib", "//source/common/json:json_loader_lib", diff --git a/test/extensions/geoip_providers/maxmind/BUILD b/test/extensions/geoip_providers/maxmind/BUILD index af6df3f0d1..912ebefa09 100644 --- a/test/extensions/geoip_providers/maxmind/BUILD +++ b/test/extensions/geoip_providers/maxmind/BUILD @@ -23,7 +23,7 @@ envoy_extension_cc_test( "//test/extensions/geoip_providers/maxmind/test_data:geolocation_databases", ], extension_names = ["envoy.geoip_providers.maxmind"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["skip_on_windows"], deps = [ "//source/extensions/geoip_providers/maxmind:config", @@ -45,7 +45,7 @@ envoy_extension_cc_test( "//test/extensions/geoip_providers/maxmind/test_data:geolocation_databases", ], extension_names = ["envoy.geoip_providers.maxmind"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["skip_on_windows"], deps = [ "//envoy/registry", diff --git a/test/extensions/grpc_credentials/aws_iam/BUILD b/test/extensions/grpc_credentials/aws_iam/BUILD index 31aea28868..39e2abd8bd 100644 --- a/test/extensions/grpc_credentials/aws_iam/BUILD +++ b/test/extensions/grpc_credentials/aws_iam/BUILD @@ -13,7 +13,7 @@ envoy_cc_test( name = "aws_iam_grpc_credentials_test", srcs = envoy_select_google_grpc(["aws_iam_grpc_credentials_test.cc"]), data = ["//test/config/integration/certs"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/grpc_credentials/aws_iam:config", "//test/common/grpc:grpc_client_integration_test_harness_lib", diff --git a/test/extensions/grpc_credentials/file_based_metadata/BUILD b/test/extensions/grpc_credentials/file_based_metadata/BUILD index a55e9ffe84..fa8fa23e0c 100644 --- a/test/extensions/grpc_credentials/file_based_metadata/BUILD +++ b/test/extensions/grpc_credentials/file_based_metadata/BUILD @@ -14,7 +14,7 @@ envoy_cc_test( size = "large", srcs = ["integration_test.cc"], data = ["//test/config/integration/certs"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/grpc_credentials/file_based_metadata:config", "//test/common/grpc:grpc_client_integration_test_harness_lib", diff --git a/test/extensions/health_check/event_sinks/file/BUILD b/test/extensions/health_check/event_sinks/file/BUILD index e7ea89d9e9..9a94fd5ab8 100644 --- a/test/extensions/health_check/event_sinks/file/BUILD +++ b/test/extensions/health_check/event_sinks/file/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "file_sink_impl_test", srcs = ["file_sink_impl_test.cc"], extension_names = ["envoy.health_check.event_sinks.file"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/health_check/event_sinks/file:file_sink_lib", "//test/mocks/access_log:access_log_mocks", diff --git a/test/extensions/health_checkers/redis/BUILD b/test/extensions/health_checkers/redis/BUILD index b3145a645a..f8d9191cb3 100644 --- a/test/extensions/health_checkers/redis/BUILD +++ b/test/extensions/health_checkers/redis/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "redis_test", srcs = ["redis_test.cc"], extension_names = ["envoy.health_checkers.redis"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/api:api_lib", "//source/extensions/health_checkers/redis", @@ -40,7 +40,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.health_checkers.redis"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/upstream:health_checker_lib", "//source/extensions/health_checkers/redis:config", diff --git a/test/extensions/health_checkers/thrift/BUILD b/test/extensions/health_checkers/thrift/BUILD index 2e499f34ae..1a94be7530 100644 --- a/test/extensions/health_checkers/thrift/BUILD +++ b/test/extensions/health_checkers/thrift/BUILD @@ -16,7 +16,7 @@ envoy_cc_mock( name = "thrift_mocks", srcs = ["mocks.cc"], hdrs = ["mocks.h"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/health_checkers/thrift:client_interface", "//test/mocks/network:connection_mocks", @@ -31,7 +31,7 @@ envoy_extension_cc_test( name = "client_impl_test", srcs = ["client_impl_test.cc"], extension_names = ["envoy.health_checkers.thrift"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":thrift_mocks", "//source/common/network:utility_lib", @@ -49,7 +49,7 @@ envoy_extension_cc_test( name = "thrift_test", srcs = ["thrift_test.cc"], extension_names = ["envoy.health_checkers.thrift"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":thrift_mocks", "//source/common/api:api_lib", @@ -71,7 +71,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.health_checkers.thrift"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/upstream:health_checker_lib", "//source/extensions/health_checkers/thrift:config", diff --git a/test/extensions/http/cache/file_system_http_cache/BUILD b/test/extensions/http/cache/file_system_http_cache/BUILD index 469dfd6047..4dcec9e977 100644 --- a/test/extensions/http/cache/file_system_http_cache/BUILD +++ b/test/extensions/http/cache/file_system_http_cache/BUILD @@ -12,7 +12,7 @@ envoy_extension_cc_test( name = "file_system_http_cache_test", srcs = ["file_system_http_cache_test.cc"], extension_names = ["envoy.extensions.http.cache.file_system_http_cache"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["skip_on_windows"], # async_files does not yet support Windows. deps = [ "//source/common/filesystem:directory_lib", @@ -30,7 +30,7 @@ envoy_extension_cc_test( envoy_cc_test( name = "cache_file_header_proto_util_test", srcs = ["cache_file_header_proto_util_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/http/cache/file_system_http_cache:cache_file_header_proto_util", ], @@ -39,7 +39,7 @@ envoy_cc_test( envoy_cc_test( name = "cache_file_fixed_block_test", srcs = ["cache_file_fixed_block_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/http/cache/file_system_http_cache:cache_file_fixed_block", ], diff --git a/test/extensions/http/cache/simple_http_cache/BUILD b/test/extensions/http/cache/simple_http_cache/BUILD index 07036b2cb7..58340ba981 100644 --- a/test/extensions/http/cache/simple_http_cache/BUILD +++ b/test/extensions/http/cache/simple_http_cache/BUILD @@ -12,7 +12,7 @@ envoy_extension_cc_test( name = "simple_http_cache_test", srcs = ["simple_http_cache_test.cc"], extension_names = ["envoy.extensions.http.cache.simple"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/cache:cache_entry_utils_lib", "//source/extensions/http/cache/simple_http_cache:config", diff --git a/test/extensions/http/credential_injector/generic/BUILD b/test/extensions/http/credential_injector/generic/BUILD index 1b0a3fa90e..c449fcad51 100644 --- a/test/extensions/http/credential_injector/generic/BUILD +++ b/test/extensions/http/credential_injector/generic/BUILD @@ -16,7 +16,7 @@ envoy_extension_cc_test( size = "large", srcs = ["credential_injector_integration_test.cc"], extension_names = ["envoy.filters.http.credential_injector"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/credential_injector:config", "//source/extensions/http/injected_credentials/generic:config", diff --git a/test/extensions/http/credential_injector/oauth2/BUILD b/test/extensions/http/credential_injector/oauth2/BUILD index 3b6c2f0ea0..24710b8abb 100644 --- a/test/extensions/http/credential_injector/oauth2/BUILD +++ b/test/extensions/http/credential_injector/oauth2/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.filters.http.credential_injector"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/http/injected_credentials/oauth2:config", "//test/mocks/server:factory_context_mocks", @@ -26,7 +26,7 @@ envoy_extension_cc_test( name = "token_provider_test", srcs = ["token_provider_test.cc"], extension_names = ["envoy.filters.http.credential_injector"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/http/injected_credentials/common:secret_reader_lib", "//source/extensions/http/injected_credentials/oauth2:token_provider_lib", @@ -41,7 +41,7 @@ envoy_extension_cc_test( name = "credential_injector_oauth_integration_test", srcs = ["credential_injector_oauth_integration_test.cc"], extension_names = ["envoy.filters.http.credential_injector"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/http/credential_injector:config", "//source/extensions/http/injected_credentials/oauth2:config", diff --git a/test/extensions/http/early_header_mutation/header_mutation/BUILD b/test/extensions/http/early_header_mutation/header_mutation/BUILD index 6bb9df4c7f..5939db642f 100644 --- a/test/extensions/http/early_header_mutation/header_mutation/BUILD +++ b/test/extensions/http/early_header_mutation/header_mutation/BUILD @@ -17,7 +17,7 @@ envoy_extension_cc_test( "header_mutation_test.cc", ], extension_names = ["envoy.http.early_header_mutation.header_mutation"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/http/early_header_mutation/header_mutation:header_mutation_lib", "//test/mocks/stream_info:stream_info_mocks", @@ -31,7 +31,7 @@ envoy_extension_cc_test( "config_test.cc", ], extension_names = ["envoy.http.early_header_mutation.header_mutation"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/registry", "//source/common/config:utility_lib", @@ -48,7 +48,7 @@ envoy_extension_cc_test( "header_mutation_integration_test.cc", ], extension_names = ["envoy.http.early_header_mutation.header_mutation"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/http/early_header_mutation/header_mutation:config", "//test/integration:http_integration_lib", diff --git a/test/extensions/http/header_formatters/preserve_case/BUILD b/test/extensions/http/header_formatters/preserve_case/BUILD index 9124965e88..93495a1a4c 100644 --- a/test/extensions/http/header_formatters/preserve_case/BUILD +++ b/test/extensions/http/header_formatters/preserve_case/BUILD @@ -17,7 +17,7 @@ envoy_extension_cc_test( "preserve_case_formatter_test.cc", ], extension_names = ["envoy.http.stateful_header_formatters.preserve_case"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/http/header_formatters/preserve_case:preserve_case_formatter", "//test/test_common:utility_lib", @@ -31,7 +31,7 @@ envoy_extension_cc_test( "preserve_case_formatter_integration_test.cc", ], extension_names = ["envoy.http.stateful_header_formatters.preserve_case"], - rbe_pool = "2core", + rbe_pool = "6gig", # Broken until bazel 5.0.0 fix to shorten resulting paths for SymInitialize() failure tags = ["skip_on_windows"], deps = [ @@ -50,7 +50,7 @@ envoy_extension_cc_test( "preserve_case_formatter_reason_phrase_integration_test.cc", ], extension_names = ["envoy.http.stateful_header_formatters.preserve_case"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/http/header_formatters/preserve_case:config", "//source/extensions/http/header_formatters/preserve_case:preserve_case_formatter", @@ -66,7 +66,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.http.stateful_header_formatters.preserve_case"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/registry", "//source/common/common:utility_lib", diff --git a/test/extensions/http/header_validators/envoy_default/BUILD b/test/extensions/http/header_validators/envoy_default/BUILD index 7361912cd1..7d5e9d001c 100644 --- a/test/extensions/http/header_validators/envoy_default/BUILD +++ b/test/extensions/http/header_validators/envoy_default/BUILD @@ -20,7 +20,7 @@ envoy_extension_cc_test( "base_header_validator_test.cc", ], extension_names = ["envoy.http.header_validators.envoy_default"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":header_validator_utils_lib", "//envoy/http:header_validator_errors", @@ -38,7 +38,7 @@ envoy_extension_cc_test( "http_common_validation_test.cc", ], extension_names = ["envoy.http.header_validators.envoy_default"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":header_validator_utils_lib", "//envoy/http:header_validator_errors", @@ -57,7 +57,7 @@ envoy_extension_cc_test( "http1_header_validator_test.cc", ], extension_names = ["envoy.http.header_validators.envoy_default"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":header_validator_utils_lib", "//envoy/http:header_validator_errors", @@ -74,7 +74,7 @@ envoy_extension_cc_test( "http2_header_validator_test.cc", ], extension_names = ["envoy.http.header_validators.envoy_default"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":header_validator_utils_lib", "//envoy/http:header_validator_errors", @@ -108,7 +108,7 @@ envoy_extension_cc_test( "header_validator_factory_test.cc", ], extension_names = ["envoy.http.header_validators.envoy_default"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/network:utility_lib", "//source/extensions/http/header_validators/envoy_default:config", @@ -125,7 +125,7 @@ envoy_extension_cc_test( "path_normalizer_test.cc", ], extension_names = ["envoy.http.header_validators.envoy_default"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/http/header_validators/envoy_default:path_normalizer", "//test/test_common:test_runtime_lib", @@ -137,7 +137,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.http.header_validators.envoy_default"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/registry", "//source/extensions/http/header_validators/envoy_default:config", @@ -159,7 +159,7 @@ envoy_cc_fuzz_test( name = "path_normalizer_fuzz_test", srcs = ["path_normalizer_fuzz_test.cc"], corpus = "path_normalizer_corpus", - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":path_normalizer_fuzz_proto_cc_proto", "//source/extensions/http/header_validators/envoy_default:http1_header_validator", diff --git a/test/extensions/http/original_ip_detection/custom_header/BUILD b/test/extensions/http/original_ip_detection/custom_header/BUILD index cdc4291b0e..75f194c3dd 100644 --- a/test/extensions/http/original_ip_detection/custom_header/BUILD +++ b/test/extensions/http/original_ip_detection/custom_header/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "custom_header_detection_test", srcs = ["custom_header_test.cc"], extension_names = ["envoy.http.original_ip_detection.custom_header"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/network:utility_lib", "//source/extensions/http/original_ip_detection/custom_header:custom_header_lib", @@ -28,7 +28,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.http.original_ip_detection.custom_header"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/registry", "//source/extensions/http/original_ip_detection/custom_header:config", diff --git a/test/extensions/http/original_ip_detection/xff/BUILD b/test/extensions/http/original_ip_detection/xff/BUILD index 7a9a470c3e..1f0183fd07 100644 --- a/test/extensions/http/original_ip_detection/xff/BUILD +++ b/test/extensions/http/original_ip_detection/xff/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "xff_detection_test", srcs = ["xff_test.cc"], extension_names = ["envoy.http.original_ip_detection.xff"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/http:utility_lib", "//source/extensions/http/original_ip_detection/xff:xff_lib", @@ -28,7 +28,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.http.original_ip_detection.xff"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/registry", "//source/extensions/http/original_ip_detection/xff:config", diff --git a/test/extensions/http/stateful_session/cookie/BUILD b/test/extensions/http/stateful_session/cookie/BUILD index 7ab465a038..9bface0708 100644 --- a/test/extensions/http/stateful_session/cookie/BUILD +++ b/test/extensions/http/stateful_session/cookie/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "cookie_test", srcs = ["cookie_test.cc"], extension_names = ["envoy.http.stateful_session.cookie"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/http:utility_lib", "//source/extensions/http/stateful_session/cookie:cookie_lib", @@ -29,7 +29,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.http.stateful_session.cookie"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/registry", "//source/extensions/http/stateful_session/cookie:config", diff --git a/test/extensions/http/stateful_session/header/BUILD b/test/extensions/http/stateful_session/header/BUILD index eb6bc51f29..5b0e2070e9 100644 --- a/test/extensions/http/stateful_session/header/BUILD +++ b/test/extensions/http/stateful_session/header/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "header_test", srcs = ["header_test.cc"], extension_names = ["envoy.http.stateful_session.header"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/http:utility_lib", "//source/extensions/http/stateful_session/header:header_lib", @@ -28,7 +28,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.http.stateful_session.header"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/registry", "//source/extensions/http/stateful_session/header:config", diff --git a/test/extensions/internal_redirect/BUILD b/test/extensions/internal_redirect/BUILD index 30f17ab347..d78e36b4ae 100644 --- a/test/extensions/internal_redirect/BUILD +++ b/test/extensions/internal_redirect/BUILD @@ -14,7 +14,7 @@ envoy_cc_test( srcs = [ "redirect_extension_integration_test.cc", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/http:header_map_lib", "//source/extensions/internal_redirect/allow_listed_routes:config", diff --git a/test/extensions/internal_redirect/previous_routes/BUILD b/test/extensions/internal_redirect/previous_routes/BUILD index bcb4cf911b..69e553fb92 100644 --- a/test/extensions/internal_redirect/previous_routes/BUILD +++ b/test/extensions/internal_redirect/previous_routes/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.internal_redirect_predicates.previous_routes"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/stream_info:filter_state_lib", "//source/extensions/internal_redirect/previous_routes:config", diff --git a/test/extensions/io_socket/user_space/BUILD b/test/extensions/io_socket/user_space/BUILD index 6d3ceb98ff..2f3fde2282 100644 --- a/test/extensions/io_socket/user_space/BUILD +++ b/test/extensions/io_socket/user_space/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "file_event_impl_test", srcs = ["file_event_impl_test.cc"], extension_names = ["envoy.io_socket.user_space"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/event:file_event_interface", "//source/common/event:dispatcher_includes", @@ -32,7 +32,7 @@ envoy_extension_cc_test( name = "io_handle_impl_test", srcs = ["io_handle_impl_test.cc"], extension_names = ["envoy.io_socket.user_space"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/common:utility_lib", "//source/common/network:address_lib", @@ -46,7 +46,7 @@ envoy_extension_cc_test( name = "connection_compatbility_test", srcs = ["connection_compatbility_test.cc"], extension_names = ["envoy.io_socket.user_space"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/buffer:buffer_lib", "//source/common/common:utility_lib", diff --git a/test/extensions/key_value/file_based/BUILD b/test/extensions/key_value/file_based/BUILD index 25b64c201a..6b553d7f42 100644 --- a/test/extensions/key_value/file_based/BUILD +++ b/test/extensions/key_value/file_based/BUILD @@ -11,7 +11,7 @@ envoy_package() envoy_cc_test( name = "alternate_protocols_cache_impl_test", srcs = ["alternate_protocols_cache_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/common:key_value_store_lib", "//source/common/http:http_server_properties_cache", @@ -30,7 +30,7 @@ envoy_cc_test( envoy_cc_test( name = "key_value_store_test", srcs = ["key_value_store_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/common:key_value_store_lib", "//source/extensions/key_value/file_based:config_lib", diff --git a/test/extensions/load_balancing_policies/cluster_provided/BUILD b/test/extensions/load_balancing_policies/cluster_provided/BUILD index 33fb56b539..ef527f5ab1 100644 --- a/test/extensions/load_balancing_policies/cluster_provided/BUILD +++ b/test/extensions/load_balancing_policies/cluster_provided/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.load_balancing_policies.cluster_provided"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/load_balancing_policies/cluster_provided:config", "//test/mocks/server:factory_context_mocks", @@ -30,7 +30,7 @@ envoy_extension_cc_test( size = "large", srcs = ["integration_test.cc"], extension_names = ["envoy.load_balancing_policies.cluster_provided"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/protobuf", "//source/extensions/clusters/original_dst:original_dst_cluster_lib", diff --git a/test/extensions/load_balancing_policies/common/BUILD b/test/extensions/load_balancing_policies/common/BUILD index ccef80f3a4..8cace63ce5 100644 --- a/test/extensions/load_balancing_policies/common/BUILD +++ b/test/extensions/load_balancing_policies/common/BUILD @@ -32,7 +32,7 @@ envoy_cc_test_library( envoy_cc_test( name = "bounded_load_hlb_test", srcs = ["bounded_load_hlb_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/upstream:upstream_includes", "//source/extensions/load_balancing_policies/common:thread_aware_lb_lib", @@ -46,7 +46,7 @@ envoy_cc_test_library( name = "load_balancer_fuzz_lib", srcs = ["load_balancer_fuzz_base.cc"], hdrs = ["load_balancer_fuzz_base.h"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":load_balancer_fuzz_proto_cc_proto", "//source/common/upstream:load_balancer_context_base_lib", @@ -122,7 +122,7 @@ envoy_cc_test_library( envoy_cc_test( name = "load_balancer_base_test", srcs = ["load_balancer_impl_base_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":load_balancer_base_test_lib", ], diff --git a/test/extensions/load_balancing_policies/least_request/BUILD b/test/extensions/load_balancing_policies/least_request/BUILD index 25a44e0973..1a5556539e 100644 --- a/test/extensions/load_balancing_policies/least_request/BUILD +++ b/test/extensions/load_balancing_policies/least_request/BUILD @@ -19,7 +19,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.load_balancing_policies.least_request"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/load_balancing_policies/least_request:config", "//test/mocks/server:factory_context_mocks", @@ -34,7 +34,7 @@ envoy_extension_cc_test( size = "large", srcs = ["integration_test.cc"], extension_names = ["envoy.load_balancing_policies.least_request"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/protobuf", "//source/extensions/load_balancing_policies/least_request:config", @@ -57,7 +57,7 @@ envoy_cc_fuzz_test( name = "least_request_load_balancer_fuzz_test", srcs = ["least_request_load_balancer_fuzz_test.cc"], corpus = "least_request_load_balancer_corpus", - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":least_request_load_balancer_fuzz_proto_cc_proto", "//source/extensions/load_balancing_policies/least_request:config", @@ -69,7 +69,7 @@ envoy_cc_fuzz_test( envoy_cc_benchmark_binary( name = "least_request_lb_benchmark", srcs = ["least_request_lb_benchmark.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/load_balancing_policies/least_request:least_request_lb_lib", "//test/extensions/load_balancing_policies/common:benchmark_base_tester_lib", @@ -86,7 +86,7 @@ envoy_extension_cc_test( name = "least_request_lb_test", srcs = ["least_request_lb_test.cc"], extension_names = ["envoy.load_balancing_policies.least_request"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/load_balancing_policies/least_request:least_request_lb_lib", "//test/extensions/load_balancing_policies/common:load_balancer_base_test_lib", @@ -97,7 +97,7 @@ envoy_extension_cc_test( name = "least_request_lb_simulation_test", srcs = ["least_request_lb_simulation_test.cc"], extension_names = ["envoy.load_balancing_policies.least_request"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/common:random_generator_lib", "//source/common/upstream:load_balancer_context_base_lib", diff --git a/test/extensions/load_balancing_policies/maglev/BUILD b/test/extensions/load_balancing_policies/maglev/BUILD index 49c7308ccd..ccea32d7e2 100644 --- a/test/extensions/load_balancing_policies/maglev/BUILD +++ b/test/extensions/load_balancing_policies/maglev/BUILD @@ -17,7 +17,7 @@ envoy_extension_cc_test( name = "maglev_lb_test", srcs = ["maglev_lb_test.cc"], extension_names = ["envoy.load_balancing_policies.maglev"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/load_balancing_policies/maglev:maglev_lb_lib", "//test/common/upstream:utility_lib", @@ -39,7 +39,7 @@ envoy_extension_cc_test( name = "maglev_lb_force_original_impl_test", srcs = ["maglev_lb_test.cc"], extension_names = ["envoy.load_balancing_policies.maglev"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/load_balancing_policies/maglev:maglev_lb_force_original_impl_lib", "//test/common/upstream:utility_lib", @@ -59,7 +59,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.load_balancing_policies.maglev"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/load_balancing_policies/maglev:config", "//test/mocks/server:factory_context_mocks", @@ -75,7 +75,7 @@ envoy_extension_cc_test( size = "large", srcs = ["integration_test.cc"], extension_names = ["envoy.load_balancing_policies.maglev"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/protobuf", "//source/extensions/load_balancing_policies/maglev:config", @@ -88,7 +88,7 @@ envoy_extension_cc_test( envoy_cc_benchmark_binary( name = "maglev_lb_benchmark", srcs = ["maglev_lb_benchmark.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/load_balancing_policies/maglev:maglev_lb_lib", "//test/extensions/load_balancing_policies/common:benchmark_base_tester_lib", diff --git a/test/extensions/load_balancing_policies/random/BUILD b/test/extensions/load_balancing_policies/random/BUILD index 47a1b26406..6dbf2627b5 100644 --- a/test/extensions/load_balancing_policies/random/BUILD +++ b/test/extensions/load_balancing_policies/random/BUILD @@ -19,7 +19,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.load_balancing_policies.random"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/load_balancing_policies/random:config", "//test/mocks/server:factory_context_mocks", @@ -34,7 +34,7 @@ envoy_extension_cc_test( size = "large", srcs = ["integration_test.cc"], extension_names = ["envoy.load_balancing_policies.random"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/protobuf", "//source/extensions/load_balancing_policies/random:config", @@ -56,7 +56,7 @@ envoy_cc_fuzz_test( name = "random_load_balancer_fuzz_test", srcs = ["random_load_balancer_fuzz_test.cc"], corpus = "random_load_balancer_corpus", - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":random_load_balancer_fuzz_proto_cc_proto", "//source/extensions/load_balancing_policies/random:config", @@ -68,7 +68,7 @@ envoy_cc_fuzz_test( envoy_cc_benchmark_binary( name = "random_lb_benchmark", srcs = ["random_lb_benchmark.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/load_balancing_policies/random:random_lb_lib", "//test/extensions/load_balancing_policies/common:benchmark_base_tester_lib", @@ -85,7 +85,7 @@ envoy_extension_cc_test( name = "random_lb_test", srcs = ["random_lb_test.cc"], extension_names = ["envoy.load_balancing_policies.random"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/load_balancing_policies/random:random_lb_lib", "//test/extensions/load_balancing_policies/common:load_balancer_base_test_lib", @@ -96,7 +96,7 @@ envoy_extension_cc_test( name = "random_lb_simulation_test", srcs = ["random_lb_simulation_test.cc"], extension_names = ["envoy.load_balancing_policies.random"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/common:random_generator_lib", "//source/common/upstream:load_balancer_context_base_lib", diff --git a/test/extensions/load_balancing_policies/ring_hash/BUILD b/test/extensions/load_balancing_policies/ring_hash/BUILD index 44aa918c0c..288a5cb158 100644 --- a/test/extensions/load_balancing_policies/ring_hash/BUILD +++ b/test/extensions/load_balancing_policies/ring_hash/BUILD @@ -17,7 +17,7 @@ envoy_extension_cc_test( name = "ring_hash_lb_test", srcs = ["ring_hash_lb_test.cc"], extension_names = ["envoy.load_balancing_policies.ring_hash"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/router:router_interface", "//source/common/network:utility_lib", @@ -41,7 +41,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.load_balancing_policies.ring_hash"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/load_balancing_policies/ring_hash:config", "//test/mocks/server:factory_context_mocks", @@ -57,7 +57,7 @@ envoy_extension_cc_test( size = "large", srcs = ["integration_test.cc"], extension_names = ["envoy.load_balancing_policies.ring_hash"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/protobuf", "//source/extensions/load_balancing_policies/ring_hash:config", @@ -70,7 +70,7 @@ envoy_extension_cc_test( envoy_cc_benchmark_binary( name = "ring_hash_lb_benchmark", srcs = ["ring_hash_lb_benchmark.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/load_balancing_policies/ring_hash:ring_hash_lb_lib", "//test/extensions/load_balancing_policies/common:benchmark_base_tester_lib", diff --git a/test/extensions/load_balancing_policies/round_robin/BUILD b/test/extensions/load_balancing_policies/round_robin/BUILD index c392843805..9be16c6636 100644 --- a/test/extensions/load_balancing_policies/round_robin/BUILD +++ b/test/extensions/load_balancing_policies/round_robin/BUILD @@ -19,7 +19,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.load_balancing_policies.round_robin"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/load_balancing_policies/round_robin:config", "//test/mocks/server:factory_context_mocks", @@ -34,7 +34,7 @@ envoy_extension_cc_test( size = "large", srcs = ["integration_test.cc"], extension_names = ["envoy.load_balancing_policies.round_robin"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/protobuf", "//source/extensions/load_balancing_policies/round_robin:config", @@ -57,7 +57,7 @@ envoy_cc_fuzz_test( name = "round_robin_load_balancer_fuzz_test", srcs = ["round_robin_load_balancer_fuzz_test.cc"], corpus = "round_robin_load_balancer_corpus", - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":round_robin_load_balancer_fuzz_proto_cc_proto", "//source/extensions/load_balancing_policies/round_robin:config", @@ -70,7 +70,7 @@ envoy_cc_fuzz_test( envoy_cc_benchmark_binary( name = "round_robin_lb_benchmark", srcs = ["round_robin_lb_benchmark.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/load_balancing_policies/round_robin:config", "//test/extensions/load_balancing_policies/common:benchmark_base_tester_lib", @@ -87,7 +87,7 @@ envoy_extension_cc_test( name = "round_robin_lb_test", srcs = ["round_robin_lb_test.cc"], extension_names = ["envoy.load_balancing_policies.round_robin"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/load_balancing_policies/round_robin:round_robin_lb_lib", "//test/extensions/load_balancing_policies/common:load_balancer_base_test_lib", diff --git a/test/extensions/load_balancing_policies/subset/BUILD b/test/extensions/load_balancing_policies/subset/BUILD index df19a88a30..91b803ca38 100644 --- a/test/extensions/load_balancing_policies/subset/BUILD +++ b/test/extensions/load_balancing_policies/subset/BUILD @@ -17,7 +17,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.load_balancing_policies.subset"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/load_balancing_policies/random:config", "//source/extensions/load_balancing_policies/subset:config", @@ -34,7 +34,7 @@ envoy_extension_cc_test( size = "large", srcs = ["integration_test.cc"], extension_names = ["envoy.load_balancing_policies.subset"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/protobuf", "//source/extensions/filters/http/header_to_metadata:config", @@ -50,7 +50,7 @@ envoy_extension_cc_test( name = "subset_test", srcs = ["subset_test.cc"], extension_names = ["envoy.load_balancing_policies.subset"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/common:minimal_logger_lib", "//source/common/network:utility_lib", @@ -87,7 +87,7 @@ envoy_extension_cc_benchmark_binary( external_deps = [ "benchmark", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/load_balancing_policies/random:config", "//source/extensions/load_balancing_policies/subset:config", diff --git a/test/extensions/matching/actions/format_string/BUILD b/test/extensions/matching/actions/format_string/BUILD index f83630d51c..1ee097aaa5 100644 --- a/test/extensions/matching/actions/format_string/BUILD +++ b/test/extensions/matching/actions/format_string/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.matching.actions.format_string"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/matching/actions/format_string:config", "//test/mocks/network:network_mocks", diff --git a/test/extensions/matching/common_inputs/environment_variable/BUILD b/test/extensions/matching/common_inputs/environment_variable/BUILD index 5c8d2aa4c1..4a50fb77f9 100644 --- a/test/extensions/matching/common_inputs/environment_variable/BUILD +++ b/test/extensions/matching/common_inputs/environment_variable/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.matching.common_inputs.environment_variable"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/matching/common_inputs/environment_variable:config", "//test/mocks/server:factory_context_mocks", @@ -26,7 +26,7 @@ envoy_extension_cc_test( name = "input_test", srcs = ["input_test.cc"], extension_names = ["envoy.matching.common_inputs.environment_variable"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/matching/common_inputs/environment_variable:input_lib", ], diff --git a/test/extensions/matching/input_matchers/cel_matcher/BUILD b/test/extensions/matching/input_matchers/cel_matcher/BUILD index 8cc90b4b22..666a5766a7 100644 --- a/test/extensions/matching/input_matchers/cel_matcher/BUILD +++ b/test/extensions/matching/input_matchers/cel_matcher/BUILD @@ -22,7 +22,7 @@ envoy_extension_cc_test( name = "cel_matcher_test", srcs = ["cel_matcher_test.cc"], extension_names = ["envoy.matching.matchers.cel_matcher"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["skip_on_windows"], deps = [ ":cel_matcher_test_lib", diff --git a/test/extensions/matching/input_matchers/consistent_hashing/BUILD b/test/extensions/matching/input_matchers/consistent_hashing/BUILD index a1d37c07a1..18f823ccae 100644 --- a/test/extensions/matching/input_matchers/consistent_hashing/BUILD +++ b/test/extensions/matching/input_matchers/consistent_hashing/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.matching.matchers.consistent_hashing"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/matching/input_matchers/consistent_hashing:config", "//test/mocks/server:factory_context_mocks", @@ -26,7 +26,7 @@ envoy_extension_cc_test( name = "matcher_test", srcs = ["matcher_test.cc"], extension_names = ["envoy.matching.matchers.consistent_hashing"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/matching/input_matchers/consistent_hashing:consistent_hashing_lib", ], diff --git a/test/extensions/matching/input_matchers/ip/BUILD b/test/extensions/matching/input_matchers/ip/BUILD index 783b783464..b3e1c7950c 100644 --- a/test/extensions/matching/input_matchers/ip/BUILD +++ b/test/extensions/matching/input_matchers/ip/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.matching.matchers.ip"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/matching/input_matchers/ip:config", "//test/mocks/server:factory_context_mocks", @@ -26,7 +26,7 @@ envoy_extension_cc_test( name = "matcher_test", srcs = ["matcher_test.cc"], extension_names = ["envoy.matching.matchers.ip"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/matching/input_matchers/ip:ip_lib", ], diff --git a/test/extensions/matching/input_matchers/runtime_fraction/BUILD b/test/extensions/matching/input_matchers/runtime_fraction/BUILD index 82909a5593..c93c71e382 100644 --- a/test/extensions/matching/input_matchers/runtime_fraction/BUILD +++ b/test/extensions/matching/input_matchers/runtime_fraction/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.matching.matchers.runtime_fraction"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/matching/input_matchers/runtime_fraction:config", "//test/mocks/server:factory_context_mocks", @@ -26,7 +26,7 @@ envoy_extension_cc_test( name = "matcher_test", srcs = ["matcher_test.cc"], extension_names = ["envoy.matching.matchers.runtime_fraction"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/matching/input_matchers/runtime_fraction:runtime_fraction_lib", "//test/mocks/runtime:runtime_mocks", diff --git a/test/extensions/matching/network/common/BUILD b/test/extensions/matching/network/common/BUILD index 4823e50d4b..df62868323 100644 --- a/test/extensions/matching/network/common/BUILD +++ b/test/extensions/matching/network/common/BUILD @@ -12,7 +12,7 @@ envoy_package() envoy_cc_test( name = "inputs_test", srcs = ["inputs_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/http/matching:data_impl_lib", "//source/common/network:address_lib", @@ -28,7 +28,7 @@ envoy_cc_test( name = "inputs_integration_test", size = "large", srcs = ["inputs_integration_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/network:address_lib", "//source/common/network/matching:data_impl_lib", diff --git a/test/extensions/network/dns_resolver/apple/BUILD b/test/extensions/network/dns_resolver/apple/BUILD index bf8c2f3960..3c69ae2b88 100644 --- a/test/extensions/network/dns_resolver/apple/BUILD +++ b/test/extensions/network/dns_resolver/apple/BUILD @@ -15,7 +15,7 @@ envoy_cc_test( "//conditions:default": [], }), external_deps = ["abseil_synchronization"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/event:dispatcher_interface", "//envoy/event:file_event_interface", diff --git a/test/extensions/network/dns_resolver/cares/BUILD b/test/extensions/network/dns_resolver/cares/BUILD index c7185321d4..9240596068 100644 --- a/test/extensions/network/dns_resolver/cares/BUILD +++ b/test/extensions/network/dns_resolver/cares/BUILD @@ -11,7 +11,7 @@ envoy_package() envoy_cc_test( name = "dns_impl_test", srcs = ["dns_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", # TODO(envoyproxy/windows-dev): Under winsock2 this is behaving unusually for windows, even as # 127.0.0.1 and ::1 are explicitly added to `c:\windows\system32\drivers\etc\hosts` ... see: # https://gist.github.com/wrowe/24fe5b93b58bb444bce7ecc134905395 diff --git a/test/extensions/network/dns_resolver/getaddrinfo/BUILD b/test/extensions/network/dns_resolver/getaddrinfo/BUILD index 8ca69966a1..64a1601b8e 100644 --- a/test/extensions/network/dns_resolver/getaddrinfo/BUILD +++ b/test/extensions/network/dns_resolver/getaddrinfo/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "getaddrinfo_test", srcs = ["getaddrinfo_test.cc"], extension_names = ["envoy.network.dns_resolver.getaddrinfo"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/network/dns_resolver/getaddrinfo:config", "//test/mocks/api:api_mocks", diff --git a/test/extensions/path/match/uri_template/BUILD b/test/extensions/path/match/uri_template/BUILD index 9766129a39..7463db5b5e 100644 --- a/test/extensions/path/match/uri_template/BUILD +++ b/test/extensions/path/match/uri_template/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.path.match.uri_template.uri_template_matcher"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/path/match/uri_template:config", "//test/mocks/server:factory_context_mocks", @@ -26,7 +26,7 @@ envoy_extension_cc_test( name = "library_test", srcs = ["library_test.cc"], extension_names = ["envoy.path.match.uri_template.uri_template_matcher"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/path/match/uri_template:config", "//source/extensions/path/match/uri_template:uri_template_match_lib", diff --git a/test/extensions/path/rewrite/uri_template/BUILD b/test/extensions/path/rewrite/uri_template/BUILD index 3f00910f76..ab9f6866c2 100644 --- a/test/extensions/path/rewrite/uri_template/BUILD +++ b/test/extensions/path/rewrite/uri_template/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.path.rewrite.uri_template.uri_template_rewriter"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/path/rewrite/uri_template:config", "//test/mocks/server:factory_context_mocks", @@ -26,7 +26,7 @@ envoy_extension_cc_test( name = "library_test", srcs = ["library_test.cc"], extension_names = ["envoy.path.rewrite.uri_template.uri_template_rewriter"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/path/match/uri_template:config", "//source/extensions/path/match/uri_template:uri_template_match_lib", diff --git a/test/extensions/path/uri_template_lib/BUILD b/test/extensions/path/uri_template_lib/BUILD index 98016c3345..f06fb8d100 100644 --- a/test/extensions/path/uri_template_lib/BUILD +++ b/test/extensions/path/uri_template_lib/BUILD @@ -14,7 +14,7 @@ envoy_package() envoy_cc_test( name = "uri_template_test", srcs = ["uri_template_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/path/uri_template_lib", "//test/test_common:status_utility_lib", @@ -27,7 +27,7 @@ envoy_cc_test( envoy_cc_test( name = "uri_template_internal_test", srcs = ["uri_template_internal_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/path/uri_template_lib:uri_template_internal_cc", "//test/test_common:status_utility_lib", @@ -42,7 +42,7 @@ envoy_cc_fuzz_test( name = "uri_template_fuzz_test", srcs = ["uri_template_fuzz_test.cc"], corpus = "uri_template_corpus", - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/common:statusor_lib", "//source/extensions/path/uri_template_lib", diff --git a/test/extensions/quic/connection_id_generator/BUILD b/test/extensions/quic/connection_id_generator/BUILD index 84e97d9f75..efef6ad5b7 100644 --- a/test/extensions/quic/connection_id_generator/BUILD +++ b/test/extensions/quic/connection_id_generator/BUILD @@ -22,7 +22,7 @@ envoy_extension_cc_test( name = "envoy_deterministic_connection_id_generator_test", srcs = ["envoy_deterministic_connection_id_generator_test.cc"], extension_names = ["envoy.quic.deterministic_connection_id_generator"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["nofips"], deps = [ ":matchers", diff --git a/test/extensions/quic/server_preferred_address/BUILD b/test/extensions/quic/server_preferred_address/BUILD index b404af4121..664f75d882 100644 --- a/test/extensions/quic/server_preferred_address/BUILD +++ b/test/extensions/quic/server_preferred_address/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "datasource_server_preferred_address_test", srcs = ["datasource_server_preferred_address_test.cc"], extension_names = ["envoy.quic.server_preferred_address.datasource"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["nofips"], deps = [ "//source/extensions/quic/server_preferred_address:datasource_server_preferred_address_config_lib", @@ -28,7 +28,7 @@ envoy_extension_cc_test( name = "fixed_server_preferred_address_test", srcs = ["fixed_server_preferred_address_test.cc"], extension_names = ["envoy.quic.server_preferred_address.fixed"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["nofips"], deps = [ "//source/extensions/quic/server_preferred_address:fixed_server_preferred_address_config_lib", diff --git a/test/extensions/rate_limit_descriptors/expr/BUILD b/test/extensions/rate_limit_descriptors/expr/BUILD index 2ad04389c7..902cb60193 100644 --- a/test/extensions/rate_limit_descriptors/expr/BUILD +++ b/test/extensions/rate_limit_descriptors/expr/BUILD @@ -21,7 +21,7 @@ envoy_extension_cc_test( ], }), extension_names = ["envoy.rate_limit_descriptors.expr"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["skip_on_windows"], deps = [ "//source/common/protobuf:utility_lib", diff --git a/test/extensions/request_id/uuid/BUILD b/test/extensions/request_id/uuid/BUILD index 23d5852a07..a139870f18 100644 --- a/test/extensions/request_id/uuid/BUILD +++ b/test/extensions/request_id/uuid/BUILD @@ -12,7 +12,7 @@ envoy_package() envoy_cc_test( name = "config_test", srcs = ["config_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/common:random_generator_lib", "//source/extensions/request_id/uuid:config", diff --git a/test/extensions/resource_monitors/downstream_connections/BUILD b/test/extensions/resource_monitors/downstream_connections/BUILD index bba36af318..68867f323d 100644 --- a/test/extensions/resource_monitors/downstream_connections/BUILD +++ b/test/extensions/resource_monitors/downstream_connections/BUILD @@ -17,7 +17,7 @@ envoy_extension_cc_test( srcs = ["downstream_connections_monitor_test.cc"], extension_names = ["envoy.resource_monitors.downstream_connections"], external_deps = ["abseil_optional"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/resource_monitors/downstream_connections:downstream_connections_monitor", "@envoy_api//envoy/extensions/resource_monitors/downstream_connections/v3:pkg_cc_proto", @@ -28,7 +28,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.resource_monitors.downstream_connections"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/registry", "//source/extensions/resource_monitors/downstream_connections:config", @@ -44,7 +44,7 @@ envoy_cc_test( name = "cx_limit_overload_integration_test", size = "large", srcs = ["cx_limit_overload_integration_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = [ "cpu:3", ], diff --git a/test/extensions/resource_monitors/fixed_heap/BUILD b/test/extensions/resource_monitors/fixed_heap/BUILD index a283299371..622aef79c3 100644 --- a/test/extensions/resource_monitors/fixed_heap/BUILD +++ b/test/extensions/resource_monitors/fixed_heap/BUILD @@ -16,7 +16,7 @@ envoy_extension_cc_test( srcs = ["fixed_heap_monitor_test.cc"], extension_names = ["envoy.resource_monitors.fixed_heap"], external_deps = ["abseil_optional"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/resource_monitors/fixed_heap:fixed_heap_monitor", "@envoy_api//envoy/extensions/resource_monitors/fixed_heap/v3:pkg_cc_proto", @@ -27,7 +27,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.resource_monitors.fixed_heap"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/registry", "//source/common/stats:isolated_store_lib", diff --git a/test/extensions/resource_monitors/injected_resource/BUILD b/test/extensions/resource_monitors/injected_resource/BUILD index c50b6de9a4..c58b1a8251 100644 --- a/test/extensions/resource_monitors/injected_resource/BUILD +++ b/test/extensions/resource_monitors/injected_resource/BUILD @@ -16,7 +16,7 @@ envoy_cc_test( name = "injected_resource_monitor_integration_test", size = "large", srcs = ["injected_resource_monitor_integration_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", # Broken until bazel 5.0.0 fix to shorten resulting paths for SymInitialize() failure tags = ["skip_on_windows"], deps = [ @@ -32,7 +32,7 @@ envoy_cc_test( envoy_cc_test( name = "injected_resource_monitor_test", srcs = ["injected_resource_monitor_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/event:dispatcher_lib", "//source/common/stats:isolated_store_lib", @@ -49,7 +49,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.resource_monitors.injected_resource"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/registry", "//source/common/event:dispatcher_lib", diff --git a/test/extensions/retry/host/omit_canary_hosts/BUILD b/test/extensions/retry/host/omit_canary_hosts/BUILD index f203076104..5e4e830ff3 100644 --- a/test/extensions/retry/host/omit_canary_hosts/BUILD +++ b/test/extensions/retry/host/omit_canary_hosts/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.retry_host_predicates.omit_canary_hosts"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/retry/host/omit_canary_hosts:config", "//test/mocks/upstream:host_mocks", diff --git a/test/extensions/retry/host/omit_host_metadata/BUILD b/test/extensions/retry/host/omit_host_metadata/BUILD index c039e9c1e8..72ad2c48c1 100644 --- a/test/extensions/retry/host/omit_host_metadata/BUILD +++ b/test/extensions/retry/host/omit_host_metadata/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.retry_host_predicates.omit_host_metadata"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/retry/host/omit_host_metadata:config", "//test/mocks/upstream:host_mocks", diff --git a/test/extensions/retry/host/previous_hosts/BUILD b/test/extensions/retry/host/previous_hosts/BUILD index bf26e2d3f8..c460c2594d 100644 --- a/test/extensions/retry/host/previous_hosts/BUILD +++ b/test/extensions/retry/host/previous_hosts/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.retry_host_predicates.previous_hosts"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/network:address_lib", "//source/extensions/retry/host/previous_hosts:config", @@ -28,7 +28,7 @@ envoy_extension_cc_test( size = "large", srcs = ["integration_test.cc"], extension_names = ["envoy.retry_host_predicates.previous_hosts"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/retry/host/previous_hosts:config", "//test/integration:http_integration_lib", diff --git a/test/extensions/retry/priority/previous_priorities/BUILD b/test/extensions/retry/priority/previous_priorities/BUILD index ce699182a0..54d0121d07 100644 --- a/test/extensions/retry/priority/previous_priorities/BUILD +++ b/test/extensions/retry/priority/previous_priorities/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.retry_priorities.previous_priorities"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/protobuf:message_validator_lib", "//source/extensions/retry/priority/previous_priorities:config", diff --git a/test/extensions/router/cluster_specifiers/lua/BUILD b/test/extensions/router/cluster_specifiers/lua/BUILD index 7b5c4aa392..0e81116088 100644 --- a/test/extensions/router/cluster_specifiers/lua/BUILD +++ b/test/extensions/router/cluster_specifiers/lua/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "lua_cluster_specifier_test", srcs = ["lua_cluster_specifier_test.cc"], extension_names = ["envoy.router.cluster_specifier_plugin.lua"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/router/cluster_specifiers/lua:lua_cluster_specifier_lib", "//test/mocks/router:router_mocks", @@ -29,7 +29,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.router.cluster_specifier_plugin.lua"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/router/cluster_specifiers/lua:config", "//test/mocks/server:factory_context_mocks", diff --git a/test/extensions/stats_sinks/common/statsd/BUILD b/test/extensions/stats_sinks/common/statsd/BUILD index b6c0fe1230..834500ad50 100644 --- a/test/extensions/stats_sinks/common/statsd/BUILD +++ b/test/extensions/stats_sinks/common/statsd/BUILD @@ -11,7 +11,7 @@ envoy_package() envoy_cc_test( name = "statsd_test", srcs = ["statsd_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/event:dispatcher_lib", "//source/common/network:utility_lib", @@ -33,7 +33,7 @@ envoy_cc_test( envoy_cc_test( name = "udp_statsd_test", srcs = ["udp_statsd_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/network:address_lib", "//source/common/network:utility_lib", diff --git a/test/extensions/stats_sinks/dog_statsd/BUILD b/test/extensions/stats_sinks/dog_statsd/BUILD index 030d3d71dd..34eedda5d4 100644 --- a/test/extensions/stats_sinks/dog_statsd/BUILD +++ b/test/extensions/stats_sinks/dog_statsd/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.stat_sinks.dog_statsd"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/registry", "//source/common/protobuf:utility_lib", diff --git a/test/extensions/stats_sinks/graphite_statsd/BUILD b/test/extensions/stats_sinks/graphite_statsd/BUILD index 3d05ef42df..a03dd71feb 100644 --- a/test/extensions/stats_sinks/graphite_statsd/BUILD +++ b/test/extensions/stats_sinks/graphite_statsd/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.stat_sinks.graphite_statsd"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/registry", "//source/common/protobuf:utility_lib", diff --git a/test/extensions/stats_sinks/hystrix/BUILD b/test/extensions/stats_sinks/hystrix/BUILD index d3e617eb60..6c6e6d746a 100644 --- a/test/extensions/stats_sinks/hystrix/BUILD +++ b/test/extensions/stats_sinks/hystrix/BUILD @@ -16,7 +16,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.stat_sinks.hystrix"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/registry", "//source/common/protobuf:utility_lib", @@ -33,7 +33,7 @@ envoy_extension_cc_test( name = "hystrix_test", srcs = ["hystrix_test.cc"], extension_names = ["envoy.stat_sinks.hystrix"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/json:json_loader_lib", "//source/common/stats:stats_lib", @@ -53,7 +53,7 @@ envoy_extension_cc_test( size = "large", srcs = envoy_select_admin_functionality(["hystrix_integration_test.cc"]), extension_names = ["envoy.stat_sinks.hystrix"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/stat_sinks/hystrix:config", "//test/integration:http_protocol_integration_lib", diff --git a/test/extensions/stats_sinks/metrics_service/BUILD b/test/extensions/stats_sinks/metrics_service/BUILD index 877905d43f..97b6f76370 100644 --- a/test/extensions/stats_sinks/metrics_service/BUILD +++ b/test/extensions/stats_sinks/metrics_service/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "metrics_service_test", srcs = ["grpc_metrics_service_impl_test.cc"], extension_names = ["envoy.stat_sinks.metrics_service"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/event:dispatcher_lib", "//source/common/upstream:upstream_includes", @@ -36,7 +36,7 @@ envoy_extension_cc_test( size = "large", srcs = ["metrics_service_integration_test.cc"], extension_names = ["envoy.stat_sinks.metrics_service"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/buffer:zero_copy_input_stream_lib", "//source/common/grpc:codec_lib", diff --git a/test/extensions/stats_sinks/open_telemetry/BUILD b/test/extensions/stats_sinks/open_telemetry/BUILD index 1fef9961be..65d1795d93 100644 --- a/test/extensions/stats_sinks/open_telemetry/BUILD +++ b/test/extensions/stats_sinks/open_telemetry/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.stat_sinks.open_telemetry"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/registry", "//source/extensions/stat_sinks/open_telemetry:config", @@ -30,7 +30,7 @@ envoy_extension_cc_test( name = "open_telemetry_test", srcs = ["open_telemetry_impl_test.cc"], extension_names = ["envoy.stat_sinks.open_telemetry"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/stat_sinks/open_telemetry:open_telemetry_lib", "//test/mocks/grpc:grpc_mocks", @@ -43,7 +43,7 @@ envoy_extension_cc_test( size = "large", srcs = ["open_telemetry_integration_test.cc"], extension_names = ["envoy.stat_sinks.open_telemetry"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/buffer:zero_copy_input_stream_lib", "//source/common/grpc:codec_lib", diff --git a/test/extensions/stats_sinks/statsd/BUILD b/test/extensions/stats_sinks/statsd/BUILD index 2baea71454..66f996ffcb 100644 --- a/test/extensions/stats_sinks/statsd/BUILD +++ b/test/extensions/stats_sinks/statsd/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.stat_sinks.statsd"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/registry", "//source/common/protobuf:utility_lib", diff --git a/test/extensions/stats_sinks/wasm/BUILD b/test/extensions/stats_sinks/wasm/BUILD index e730db2645..b8e7e03026 100644 --- a/test/extensions/stats_sinks/wasm/BUILD +++ b/test/extensions/stats_sinks/wasm/BUILD @@ -22,7 +22,7 @@ envoy_extension_cc_test( "//test/extensions/stats_sinks/wasm/test_data:test_context_cpp.wasm", ]), extension_names = ["envoy.stat_sinks.wasm"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["skip_on_windows"], deps = [ "//source/extensions/stat_sinks/wasm:config", @@ -41,7 +41,7 @@ envoy_extension_cc_test( ]), extension_names = ["envoy.stat_sinks.wasm"], external_deps = ["abseil_optional"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["skip_on_windows"], deps = [ "//source/common/stats:stats_lib", diff --git a/test/extensions/string_matcher/lua/BUILD b/test/extensions/string_matcher/lua/BUILD index 0b85ad3d9b..b773218b95 100644 --- a/test/extensions/string_matcher/lua/BUILD +++ b/test/extensions/string_matcher/lua/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "lua_test", srcs = ["lua_test.cc"], extension_names = ["envoy.string_matcher.lua"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/string_matcher/lua:config", "//test/mocks/server:server_factory_context_mocks", @@ -29,7 +29,7 @@ envoy_extension_cc_test( name = "lua_integration_test", srcs = ["lua_integration_test.cc"], extension_names = ["envoy.string_matcher.lua"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/string_matcher/lua:config", "//test/integration:http_integration_lib", diff --git a/test/extensions/tracers/common/ot/BUILD b/test/extensions/tracers/common/ot/BUILD index e27a825efa..e4a8144cbb 100644 --- a/test/extensions/tracers/common/ot/BUILD +++ b/test/extensions/tracers/common/ot/BUILD @@ -17,6 +17,7 @@ envoy_extension_cc_test( "opentracing_driver_impl_test.cc", ], extension_names = ["envoy.tracers.dynamic_ot"], + rbe_pool = "6gig", # TODO(wrowe): envoy_extension_ rules don't currently exclude windows extensions tags = ["skip_on_windows"], deps = [ diff --git a/test/extensions/tracers/datadog/BUILD b/test/extensions/tracers/datadog/BUILD index 4121fec90e..9a9a3f0c44 100644 --- a/test/extensions/tracers/datadog/BUILD +++ b/test/extensions/tracers/datadog/BUILD @@ -34,7 +34,7 @@ envoy_extension_cc_test( external_deps = [ "dd_trace_cpp", ], - rbe_pool = "2core", + rbe_pool = "6gig", # TODO(wrowe): envoy_extension_ rules don't currently exclude windows extensions tags = ["skip_on_windows"], deps = [ diff --git a/test/extensions/tracers/dynamic_ot/BUILD b/test/extensions/tracers/dynamic_ot/BUILD index 793c988449..23fa3a4079 100644 --- a/test/extensions/tracers/dynamic_ot/BUILD +++ b/test/extensions/tracers/dynamic_ot/BUILD @@ -21,6 +21,7 @@ envoy_extension_cc_test( "@io_opentracing_cpp//mocktracer:libmocktracer_plugin.so", ], extension_names = ["envoy.tracers.dynamic_ot"], + rbe_pool = "6gig", # TODO(wrowe): envoy_extension_ rules don't currently exclude windows extensions tags = ["skip_on_windows"], deps = [ @@ -42,6 +43,7 @@ envoy_extension_cc_test( "@io_opentracing_cpp//mocktracer:libmocktracer_plugin.so", ], extension_names = ["envoy.tracers.dynamic_ot"], + rbe_pool = "6gig", # TODO(wrowe): envoy_extension_ rules don't currently exclude windows extensions tags = ["skip_on_windows"], deps = [ diff --git a/test/extensions/tracers/opencensus/BUILD b/test/extensions/tracers/opencensus/BUILD index 5b9585862b..f5f9cbba27 100644 --- a/test/extensions/tracers/opencensus/BUILD +++ b/test/extensions/tracers/opencensus/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "tracer_test", srcs = ["tracer_test.cc"], extension_names = ["envoy.tracers.opencensus"], - rbe_pool = "2core", + rbe_pool = "6gig", # TODO(wrowe): envoy_extension_ rules don't currently exclude windows extensions tags = ["skip_on_windows"], deps = [ @@ -32,7 +32,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.tracers.opencensus"], - rbe_pool = "2core", + rbe_pool = "6gig", # TODO(wrowe): envoy_extension_ rules don't currently exclude windows extensions tags = ["skip_on_windows"], deps = [ diff --git a/test/extensions/tracers/opentelemetry/BUILD b/test/extensions/tracers/opentelemetry/BUILD index f84c77fade..986a27ae3c 100644 --- a/test/extensions/tracers/opentelemetry/BUILD +++ b/test/extensions/tracers/opentelemetry/BUILD @@ -26,7 +26,7 @@ envoy_extension_cc_test( "abseil_optional", "opentelemetry_api", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/common:time_interface", "//envoy/runtime:runtime_interface", @@ -57,7 +57,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.tracers.opentelemetry"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/tracers/opentelemetry:config", "//test/mocks/server:tracer_factory_context_mocks", @@ -71,7 +71,7 @@ envoy_extension_cc_test( name = "span_context_extractor_test", srcs = ["span_context_extractor_test.cc"], extension_names = ["envoy.tracers.opentelemetry"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/tracers/opentelemetry:opentelemetry_tracer_lib", "//test/test_common:status_utility_lib", @@ -83,7 +83,7 @@ envoy_extension_cc_test( name = "grpc_trace_exporter_test", srcs = ["grpc_trace_exporter_test.cc"], extension_names = ["envoy.tracers.opentelemetry"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/tracers/opentelemetry:trace_exporter", "//test/mocks/grpc:grpc_mocks", @@ -96,7 +96,7 @@ envoy_extension_cc_test( name = "http_trace_exporter_test", srcs = ["http_trace_exporter_test.cc"], extension_names = ["envoy.tracers.opentelemetry"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/tracers/opentelemetry:trace_exporter", "//test/mocks/http:http_mocks", @@ -111,7 +111,7 @@ envoy_extension_cc_test( name = "operation_name_test", srcs = ["operation_name_test.cc"], extension_names = ["envoy.tracers.opentelemetry"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/tracers/opentelemetry:config", "//source/extensions/tracers/opentelemetry:opentelemetry_tracer_lib", diff --git a/test/extensions/tracers/opentelemetry/resource_detectors/BUILD b/test/extensions/tracers/opentelemetry/resource_detectors/BUILD index 55e82a9651..7049926bde 100644 --- a/test/extensions/tracers/opentelemetry/resource_detectors/BUILD +++ b/test/extensions/tracers/opentelemetry/resource_detectors/BUILD @@ -11,7 +11,7 @@ envoy_package() envoy_cc_test( name = "resource_provider_test", srcs = ["resource_provider_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/registry", "//source/extensions/tracers/opentelemetry/resource_detectors:resource_detector_lib", diff --git a/test/extensions/tracers/opentelemetry/resource_detectors/dynatrace/BUILD b/test/extensions/tracers/opentelemetry/resource_detectors/dynatrace/BUILD index 10b42c5b2e..20be396bc8 100644 --- a/test/extensions/tracers/opentelemetry/resource_detectors/dynatrace/BUILD +++ b/test/extensions/tracers/opentelemetry/resource_detectors/dynatrace/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.tracers.opentelemetry.resource_detectors.dynatrace"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/registry", "//source/extensions/tracers/opentelemetry/resource_detectors/dynatrace:config", @@ -32,7 +32,7 @@ envoy_extension_cc_test( "dynatrace_resource_detector_test.cc", ], extension_names = ["envoy.tracers.opentelemetry.resource_detectors.dynatrace"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/tracers/opentelemetry/resource_detectors/dynatrace:config", "//source/extensions/tracers/opentelemetry/resource_detectors/dynatrace:dynatrace_resource_detector_lib", @@ -48,7 +48,7 @@ envoy_extension_cc_test( "dynatrace_resource_detector_integration_test.cc", ], extension_names = ["envoy.tracers.opentelemetry.resource_detectors.dynatrace"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/exe:main_common_lib", "//source/extensions/tracers/opentelemetry:config", diff --git a/test/extensions/tracers/opentelemetry/resource_detectors/environment/BUILD b/test/extensions/tracers/opentelemetry/resource_detectors/environment/BUILD index 97af775774..264622838a 100644 --- a/test/extensions/tracers/opentelemetry/resource_detectors/environment/BUILD +++ b/test/extensions/tracers/opentelemetry/resource_detectors/environment/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.tracers.opentelemetry.resource_detectors.environment"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/registry", "//source/extensions/tracers/opentelemetry/resource_detectors/environment:config", @@ -29,7 +29,7 @@ envoy_extension_cc_test( name = "environment_resource_detector_test", srcs = ["environment_resource_detector_test.cc"], extension_names = ["envoy.tracers.opentelemetry.resource_detectors.environment"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/tracers/opentelemetry/resource_detectors/environment:environment_resource_detector_lib", "//test/mocks/server:tracer_factory_context_mocks", @@ -44,7 +44,7 @@ envoy_extension_cc_test( "environment_resource_detector_integration_test.cc", ], extension_names = ["envoy.tracers.opentelemetry.resource_detectors.environment"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/exe:main_common_lib", "//source/extensions/tracers/opentelemetry:config", diff --git a/test/extensions/tracers/opentelemetry/resource_detectors/static/BUILD b/test/extensions/tracers/opentelemetry/resource_detectors/static/BUILD index 01adab6866..72f9283397 100644 --- a/test/extensions/tracers/opentelemetry/resource_detectors/static/BUILD +++ b/test/extensions/tracers/opentelemetry/resource_detectors/static/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.tracers.opentelemetry.resource_detectors.static_config"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/registry", "//source/extensions/tracers/opentelemetry/resource_detectors/static:config", @@ -30,7 +30,7 @@ envoy_extension_cc_test( name = "static_config_resource_detector_test", srcs = ["static_config_resource_detector_test.cc"], extension_names = ["envoy.tracers.opentelemetry.resource_detectors.static_config"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/tracers/opentelemetry/resource_detectors/static:static_config_resource_detector_lib", "//test/mocks/server:tracer_factory_context_mocks", @@ -45,7 +45,7 @@ envoy_extension_cc_test( "static_config_resource_detector_integration_test.cc", ], extension_names = ["envoy.tracers.opentelemetry.resource_detectors.static_config"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/tracers/opentelemetry:config", "//source/extensions/tracers/opentelemetry/resource_detectors/static:config", diff --git a/test/extensions/tracers/opentelemetry/samplers/BUILD b/test/extensions/tracers/opentelemetry/samplers/BUILD index 929b4bf0be..8829a5c25e 100644 --- a/test/extensions/tracers/opentelemetry/samplers/BUILD +++ b/test/extensions/tracers/opentelemetry/samplers/BUILD @@ -11,7 +11,7 @@ envoy_package() envoy_cc_test( name = "sampler_test", srcs = ["sampler_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/registry", "//source/extensions/tracers/opentelemetry:opentelemetry_tracer_lib", diff --git a/test/extensions/tracers/opentelemetry/samplers/always_on/BUILD b/test/extensions/tracers/opentelemetry/samplers/always_on/BUILD index f309abf9c2..9037d83b28 100644 --- a/test/extensions/tracers/opentelemetry/samplers/always_on/BUILD +++ b/test/extensions/tracers/opentelemetry/samplers/always_on/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.tracers.opentelemetry.samplers.always_on"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/registry", "//source/extensions/tracers/opentelemetry/samplers/always_on:always_on_sampler_lib", @@ -29,7 +29,7 @@ envoy_extension_cc_test( name = "always_on_sampler_test", srcs = ["always_on_sampler_test.cc"], extension_names = ["envoy.tracers.opentelemetry.samplers.always_on"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/tracers/opentelemetry/samplers/always_on:always_on_sampler_lib", "//source/extensions/tracers/opentelemetry/samplers/always_on:config", @@ -45,7 +45,7 @@ envoy_extension_cc_test( "always_on_sampler_integration_test.cc", ], extension_names = ["envoy.tracers.opentelemetry.samplers.always_on"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/exe:main_common_lib", "//source/extensions/tracers/opentelemetry:config", diff --git a/test/extensions/tracers/opentelemetry/samplers/dynatrace/BUILD b/test/extensions/tracers/opentelemetry/samplers/dynatrace/BUILD index 7d3af06baa..d1829bf70a 100644 --- a/test/extensions/tracers/opentelemetry/samplers/dynatrace/BUILD +++ b/test/extensions/tracers/opentelemetry/samplers/dynatrace/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.tracers.opentelemetry.samplers.dynatrace"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/registry", "//source/extensions/tracers/opentelemetry/samplers/dynatrace:config", @@ -36,7 +36,7 @@ envoy_extension_cc_test( "tenant_id_test.cc", ], extension_names = ["envoy.tracers.opentelemetry.samplers.dynatrace"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/tracers/opentelemetry/samplers/dynatrace:dynatrace_sampler_lib", "//test/mocks/server:tracer_factory_context_mocks", @@ -52,7 +52,7 @@ envoy_extension_cc_test( "dynatrace_sampler_integration_test.cc", ], extension_names = ["envoy.tracers.opentelemetry.samplers.dynatrace"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/exe:main_common_lib", "//source/extensions/tracers/opentelemetry:config", diff --git a/test/extensions/tracers/skywalking/BUILD b/test/extensions/tracers/skywalking/BUILD index a1cbd98bf4..e3e22ec8c1 100644 --- a/test/extensions/tracers/skywalking/BUILD +++ b/test/extensions/tracers/skywalking/BUILD @@ -16,7 +16,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.tracers.skywalking"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/tracers/skywalking:config", "//test/mocks/server:tracer_factory_context_mocks", @@ -30,7 +30,7 @@ envoy_extension_cc_test( name = "trace_segment_reporter_test", srcs = ["trace_segment_reporter_test.cc"], extension_names = ["envoy.tracers.skywalking"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":skywalking_test_helper", "//source/extensions/tracers/skywalking:trace_segment_reporter_lib", @@ -55,7 +55,7 @@ envoy_extension_cc_test( external_deps = [ "cpp2sky", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":skywalking_test_helper_lib", "//source/common/common:base64_lib", @@ -68,7 +68,7 @@ envoy_extension_cc_test( name = "tracer_test", srcs = ["tracer_test.cc"], extension_names = ["envoy.tracers.skywalking"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":skywalking_test_helper", "//source/extensions/tracers/skywalking:skywalking_tracer_lib", @@ -87,7 +87,7 @@ envoy_extension_cc_test( name = "skywalking_tracer_impl_test", srcs = ["skywalking_tracer_impl_test.cc"], extension_names = ["envoy.tracers.skywalking"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":skywalking_test_helper", "//source/extensions/tracers/skywalking:skywalking_tracer_lib", diff --git a/test/extensions/tracers/xray/BUILD b/test/extensions/tracers/xray/BUILD index 51859bb9a4..fc79bcdbd3 100644 --- a/test/extensions/tracers/xray/BUILD +++ b/test/extensions/tracers/xray/BUILD @@ -21,7 +21,7 @@ envoy_extension_cc_test( "xray_tracer_impl_test.cc", ], extension_names = ["envoy.tracers.xray"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/tracers/xray:xray_lib", "//test/mocks:common_lib", @@ -44,7 +44,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.tracers.xray"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/tracers/xray:config", "//test/mocks/server:instance_mocks", @@ -60,7 +60,7 @@ envoy_cc_fuzz_test( name = "xray_fuzz_test", srcs = ["fuzz_test.cc"], corpus = "wildcard_matcher_corpus", - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/tracers/xray:xray_lib", ], diff --git a/test/extensions/tracers/zipkin/BUILD b/test/extensions/tracers/zipkin/BUILD index 6b0dc5f327..e14cb94bea 100644 --- a/test/extensions/tracers/zipkin/BUILD +++ b/test/extensions/tracers/zipkin/BUILD @@ -22,7 +22,7 @@ envoy_extension_cc_test( ], extension_names = ["envoy.tracers.zipkin"], external_deps = ["abseil_optional"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/common:time_interface", "//envoy/runtime:runtime_interface", @@ -53,7 +53,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.tracers.zipkin"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/tracers/zipkin:config", "//test/mocks/server:tracer_factory_context_mocks", diff --git a/test/extensions/transport_sockets/alts/BUILD b/test/extensions/transport_sockets/alts/BUILD index f9a31d0916..8338fc0b13 100644 --- a/test/extensions/transport_sockets/alts/BUILD +++ b/test/extensions/transport_sockets/alts/BUILD @@ -16,7 +16,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.transport_sockets.alts"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/singleton:manager_impl_lib", "//source/extensions/transport_sockets/alts:config", @@ -31,7 +31,7 @@ envoy_extension_cc_test( name = "alts_channel_pool_test", srcs = ["alts_channel_pool_test.cc"], extension_names = ["envoy.transport_sockets.alts"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/network:address_interface", "//source/extensions/transport_sockets/alts:alts_channel_pool", @@ -47,7 +47,7 @@ envoy_extension_cc_test( name = "alts_proxy_test", srcs = ["alts_proxy_test.cc"], extension_names = ["envoy.transport_sockets.alts"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/network:address_interface", "//source/extensions/transport_sockets/alts:alts_proxy", @@ -67,7 +67,7 @@ envoy_extension_cc_test( name = "alts_tsi_handshaker_test", srcs = ["alts_tsi_handshaker_test.cc"], extension_names = ["envoy.transport_sockets.alts"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/network:address_interface", "//source/extensions/transport_sockets/alts:alts_proxy", @@ -88,7 +88,7 @@ envoy_extension_cc_test( name = "tsi_frame_protector_test", srcs = ["tsi_frame_protector_test.cc"], extension_names = ["envoy.transport_sockets.alts"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/transport_sockets/alts:tsi_frame_protector", "//test/mocks/buffer:buffer_mocks", @@ -99,7 +99,7 @@ envoy_extension_cc_test( name = "tsi_handshaker_test", srcs = ["tsi_handshaker_test.cc"], extension_names = ["envoy.transport_sockets.alts"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/event:dispatcher_interface", "//envoy/network:address_interface", @@ -126,7 +126,7 @@ envoy_extension_cc_test( external_deps = [ "grpc", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/event:dispatcher_interface", "//envoy/network:address_interface", @@ -145,7 +145,7 @@ envoy_extension_cc_test( name = "noop_transport_socket_callbacks_test", srcs = ["noop_transport_socket_callbacks_test.cc"], extension_names = ["envoy.transport_sockets.alts"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/transport_sockets/alts:noop_transport_socket_callbacks_lib", "//test/mocks/network:network_mocks", @@ -160,7 +160,7 @@ envoy_extension_cc_test( external_deps = [ "grpc", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/common:utility_lib", "//source/common/event:dispatcher_includes", diff --git a/test/extensions/transport_sockets/common/BUILD b/test/extensions/transport_sockets/common/BUILD index 2bd960f9aa..b3b0a14ddf 100644 --- a/test/extensions/transport_sockets/common/BUILD +++ b/test/extensions/transport_sockets/common/BUILD @@ -11,7 +11,7 @@ envoy_package() envoy_cc_test( name = "passthrough_test", srcs = ["passthrough_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/transport_sockets/common:passthrough_lib", "//test/mocks/buffer:buffer_mocks", diff --git a/test/extensions/transport_sockets/http_11_proxy/BUILD b/test/extensions/transport_sockets/http_11_proxy/BUILD index 3f300cc108..c634aba714 100644 --- a/test/extensions/transport_sockets/http_11_proxy/BUILD +++ b/test/extensions/transport_sockets/http_11_proxy/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "connect_test", srcs = ["connect_test.cc"], extension_names = ["envoy.transport_sockets.http_11_proxy"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/transport_sockets/http_11_proxy:connect", "//test/mocks/buffer:buffer_mocks", @@ -31,7 +31,7 @@ envoy_extension_cc_test( size = "large", srcs = ["connect_integration_test.cc"], extension_names = ["envoy.transport_sockets.http_11_proxy"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/clusters/dynamic_forward_proxy:cluster", "//source/extensions/filters/http/dynamic_forward_proxy:config", diff --git a/test/extensions/transport_sockets/internal_upstream/BUILD b/test/extensions/transport_sockets/internal_upstream/BUILD index dc827ce79f..41dc21eccf 100644 --- a/test/extensions/transport_sockets/internal_upstream/BUILD +++ b/test/extensions/transport_sockets/internal_upstream/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "internal_upstream_test", srcs = ["internal_upstream_test.cc"], extension_names = ["envoy.transport_sockets.internal_upstream"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/common:hashable_interface", "//source/common/stream_info:filter_state_lib", @@ -42,7 +42,7 @@ envoy_extension_cc_test( "envoy.bootstrap.internal_listener", "envoy.filters.http.set_filter_state", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/network:connection_lib", "//source/common/network:utility_lib", diff --git a/test/extensions/transport_sockets/proxy_protocol/BUILD b/test/extensions/transport_sockets/proxy_protocol/BUILD index fe34210238..0aa2be2b93 100644 --- a/test/extensions/transport_sockets/proxy_protocol/BUILD +++ b/test/extensions/transport_sockets/proxy_protocol/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "proxy_protocol_test", srcs = ["proxy_protocol_test.cc"], extension_names = ["envoy.transport_sockets.upstream_proxy_protocol"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/network:proxy_protocol_options_lib", "//source/extensions/common/proxy_protocol:proxy_protocol_header_lib", @@ -33,7 +33,7 @@ envoy_extension_cc_test( size = "large", srcs = ["proxy_protocol_integration_test.cc"], extension_names = ["envoy.transport_sockets.upstream_proxy_protocol"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/listener/proxy_protocol:config", "//source/extensions/filters/network/tcp_proxy:config", diff --git a/test/extensions/transport_sockets/starttls/BUILD b/test/extensions/transport_sockets/starttls/BUILD index 79dfbf4bfa..8b2d681621 100644 --- a/test/extensions/transport_sockets/starttls/BUILD +++ b/test/extensions/transport_sockets/starttls/BUILD @@ -18,7 +18,7 @@ envoy_extension_cc_test( "starttls_socket_test.cc", ], extension_names = ["envoy.transport_sockets.starttls"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/network:transport_socket_options_lib", "//source/extensions/transport_sockets/starttls:config", @@ -42,7 +42,7 @@ envoy_extension_cc_test( "//test/config/integration/certs", ], extension_names = ["envoy.transport_sockets.starttls"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":starttls_integration_proto_cc_proto", "//source/extensions/filters/network/tcp_proxy:config", @@ -64,7 +64,7 @@ envoy_extension_cc_test( "//test/config/integration/certs", ], extension_names = ["envoy.transport_sockets.starttls"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":starttls_integration_proto_cc_proto", "//source/extensions/transport_sockets/starttls:config", diff --git a/test/extensions/transport_sockets/tap/BUILD b/test/extensions/transport_sockets/tap/BUILD index 8f678ca2b9..5b6dd0090d 100644 --- a/test/extensions/transport_sockets/tap/BUILD +++ b/test/extensions/transport_sockets/tap/BUILD @@ -16,7 +16,7 @@ envoy_extension_cc_test( name = "tap_config_impl_test", srcs = ["tap_config_impl_test.cc"], extension_names = ["envoy.transport_sockets.tap"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/transport_sockets/tap:tap_config_impl", "//test/extensions/common/tap:common", @@ -32,7 +32,7 @@ envoy_extension_cc_test( "//test/config/integration/certs", ], extension_names = ["envoy.transport_sockets.tap"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/network:connection_lib", "//source/extensions/transport_sockets/tap:config", diff --git a/test/extensions/transport_sockets/tcp_stats/BUILD b/test/extensions/transport_sockets/tcp_stats/BUILD index 0b986c904d..0e6858bd38 100644 --- a/test/extensions/transport_sockets/tcp_stats/BUILD +++ b/test/extensions/transport_sockets/tcp_stats/BUILD @@ -15,7 +15,7 @@ envoy_extension_cc_test( name = "tcp_stats_test", srcs = ["tcp_stats_test.cc"], extension_names = ["envoy.transport_sockets.tcp_stats"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/transport_sockets/raw_buffer:config", "//source/extensions/transport_sockets/tcp_stats:config", @@ -35,7 +35,7 @@ envoy_extension_cc_test( size = "large", srcs = ["tcp_stats_integration_test.cc"], extension_names = ["envoy.transport_sockets.tcp_stats"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/filters/network/tcp_proxy:config", "//source/extensions/transport_sockets/raw_buffer:config", diff --git a/test/extensions/transport_sockets/tls/cert_validator/spiffe/BUILD b/test/extensions/transport_sockets/tls/cert_validator/spiffe/BUILD index e683229d71..eb204e7f6c 100644 --- a/test/extensions/transport_sockets/tls/cert_validator/spiffe/BUILD +++ b/test/extensions/transport_sockets/tls/cert_validator/spiffe/BUILD @@ -21,7 +21,7 @@ envoy_extension_cc_test( "//test/common/tls/test_data:certs", ], extension_names = ["envoy.tls.cert_validator.spiffe"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/transport_sockets/tls/cert_validator/spiffe:config", "//test/common/tls:ssl_test_utils", @@ -48,7 +48,7 @@ envoy_extension_cc_test( "//test/config/integration/certs", ], extension_names = ["envoy.tls.cert_validator.spiffe"], - rbe_pool = "2core", + rbe_pool = "6gig", # Broken until bazel 5.0.0 fix to shorten resulting paths for SymInitialize() failure tags = ["skip_on_windows"], deps = [ diff --git a/test/extensions/udp_packet_writer/default/BUILD b/test/extensions/udp_packet_writer/default/BUILD index 30a07eb596..0d20434045 100644 --- a/test/extensions/udp_packet_writer/default/BUILD +++ b/test/extensions/udp_packet_writer/default/BUILD @@ -11,7 +11,7 @@ envoy_package() envoy_cc_test( name = "config_test", srcs = ["config_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/udp_packet_writer/default:config", "//test/test_common:utility_lib", diff --git a/test/extensions/udp_packet_writer/gso/BUILD b/test/extensions/udp_packet_writer/gso/BUILD index ec698e0b2f..f5751aaf2e 100644 --- a/test/extensions/udp_packet_writer/gso/BUILD +++ b/test/extensions/udp_packet_writer/gso/BUILD @@ -12,7 +12,7 @@ envoy_package() envoy_cc_test( name = "config_test", srcs = ["config_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//test/test_common:utility_lib", "@envoy_api//envoy/extensions/udp_packet_writer/v3:pkg_cc_proto", diff --git a/test/extensions/upstreams/http/BUILD b/test/extensions/upstreams/http/BUILD index 1b233d0336..e0c729de7c 100644 --- a/test/extensions/upstreams/http/BUILD +++ b/test/extensions/upstreams/http/BUILD @@ -17,7 +17,7 @@ envoy_proto_library( envoy_cc_test( name = "config_test", srcs = ["config_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":config_cc_proto", "//envoy/http:header_validator_factory_interface", diff --git a/test/extensions/upstreams/http/generic/BUILD b/test/extensions/upstreams/http/generic/BUILD index 90e1ffb1fa..18c07992ab 100644 --- a/test/extensions/upstreams/http/generic/BUILD +++ b/test/extensions/upstreams/http/generic/BUILD @@ -11,7 +11,7 @@ envoy_package() envoy_cc_test( name = "config_test", srcs = ["config_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/upstreams/http/generic:config", "//test/mocks:common_lib", diff --git a/test/extensions/upstreams/http/tcp/BUILD b/test/extensions/upstreams/http/tcp/BUILD index c9dcb5e25d..f07d993db1 100644 --- a/test/extensions/upstreams/http/tcp/BUILD +++ b/test/extensions/upstreams/http/tcp/BUILD @@ -11,7 +11,7 @@ envoy_package() envoy_cc_test( name = "upstream_request_test", srcs = ["upstream_request_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/buffer:buffer_lib", "//source/common/network:address_lib", diff --git a/test/extensions/upstreams/http/udp/BUILD b/test/extensions/upstreams/http/udp/BUILD index 672d9e7a9c..04099f8739 100644 --- a/test/extensions/upstreams/http/udp/BUILD +++ b/test/extensions/upstreams/http/udp/BUILD @@ -11,7 +11,7 @@ envoy_package() envoy_cc_test( name = "upstream_request_test", srcs = ["upstream_request_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/buffer:buffer_lib", "//source/common/network:address_lib", @@ -37,7 +37,7 @@ envoy_cc_test( envoy_cc_test( name = "config_test", srcs = ["config_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/upstreams/http/udp:config", "//source/extensions/upstreams/http/udp:upstream_request_lib", diff --git a/test/extensions/upstreams/tcp/generic/BUILD b/test/extensions/upstreams/tcp/generic/BUILD index f80fe84350..c7e9e7e235 100644 --- a/test/extensions/upstreams/tcp/generic/BUILD +++ b/test/extensions/upstreams/tcp/generic/BUILD @@ -11,7 +11,7 @@ envoy_package() envoy_cc_test( name = "config_test", srcs = ["config_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/stream_info:bool_accessor_lib", "//source/common/tcp_proxy", diff --git a/test/extensions/watchdog/profile_action/BUILD b/test/extensions/watchdog/profile_action/BUILD index 4b45b3992d..f4a7e03fcf 100644 --- a/test/extensions/watchdog/profile_action/BUILD +++ b/test/extensions/watchdog/profile_action/BUILD @@ -18,7 +18,7 @@ envoy_extension_cc_test( external_deps = [ "abseil_synchronization", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/common:time_interface", "//envoy/registry", @@ -41,7 +41,7 @@ envoy_extension_cc_test( name = "config_test", srcs = ["config_test.cc"], extension_names = ["envoy.watchdog.profile_action"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/registry", "//envoy/server:guarddog_config_interface", diff --git a/test/fuzz/BUILD b/test/fuzz/BUILD index 5215992027..905eda9d0e 100644 --- a/test/fuzz/BUILD +++ b/test/fuzz/BUILD @@ -64,7 +64,7 @@ envoy_cc_test_library( external_deps = [ "quiche_http2_adapter", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":common_proto_cc_proto", "//source/common/common:empty_string", @@ -121,7 +121,7 @@ envoy_cc_test_library( envoy_cc_test( name = "random_test", srcs = ["random_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//test/fuzz:random_lib", ], diff --git a/test/integration/BUILD b/test/integration/BUILD index 8d7a97bf03..318ff55f28 100644 --- a/test/integration/BUILD +++ b/test/integration/BUILD @@ -31,7 +31,7 @@ envoy_cc_test_library( "//test/config/integration:server_xds_files", "//test/config/integration/certs", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":http_integration_lib", "//source/common/common:matchers_lib", @@ -59,7 +59,7 @@ envoy_cc_test( srcs = envoy_select_admin_functionality( ["ads_integration_test.cc"], ), - rbe_pool = "2core", + rbe_pool = "6gig", tags = [ "cpu:3", ], @@ -85,7 +85,7 @@ envoy_cc_test( name = "alpn_integration_test", size = "large", srcs = ["alpn_integration_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", shard_count = 2, tags = [ "cpu:3", @@ -97,7 +97,7 @@ envoy_cc_test( name = "api_listener_integration_test", size = "large", srcs = ["api_listener_integration_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = [ "cpu:3", ], @@ -136,7 +136,7 @@ envoy_cc_test( data = [ "//test/config/integration/certs", ], - rbe_pool = "2core", + rbe_pool = "6gig", shard_count = 4, tags = [ "cpu:3", @@ -160,7 +160,7 @@ envoy_cc_test( name = "eds_integration_test", size = "large", srcs = ["eds_integration_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = [ "cpu:3", ], @@ -184,7 +184,7 @@ envoy_cc_test( name = "leds_integration_test", size = "large", srcs = ["leds_integration_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = [ "cpu:3", ], @@ -211,7 +211,7 @@ envoy_cc_test( srcs = [ "filter_manager_integration_test.cc", ], - rbe_pool = "2core", + rbe_pool = "6gig", tags = [ "cpu:3", ], @@ -246,7 +246,7 @@ envoy_cc_test( srcs = [ "upstream_access_log_integration_test.cc", ], - rbe_pool = "2core", + rbe_pool = "6gig", tags = [ "cpu:3", ], @@ -266,7 +266,7 @@ envoy_cc_test( name = "cluster_filter_integration_test", size = "large", srcs = ["cluster_filter_integration_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = [ "cpu:3", ], @@ -286,7 +286,7 @@ envoy_cc_test( name = "custom_cluster_integration_test", size = "large", srcs = ["custom_cluster_integration_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = [ "cpu:3", ], @@ -308,7 +308,7 @@ envoy_cc_test( data = [ "//test/config/integration/certs", ], - rbe_pool = "2core", + rbe_pool = "6gig", tags = [ "cpu:3", ], @@ -341,7 +341,7 @@ envoy_cc_test( srcs = envoy_select_admin_functionality([ "drain_close_integration_test.cc", ]), - rbe_pool = "2core", + rbe_pool = "6gig", tags = [ "cpu:3", ], @@ -359,7 +359,7 @@ envoy_cc_test_binary( external_deps = [ "abseil_symbolize", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/http:rds_lib", "//source/exe:envoy_main_common_with_core_extensions_lib", @@ -382,7 +382,7 @@ envoy_cc_test_binary( "abseil_symbolize", ], linkstatic = envoy_select_linkstatic(), - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/exe:main_common_lib", "//source/exe:platform_impl_lib", @@ -420,7 +420,7 @@ envoy_sh_test( "test_utility.sh", "//test/config/integration:server_config_files", ], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["skip_on_windows"], ) @@ -433,7 +433,7 @@ envoy_cc_test( data = [ "//test/config/integration/certs", ], - rbe_pool = "2core", + rbe_pool = "6gig", tags = [ "cpu:3", ], @@ -452,7 +452,7 @@ envoy_cc_test( srcs = [ "header_integration_test.cc", ], - rbe_pool = "2core", + rbe_pool = "6gig", tags = [ "cpu:3", ], @@ -478,7 +478,7 @@ envoy_cc_test( name = "http_conn_pool_integration_test", size = "large", srcs = ["http_conn_pool_integration_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = [ "cpu:3", ], @@ -493,7 +493,7 @@ envoy_cc_test( name = "circuit_breakers_integration_test", size = "large", srcs = ["circuit_breakers_integration_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = [ "cpu:3", ], @@ -510,7 +510,7 @@ envoy_cc_test( srcs = [ "http2_flood_integration_test.cc", ], - rbe_pool = "2core", + rbe_pool = "6gig", shard_count = 6, tags = [ "cpu:3", @@ -539,7 +539,7 @@ envoy_cc_test( srcs = [ "multiplexed_integration_test.cc", ], - rbe_pool = "2core", + rbe_pool = "6gig", shard_count = 10, tags = [ "cpu:3", @@ -577,7 +577,7 @@ envoy_cc_test( name = "shadow_policy_integration_test", size = "large", srcs = ["shadow_policy_integration_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = [ "cpu:3", ], @@ -601,7 +601,7 @@ envoy_cc_test( name = "upstream_http_filter_integration_test", size = "large", srcs = ["upstream_http_filter_integration_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = [ "cpu:3", ], @@ -623,7 +623,7 @@ envoy_cc_test( name = "upstream_network_filter_integration_test", size = "large", srcs = ["upstream_network_filter_integration_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":http_integration_lib", "//source/extensions/filters/network/tcp_proxy:config", @@ -642,7 +642,7 @@ envoy_cc_test( srcs = [ "buffer_accounting_integration_test.cc", ], - rbe_pool = "2core", + rbe_pool = "6gig", tags = [ "cpu:3", ], @@ -684,7 +684,7 @@ envoy_cc_test( srcs = [ "http_subset_lb_integration_test.cc", ], - rbe_pool = "2core", + rbe_pool = "6gig", tags = [ "cpu:3", ], @@ -710,7 +710,7 @@ envoy_cc_test( data = [ "//test/config/integration/certs", ], - rbe_pool = "2core", + rbe_pool = "6gig", tags = [ "cpu:3", ], @@ -730,7 +730,7 @@ envoy_cc_test( srcs = [ "header_casing_integration_test.cc", ], - rbe_pool = "2core", + rbe_pool = "6gig", tags = [ "cpu:3", ], @@ -747,7 +747,7 @@ envoy_cc_test( srcs = envoy_select_admin_functionality([ "http_typed_per_filter_config_test.cc", ]), - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":http_integration_lib", "//test/integration/filters:set_route_filter_lib", @@ -769,7 +769,7 @@ envoy_cc_test( srcs = [ "http_timeout_integration_test.cc", ], - rbe_pool = "2core", + rbe_pool = "6gig", tags = [ "cpu:3", ], @@ -786,7 +786,7 @@ envoy_cc_test( srcs = envoy_select_admin_functionality([ "filter_integration_test.cc", ]), - rbe_pool = "2core", + rbe_pool = "6gig", shard_count = 8, tags = [ "cpu:3", @@ -824,7 +824,7 @@ envoy_cc_test_library( name = "protocol_integration_test_lib", srcs = ["protocol_integration_test.cc"], hdrs = ["protocol_integration_test.h"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":http_protocol_integration_lib", ":socket_interface_swap_lib", @@ -862,7 +862,7 @@ envoy_cc_test( srcs = [ "instantiate_protocol_integration_test.cc", ], - rbe_pool = "2core", + rbe_pool = "6gig", # As this test has many H1/H2/v4/v6 tests it takes a while to run. # Shard it enough to bring the run time in line with other integration tests. shard_count = 16, @@ -880,7 +880,7 @@ envoy_cc_test( srcs = envoy_select_admin_functionality([ "multi_envoy_test.cc", ]), - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":http_protocol_integration_lib", ], @@ -892,7 +892,7 @@ envoy_cc_test( srcs = [ "multiplexed_upstream_integration_test.cc", ], - rbe_pool = "2core", + rbe_pool = "6gig", shard_count = 4, tags = [ "cpu:3", @@ -924,7 +924,7 @@ envoy_cc_test( srcs = envoy_select_admin_functionality( ["integration_admin_test.cc"], ), - rbe_pool = "2core", + rbe_pool = "6gig", tags = [ "cpu:3", ], @@ -975,7 +975,7 @@ envoy_cc_test_library( data = [ "//test/config/integration/certs", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":integration_lib_light", ":test_host_predicate_lib", @@ -1024,7 +1024,7 @@ envoy_cc_test_library( hdrs = [ "http_protocol_integration.h", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":http_integration_lib", "//test/common/upstream:utility_lib", @@ -1037,7 +1037,7 @@ envoy_cc_test( name = "idle_timeout_integration_test", size = "large", srcs = ["idle_timeout_integration_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", # As this test has many pauses for idle timeouts, it takes a while to run. # Shard it enough to bring the run time in line with other integration tests. shard_count = 8, @@ -1103,7 +1103,7 @@ envoy_cc_test_library( hdrs = [ "fake_upstream.h", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":utility_lib", "//envoy/api:api_interface", @@ -1181,7 +1181,7 @@ envoy_cc_test_library( hdrs = [ "base_integration_test.h", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":autonomous_upstream_lib", ":fake_upstream_lib", @@ -1225,7 +1225,7 @@ envoy_cc_test_library( hdrs = [ "autonomous_upstream.h", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":fake_upstream_lib", ], @@ -1244,7 +1244,7 @@ envoy_cc_test_library( "utility.h", ], data = ["//test/common/runtime:filesystem_test_data"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":server_stats_interface", ":tcp_dump", @@ -1402,7 +1402,7 @@ envoy_cc_test( name = "integration_test", size = "large", srcs = ["integration_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = [ "cpu:3", ], @@ -1439,7 +1439,7 @@ envoy_cc_test( srcs = [ "redirect_integration_test.cc", ], - rbe_pool = "2core", + rbe_pool = "6gig", shard_count = 2, tags = [ "cpu:3", @@ -1459,7 +1459,7 @@ envoy_cc_test( name = "regex_engine_integration_test", size = "large", srcs = ["regex_engine_integration_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":integration_lib", "//source/common/common:regex_lib", @@ -1477,7 +1477,7 @@ envoy_cc_test( name = "websocket_integration_test", size = "large", srcs = ["websocket_integration_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = [ "cpu:3", ], @@ -1498,7 +1498,7 @@ envoy_cc_test( name = "socket_interface_integration_test", size = "large", srcs = ["socket_interface_integration_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":http_integration_lib", "//source/common/network:socket_interface_lib", @@ -1513,7 +1513,7 @@ envoy_cc_test( data = [ "//test/config/integration/certs", ], - rbe_pool = "2core", + rbe_pool = "6gig", # The symbol table cluster memory tests take a while to run specially under tsan. deps = [ ":integration_lib", @@ -1534,7 +1534,7 @@ envoy_cc_test( name = "load_stats_integration_test", size = "large", srcs = ["load_stats_integration_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":http_integration_lib", "//test/config:utility_lib", @@ -1556,7 +1556,7 @@ envoy_cc_test( data = [ "//test/config/integration/certs", ], - rbe_pool = "2core", + rbe_pool = "6gig", tags = [ "cpu:3", ], @@ -1585,7 +1585,7 @@ envoy_cc_test( size = "large", srcs = ["header_prefix_integration_test.cc"], coverage = False, - rbe_pool = "2core", + rbe_pool = "6gig", tags = [ "cpu:3", ], @@ -1630,7 +1630,7 @@ envoy_cc_test( name = "overload_integration_test", size = "large", srcs = ["overload_integration_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", shard_count = 4, tags = [ "cpu:3", @@ -1653,7 +1653,7 @@ envoy_cc_test( srcs = envoy_select_admin_functionality([ "rtds_integration_test.cc", ]), - rbe_pool = "2core", + rbe_pool = "6gig", tags = [ "cpu:3", ], @@ -1669,7 +1669,7 @@ envoy_cc_test( name = "extension_discovery_integration_test", size = "large", srcs = ["extension_discovery_integration_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":http_integration_lib", "//source/extensions/filters/http/match_delegate:config", @@ -1692,7 +1692,7 @@ envoy_cc_test( name = "listener_extension_discovery_integration_test", size = "large", srcs = ["listener_extension_discovery_integration_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":http_integration_lib", "//source/extensions/filters/network/tcp_proxy:config", @@ -1709,7 +1709,7 @@ envoy_cc_test( name = "network_extension_discovery_integration_test", size = "large", srcs = ["network_extension_discovery_integration_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":http_integration_lib", "//source/extensions/filters/network/tcp_proxy:config", @@ -1740,7 +1740,7 @@ envoy_cc_test( data = [ "//test/config/integration/certs", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":http_integration_lib", "//source/common/event:dispatcher_includes", @@ -1767,7 +1767,7 @@ envoy_cc_test( "sds_dynamic_key_rotation_setup.sh", "//test/config/integration/certs", ], - rbe_pool = "2core", + rbe_pool = "6gig", # TODO(envoyproxy/windows-dev): The key rotation in SdsDynamicKeyRotationIntegrationTest via # TestEnvironment::renameFile() fails on Windows. The renameFile() implementation does not # correctly handle symlinks. @@ -1809,7 +1809,7 @@ envoy_cc_test( srcs = [ "sds_generic_secret_integration_test.cc", ], - rbe_pool = "2core", + rbe_pool = "6gig", tags = [ "cpu:3", ], @@ -1843,7 +1843,7 @@ envoy_cc_test( data = [ "//test/config/integration/certs", ], - rbe_pool = "2core", + rbe_pool = "6gig", tags = [ "cpu:3", ], @@ -1882,7 +1882,7 @@ envoy_cc_test( srcs = [ "tcp_proxy_many_connections_test.cc", ], - rbe_pool = "2core", + rbe_pool = "6gig", tags = [ "cpu:3", ], @@ -1915,7 +1915,7 @@ envoy_cc_test( data = [ "//test/config/integration/certs", ], - rbe_pool = "2core", + rbe_pool = "6gig", shard_count = 30, tags = [ "cpu:3", @@ -1945,7 +1945,7 @@ envoy_cc_test_library( hdrs = [ "tcp_tunneling_integration.h", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":http_integration_lib", ], @@ -1960,7 +1960,7 @@ envoy_cc_test( data = [ "//test/config/integration/certs", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":http_integration_lib", ":http_protocol_integration_lib", @@ -1984,7 +1984,7 @@ envoy_cc_test( srcs = [ "tcp_conn_pool_integration_test.cc", ], - rbe_pool = "2core", + rbe_pool = "6gig", tags = [ "cpu:3", ], @@ -2004,7 +2004,7 @@ envoy_cc_test( srcs = [ "tcp_async_client_integration_test.cc", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":integration_lib", "//test/integration/filters:test_network_async_tcp_filter_lib", @@ -2040,7 +2040,7 @@ envoy_cc_test( name = "tracked_watermark_buffer_test", size = "large", srcs = ["tracked_watermark_buffer_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":tracked_watermark_buffer_lib", "//test/mocks/http:stream_reset_handler_mock", @@ -2059,7 +2059,7 @@ envoy_cc_test( srcs = envoy_select_admin_functionality([ "uds_integration_test.cc", ]), - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":http_integration_lib", "//source/common/event:dispatcher_includes", @@ -2080,7 +2080,7 @@ envoy_cc_test( ["dynamic_validation_integration_test.cc"], ), data = ["//test/config/integration:server_xds_files"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = [ "cpu:3", ], @@ -2102,7 +2102,7 @@ envoy_cc_test( "//test/config/integration:server_xds_files", "//test/config/integration/certs", ], - rbe_pool = "2core", + rbe_pool = "6gig", tags = [ "cpu:3", ], @@ -2142,7 +2142,7 @@ envoy_cc_test( data = [ "//test/config/integration/certs", ], - rbe_pool = "2core", + rbe_pool = "6gig", tags = [ "cpu:3", ], @@ -2174,7 +2174,7 @@ envoy_cc_test_library( name = "h1_fuzz_lib", srcs = ["h1_fuzz.cc"], hdrs = ["h1_fuzz.h"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = H1_FUZZ_LIB_DEPS, ) @@ -2183,7 +2183,7 @@ envoy_cc_test_library( srcs = ["h1_fuzz.cc"], hdrs = ["h1_fuzz.h"], copts = ["-DPERSISTENT_FUZZER"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = H1_FUZZ_LIB_DEPS, ) @@ -2191,7 +2191,7 @@ envoy_cc_fuzz_test( name = "h1_capture_fuzz_test", srcs = ["h1_capture_fuzz_test.cc"], corpus = "h1_corpus", - rbe_pool = "2core", + rbe_pool = "6gig", deps = [":h1_fuzz_lib"], ) @@ -2200,7 +2200,7 @@ envoy_cc_fuzz_test( srcs = ["h1_capture_fuzz_test.cc"], copts = ["-DPERSISTENT_FUZZER"], corpus = "h1_corpus", - rbe_pool = "2core", + rbe_pool = "6gig", deps = [":h1_fuzz_persistent_lib"], ) @@ -2208,7 +2208,7 @@ envoy_cc_fuzz_test( name = "h1_capture_direct_response_fuzz_test", srcs = ["h1_capture_direct_response_fuzz_test.cc"], corpus = "h1_corpus", - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":h1_fuzz_lib", "@envoy_api//envoy/extensions/filters/network/http_connection_manager/v3:pkg_cc_proto", @@ -2220,7 +2220,7 @@ envoy_cc_fuzz_test( srcs = ["h1_capture_direct_response_fuzz_test.cc"], copts = ["-DPERSISTENT_FUZZER"], corpus = "h1_corpus", - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":h1_fuzz_persistent_lib", "@envoy_api//envoy/extensions/filters/network/http_connection_manager/v3:pkg_cc_proto", @@ -2243,7 +2243,7 @@ envoy_cc_test_library( name = "h2_fuzz_lib", srcs = ["h2_fuzz.cc"], hdrs = ["h2_fuzz.h"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = H2_FUZZ_LIB_DEPS, ) @@ -2252,7 +2252,7 @@ envoy_cc_test_library( srcs = ["h2_fuzz.cc"], hdrs = ["h2_fuzz.h"], copts = ["-DPERSISTENT_FUZZER"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = H2_FUZZ_LIB_DEPS, ) @@ -2260,7 +2260,7 @@ envoy_cc_fuzz_test( name = "h2_capture_fuzz_test", srcs = ["h2_capture_fuzz_test.cc"], corpus = "h2_corpus", - rbe_pool = "2core", + rbe_pool = "6gig", deps = [":h2_fuzz_lib"], ) @@ -2269,7 +2269,7 @@ envoy_cc_fuzz_test( srcs = ["h2_capture_fuzz_test.cc"], copts = ["-DPERSISTENT_FUZZER"], corpus = "h2_corpus", - rbe_pool = "2core", + rbe_pool = "6gig", deps = [":h2_fuzz_persistent_lib"], ) @@ -2277,7 +2277,7 @@ envoy_cc_fuzz_test( name = "h2_capture_direct_response_fuzz_test", srcs = ["h2_capture_direct_response_fuzz_test.cc"], corpus = "h2_corpus", - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":h2_fuzz_lib", "@envoy_api//envoy/extensions/filters/network/http_connection_manager/v3:pkg_cc_proto", @@ -2289,7 +2289,7 @@ envoy_cc_fuzz_test( srcs = ["h2_capture_direct_response_fuzz_test.cc"], copts = ["-DPERSISTENT_FUZZER"], corpus = "h2_corpus", - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":h2_fuzz_persistent_lib", "@envoy_api//envoy/extensions/filters/network/http_connection_manager/v3:pkg_cc_proto", @@ -2311,7 +2311,7 @@ envoy_cc_test_library( envoy_cc_test( name = "scoped_rds_lib", size = "large", - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":http_integration_lib", ":scoped_rds_test_lib", @@ -2333,7 +2333,7 @@ envoy_cc_test( srcs = [ "scoped_rds_integration_test.cc", ], - rbe_pool = "2core", + rbe_pool = "6gig", tags = [ "cpu:3", ], @@ -2397,7 +2397,7 @@ envoy_cc_test( name = "cx_limit_integration_test", size = "large", srcs = ["cx_limit_integration_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = [ "cpu:3", ], @@ -2416,7 +2416,7 @@ envoy_cc_test( name = "direct_response_integration_test", size = "large", srcs = ["direct_response_integration_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = [ "cpu:2", ], @@ -2431,7 +2431,7 @@ envoy_cc_test( srcs = [ "local_reply_integration_test.cc", ], - rbe_pool = "2core", + rbe_pool = "6gig", tags = [ "cpu:2", ], @@ -2448,7 +2448,7 @@ envoy_cc_test( srcs = [ "command_formatter_extension_integration_test.cc", ], - rbe_pool = "2core", + rbe_pool = "6gig", tags = [ "cpu:3", ], @@ -2463,7 +2463,7 @@ envoy_cc_test( name = "health_check_integration_test", size = "large", srcs = ["health_check_integration_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = [ "cpu:3", ], @@ -2483,7 +2483,7 @@ envoy_cc_test( srcs = [ "cluster_upstream_extension_integration_test.cc", ], - rbe_pool = "2core", + rbe_pool = "6gig", tags = [ "cpu:3", ], @@ -2509,7 +2509,7 @@ envoy_cc_test( "//conditions:default": ["quic_protocol_integration_test.cc"], }), data = ["//test/config/integration/certs"], - rbe_pool = "2core", + rbe_pool = "6gig", shard_count = 16, tags = [ "cpu:4", @@ -2541,7 +2541,7 @@ envoy_cc_test( "//conditions:default": ["quic_http_integration_test.cc"], }), data = ["//test/config/integration/certs"], - rbe_pool = "2core", + rbe_pool = "6gig", # TODO(envoyproxy/windows-dev): Diagnose failure shown only on clang-cl build, see: # https://gist.github.com/wrowe/a152cb1d12c2f751916122aed39d8517 # TODO(envoyproxy/windows-dev): Diagnose timeout, why opt build test under Windows GCP RBE @@ -2590,7 +2590,7 @@ envoy_cc_test( srcs = [ "original_ip_detection_integration_test.cc", ], - rbe_pool = "2core", + rbe_pool = "6gig", tags = [ "cpu:3", ], @@ -2608,7 +2608,7 @@ envoy_cc_test( srcs = [ "access_log_integration_test.cc", ], - rbe_pool = "2core", + rbe_pool = "6gig", tags = [ "cpu:3", ], @@ -2623,7 +2623,7 @@ envoy_cc_test( name = "weighted_cluster_integration_test", size = "large", srcs = ["weighted_cluster_integration_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = [ "cpu:3", ], @@ -2663,7 +2663,7 @@ envoy_cc_test( srcs = [ "typed_metadata_integration_test.cc", ], - rbe_pool = "2core", + rbe_pool = "6gig", tags = [ "cpu:3", ], @@ -2685,7 +2685,7 @@ envoy_cc_test( data = [ "//test/config/integration/certs", ], - rbe_pool = "2core", + rbe_pool = "6gig", tags = [ "cpu:3", ], @@ -2710,7 +2710,7 @@ envoy_cc_test( "xds_delegate_extension_integration_test.cc", ]), external_deps = ["abseil_strings"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = [ "cpu:3", ], @@ -2736,7 +2736,7 @@ envoy_cc_test( size = "large", srcs = ["xds_config_tracker_integration_test.cc"], external_deps = ["abseil_strings"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = [ "cpu:3", ], @@ -2766,7 +2766,7 @@ envoy_cc_test( srcs = [ "default_header_validator_integration_test.cc", ], - rbe_pool = "2core", + rbe_pool = "6gig", shard_count = 8, tags = [ "cpu:3", diff --git a/test/integration/admin_html/BUILD b/test/integration/admin_html/BUILD index afb46a4580..298eae4077 100644 --- a/test/integration/admin_html/BUILD +++ b/test/integration/admin_html/BUILD @@ -16,7 +16,7 @@ envoy_cc_test_binary( external_deps = [ "abseil_symbolize", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/exe:envoy_main_common_with_core_extensions_lib", "//source/exe:platform_impl_lib", @@ -38,7 +38,7 @@ envoy_sh_test( "//source/server/admin/html:admin_web_files", "//test/integration:test_utility.sh", ], - rbe_pool = "2core", + rbe_pool = "6gig", # This test fails on windows trying to poll the server for the admin # address. Failure is: diff --git a/test/integration/python/BUILD b/test/integration/python/BUILD index f04ac587f8..5fee9408ca 100644 --- a/test/integration/python/BUILD +++ b/test/integration/python/BUILD @@ -27,7 +27,7 @@ envoy_py_test( "//tools/h3_request", ], exec_properties = select({ - "//bazel:engflow_rbe": {"Pool": "2core"}, + "//bazel:engflow_rbe": {"Pool": "6gig"}, "//conditions:default": {}, }), main = select({ diff --git a/test/mocks/grpc/BUILD b/test/mocks/grpc/BUILD index ff6d35be33..2deb35bac9 100644 --- a/test/mocks/grpc/BUILD +++ b/test/mocks/grpc/BUILD @@ -12,7 +12,7 @@ envoy_cc_mock( name = "grpc_mocks", srcs = ["mocks.cc"], hdrs = ["mocks.h"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/grpc:async_client_interface", "//envoy/grpc:async_client_manager_interface", diff --git a/test/mocks/http/BUILD b/test/mocks/http/BUILD index c9a71ae00a..012d32a91d 100644 --- a/test/mocks/http/BUILD +++ b/test/mocks/http/BUILD @@ -31,7 +31,7 @@ envoy_cc_mock( name = "conn_pool_mocks", srcs = ["conn_pool.cc"], hdrs = ["conn_pool.h"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/http:conn_pool_interface", "//test/mocks:common_lib", @@ -55,7 +55,7 @@ envoy_cc_mock( external_deps = [ "abseil_strings", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":conn_pool_mocks", ":stream_decoder_mock", @@ -123,7 +123,7 @@ envoy_cc_mock( envoy_cc_test( name = "http_mocks_test", srcs = ["mocks_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":http_mocks", "//envoy/http:header_map_interface", diff --git a/test/mocks/network/BUILD b/test/mocks/network/BUILD index 27069b13a1..5791d51760 100644 --- a/test/mocks/network/BUILD +++ b/test/mocks/network/BUILD @@ -13,7 +13,7 @@ envoy_cc_mock( name = "connection_mocks", srcs = ["connection.cc"], hdrs = ["connection.h"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/network:connection_interface", "//source/common/network:filter_manager_lib", @@ -53,7 +53,7 @@ envoy_cc_mock( name = "network_mocks", srcs = ["mocks.cc"], hdrs = ["mocks.h"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":connection_mocks", ":io_handle_mocks", diff --git a/test/mocks/router/BUILD b/test/mocks/router/BUILD index 17e0b9958b..1ae14c11f6 100644 --- a/test/mocks/router/BUILD +++ b/test/mocks/router/BUILD @@ -12,7 +12,7 @@ envoy_cc_mock( name = "router_mocks", srcs = ["mocks.cc"], hdrs = ["mocks.h"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/event:dispatcher_interface", "//envoy/http:stateful_session_interface", @@ -43,7 +43,7 @@ envoy_cc_mock( name = "router_filter_interface", srcs = ["router_filter_interface.cc"], hdrs = ["router_filter_interface.h"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/router:router_lib", "//test/mocks/http:http_mocks", diff --git a/test/mocks/server/BUILD b/test/mocks/server/BUILD index 593872efaa..ba7bfff398 100644 --- a/test/mocks/server/BUILD +++ b/test/mocks/server/BUILD @@ -61,7 +61,7 @@ envoy_cc_mock( name = "admin_stream_mocks", srcs = ["admin_stream.cc"], hdrs = ["admin_stream.h"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/server:admin_interface", "//test/mocks/http:http_mocks", @@ -120,7 +120,7 @@ envoy_cc_mock( name = "listener_component_factory_mocks", srcs = ["listener_component_factory.cc"], hdrs = ["listener_component_factory.h"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/server:drain_manager_interface", "//envoy/server:listener_manager_interface", @@ -182,7 +182,7 @@ envoy_cc_mock( name = "instance_mocks", srcs = ["instance.cc"], hdrs = ["instance.h"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":server_factory_context_mocks", ":transport_socket_factory_context_mocks", @@ -203,7 +203,7 @@ envoy_cc_mock( name = "server_factory_context_mocks", srcs = ["server_factory_context.cc"], hdrs = ["server_factory_context.h"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":admin_mocks", ":drain_manager_mocks", @@ -241,7 +241,7 @@ envoy_cc_mock( name = "factory_context_mocks", srcs = ["factory_context.cc"], hdrs = ["factory_context.h"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":drain_manager_mocks", ":instance_mocks", @@ -255,7 +255,7 @@ envoy_cc_mock( name = "transport_socket_factory_context_mocks", srcs = ["transport_socket_factory_context.cc"], hdrs = ["transport_socket_factory_context.h"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":server_factory_context_mocks", "//envoy/server:tracer_config_interface", @@ -268,7 +268,7 @@ envoy_cc_mock( name = "listener_factory_context_mocks", srcs = ["listener_factory_context.cc"], hdrs = ["listener_factory_context.h"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":factory_context_mocks", "//envoy/server:listener_manager_interface", @@ -279,7 +279,7 @@ envoy_cc_mock( name = "health_checker_factory_context_mocks", srcs = ["health_checker_factory_context.cc"], hdrs = ["health_checker_factory_context.h"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":factory_context_mocks", "//envoy/server:health_checker_config_interface", @@ -300,7 +300,7 @@ envoy_cc_mock( name = "filter_chain_factory_context_mocks", srcs = ["filter_chain_factory_context.cc"], hdrs = ["filter_chain_factory_context.h"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":factory_context_mocks", "//envoy/server:filter_config_interface", @@ -322,7 +322,7 @@ envoy_cc_mock( name = "tracer_factory_context_mocks", srcs = ["tracer_factory_context.cc"], hdrs = ["tracer_factory_context.h"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":instance_mocks", ":tracer_factory_mocks", diff --git a/test/mocks/stream_info/BUILD b/test/mocks/stream_info/BUILD index de1335898f..c878bba5f5 100644 --- a/test/mocks/stream_info/BUILD +++ b/test/mocks/stream_info/BUILD @@ -12,7 +12,7 @@ envoy_cc_mock( name = "stream_info_mocks", srcs = ["mocks.cc"], hdrs = ["mocks.h"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/http:request_id_extension_interface", "//envoy/stream_info:stream_info_interface", diff --git a/test/mocks/tcp/BUILD b/test/mocks/tcp/BUILD index f8e600d132..22c6cbb4a5 100644 --- a/test/mocks/tcp/BUILD +++ b/test/mocks/tcp/BUILD @@ -12,7 +12,7 @@ envoy_cc_mock( name = "tcp_mocks", srcs = ["mocks.cc"], hdrs = ["mocks.h"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/buffer:buffer_interface", "//envoy/tcp:conn_pool_interface", diff --git a/test/mocks/upstream/BUILD b/test/mocks/upstream/BUILD index 17fb6fe7ab..9f84496323 100644 --- a/test/mocks/upstream/BUILD +++ b/test/mocks/upstream/BUILD @@ -38,7 +38,7 @@ envoy_cc_mock( name = "host_mocks", srcs = ["host.cc"], hdrs = ["host.h"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":cluster_info_mocks", "//envoy/upstream:upstream_interface", @@ -198,7 +198,7 @@ envoy_cc_mock( name = "load_balancer_mocks", srcs = ["load_balancer.cc"], hdrs = ["load_balancer.h"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/upstream:load_balancer_interface", "//test/mocks/upstream:host_mocks", @@ -228,7 +228,7 @@ envoy_cc_mock( name = "thread_local_cluster_mocks", srcs = ["thread_local_cluster.cc"], hdrs = ["thread_local_cluster.h"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/upstream:thread_local_cluster_interface", "//test/mocks/http:conn_pool_mocks", @@ -264,7 +264,7 @@ envoy_cc_mock( name = "cluster_manager_mocks", srcs = ["cluster_manager.cc"], hdrs = ["cluster_manager.h"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/upstream:cluster_manager_interface", "//test/mocks/config:config_mocks", diff --git a/test/server/BUILD b/test/server/BUILD index 0a5fb1af2b..ff721ba8fd 100644 --- a/test/server/BUILD +++ b/test/server/BUILD @@ -19,7 +19,7 @@ envoy_package() envoy_cc_test( name = "api_listener_test", srcs = ["api_listener_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":utility_lib", "//source/common/listener_manager:listener_manager_lib", @@ -37,7 +37,7 @@ envoy_cc_test( envoy_cc_test( name = "backtrace_test", srcs = ["backtrace_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["backtrace"], deps = [ "//source/server:backtrace_lib", @@ -51,7 +51,7 @@ envoy_cc_test( data = [ "//test/config/integration/certs", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/api:api_lib", "//source/common/event:dispatcher_lib", @@ -81,7 +81,7 @@ envoy_cc_test( envoy_cc_test( name = "connection_handler_test", srcs = ["connection_handler_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/common:utility_lib", "//source/common/config:utility_lib", @@ -105,7 +105,7 @@ envoy_cc_test( envoy_cc_test( name = "active_tcp_listener_test", srcs = ["active_tcp_listener_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/common:utility_lib", "//source/common/config:utility_lib", @@ -122,7 +122,7 @@ envoy_cc_test( envoy_cc_test( name = "active_udp_listener_test", srcs = ["active_udp_listener_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/network:listen_socket_lib", "//source/common/network:socket_option_factory_lib", @@ -137,7 +137,7 @@ envoy_cc_test( envoy_cc_test( name = "drain_manager_impl_test", srcs = ["drain_manager_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/server:drain_manager_lib", "//test/mocks/event:event_mocks", @@ -149,7 +149,7 @@ envoy_cc_test( envoy_cc_test( name = "filter_config_test", srcs = ["filter_config_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/server:filter_config_interface", "//source/extensions/filters/http/common:pass_through_filter_lib", @@ -168,7 +168,7 @@ envoy_cc_test_library( envoy_cc_test( name = "hot_restart_impl_test", srcs = envoy_select_hot_restart(["hot_restart_impl_test.cc"]), - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":hot_restart_udp_forwarding_test_helper", ":utility_lib", @@ -184,7 +184,7 @@ envoy_cc_test( envoy_cc_test( name = "hot_restarting_child_test", srcs = envoy_select_hot_restart(["hot_restarting_child_test.cc"]), - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":hot_restart_udp_forwarding_test_helper", ":utility_lib", @@ -201,7 +201,7 @@ envoy_cc_test( envoy_cc_test( name = "hot_restarting_parent_test", srcs = envoy_select_hot_restart(["hot_restarting_parent_test.cc"]), - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":utility_lib", "//source/common/stats:stats_lib", @@ -215,7 +215,7 @@ envoy_cc_test( envoy_cc_test( name = "hot_restarting_base_test", srcs = envoy_select_hot_restart(["hot_restarting_base_test.cc"]), - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/server:hot_restart_lib", "//source/server:hot_restarting_base", @@ -229,7 +229,7 @@ envoy_cc_test( name = "guarddog_impl_test", size = "small", srcs = ["guarddog_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":guarddog_test_interlock", "//envoy/common:time_interface", @@ -259,7 +259,7 @@ envoy_cc_test_library( envoy_cc_test( name = "options_impl_test", srcs = ["options_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/config:typed_config_interface", "//envoy/server:filter_config_interface", @@ -283,7 +283,7 @@ envoy_cc_test( envoy_cc_test( name = "overload_manager_impl_test", srcs = ["overload_manager_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/registry", "//source/common/stats:isolated_store_lib", @@ -304,7 +304,7 @@ envoy_cc_test( envoy_cc_test( name = "null_overload_manager_test", srcs = ["null_overload_manager_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/server:null_overload_manager_lib", "//source/server:overload_manager_lib", @@ -318,7 +318,7 @@ envoy_cc_fuzz_test( size = "large", srcs = ["server_fuzz_test.cc"], corpus = "server_corpus", - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/thread_local:thread_local_lib", "//source/server:server_lib", @@ -357,7 +357,7 @@ envoy_cc_test( ":server_test_data", ":static_validation_test_data", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/version:version_lib", "//source/extensions/access_loggers/file:config", @@ -405,7 +405,7 @@ envoy_cc_test_library( envoy_cc_test( name = "worker_impl_test", srcs = ["worker_impl_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/api:api_lib", "//source/common/event:dispatcher_lib", @@ -426,7 +426,7 @@ envoy_cc_benchmark_binary( external_deps = [ "benchmark", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/stats:stats_interface", "//source/common/stats:thread_local_store_lib", @@ -444,7 +444,7 @@ envoy_benchmark_test( envoy_cc_test( name = "utils_test", srcs = envoy_select_admin_functionality(["utils_test.cc"]), - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/server:utils_lib", "//test/mocks/server:options_mocks", diff --git a/test/server/admin/BUILD b/test/server/admin/BUILD index 650f0618f2..a2b5f1f235 100644 --- a/test/server/admin/BUILD +++ b/test/server/admin/BUILD @@ -15,7 +15,7 @@ envoy_package() envoy_cc_test( name = "admin_html_util_test", srcs = ["admin_html_util_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/server/admin:admin_html_util", "//test/test_common:utility_lib", @@ -25,7 +25,7 @@ envoy_cc_test( envoy_cc_test( name = "admin_factory_context_test", srcs = ["admin_factory_context_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/listener_manager:listener_info_lib", "//source/server/admin:admin_factory_context", @@ -37,7 +37,7 @@ envoy_cc_test_library( name = "admin_instance_lib", srcs = envoy_select_admin_functionality(["admin_instance.cc"]), hdrs = envoy_select_admin_functionality(["admin_instance.h"]), - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/server:configuration_lib", "//source/server/admin:admin_lib", @@ -52,7 +52,7 @@ envoy_cc_test_library( envoy_cc_test( name = "admin_test", srcs = envoy_select_admin_functionality(["admin_test.cc"]), - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":admin_instance_lib", "//envoy/json:json_object_interface", @@ -76,7 +76,7 @@ envoy_cc_test( envoy_cc_test( name = "admin_filter_test", srcs = envoy_select_admin_functionality(["admin_filter_test.cc"]), - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/server/admin:admin_lib", "//test/mocks/server:instance_mocks", @@ -87,7 +87,7 @@ envoy_cc_test( envoy_cc_test( name = "admin_html_test", srcs = envoy_select_admin_html(["admin_html_test.cc"]), - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":admin_instance_lib", "//source/server/admin:admin_lib", @@ -97,7 +97,7 @@ envoy_cc_test( envoy_cc_test( name = "stats_handler_test", srcs = envoy_select_admin_functionality(["stats_handler_test.cc"]), - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":admin_instance_lib", "//source/common/common:regex_lib", @@ -116,7 +116,7 @@ envoy_cc_test( envoy_cc_test( name = "stats_params_test", srcs = envoy_select_admin_functionality(["stats_params_test.cc"]), - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/buffer:buffer_lib", "//source/server/admin:stats_params_lib", @@ -128,7 +128,7 @@ envoy_cc_test( srcs = envoy_select_admin_functionality(["stats_render_test.cc"]) + envoy_select_admin_html([ "stats_html_render_test.cc", ]), - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":stats_render_test_base", "//source/server/admin:admin_lib", @@ -152,7 +152,7 @@ envoy_cc_test_library( envoy_cc_test( name = "stats_request_test", srcs = envoy_select_admin_functionality(["stats_request_test.cc"]), - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/stats:thread_local_store_lib", "//source/server/admin:stats_request_lib", @@ -168,7 +168,7 @@ envoy_cc_test( envoy_cc_benchmark_binary( name = "stats_handler_speed_test", srcs = envoy_select_admin_functionality(["stats_handler_speed_test.cc"]), - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/buffer:buffer_lib", "//source/common/http:header_map_lib", @@ -182,7 +182,7 @@ envoy_cc_benchmark_binary( envoy_cc_test( name = "utils_test", srcs = envoy_select_admin_functionality(["utils_test.cc"]), - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/server/admin:utils_lib", ], @@ -191,14 +191,14 @@ envoy_cc_test( envoy_cc_test( name = "runtime_handler_test", srcs = envoy_select_admin_functionality(["runtime_handler_test.cc"]), - rbe_pool = "2core", + rbe_pool = "6gig", deps = [":admin_instance_lib"], ) envoy_cc_test( name = "prometheus_stats_test", srcs = envoy_select_admin_functionality(["prometheus_stats_test.cc"]), - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/stats:tag_producer_lib", "//source/common/stats:thread_local_store_lib", @@ -212,7 +212,7 @@ envoy_cc_test( envoy_cc_test( name = "logs_handler_test", srcs = envoy_select_admin_functionality(["logs_handler_test.cc"]), - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":admin_instance_lib", "//source/common/common:minimal_logger_lib", @@ -222,7 +222,7 @@ envoy_cc_test( envoy_cc_test( name = "profiling_handler_test", srcs = envoy_select_admin_functionality(["profiling_handler_test.cc"]), - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":admin_instance_lib", "//test/test_common:logging_lib", @@ -232,7 +232,7 @@ envoy_cc_test( envoy_cc_test( name = "server_info_handler_test", srcs = envoy_select_admin_functionality(["server_info_handler_test.cc"]), - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":admin_instance_lib", "//source/common/tls:context_config_lib", @@ -245,7 +245,7 @@ envoy_cc_test( envoy_cc_test( name = "clusters_handler_test", srcs = envoy_select_admin_functionality(["clusters_handler_test.cc"]), - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":admin_instance_lib", "//test/common/upstream:utility_lib", @@ -257,7 +257,7 @@ envoy_cc_test( envoy_cc_test( name = "config_dump_handler_test", srcs = envoy_select_admin_functionality(["config_dump_handler_test.cc"]), - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":admin_instance_lib", "//test/integration/filters:test_listener_filter_lib", @@ -268,7 +268,7 @@ envoy_cc_test( envoy_cc_test( name = "init_dump_handler_test", srcs = envoy_select_admin_functionality(["init_dump_handler_test.cc"]), - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":admin_instance_lib", ], @@ -277,7 +277,7 @@ envoy_cc_test( envoy_cc_test( name = "config_tracker_impl_test", srcs = envoy_select_admin_functionality(["config_tracker_impl_test.cc"]), - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/common:matchers_lib", "//source/server/admin:config_tracker_lib", diff --git a/test/server/config_validation/BUILD b/test/server/config_validation/BUILD index 6de2607f10..7560e35268 100644 --- a/test/server/config_validation/BUILD +++ b/test/server/config_validation/BUILD @@ -9,7 +9,7 @@ envoy_package() envoy_cc_test( name = "cluster_manager_test", srcs = ["cluster_manager_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//envoy/upstream:resource_manager_interface", "//envoy/upstream:upstream_interface", @@ -50,7 +50,7 @@ envoy_cc_test( "//test/config_test:example_configs_test_setup.sh", ], env = {"EXAMPLE_CONFIGS_TAR_PATH": "envoy/configs/example_configs.tar"}, - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/extensions/access_loggers/stream:config", "//source/extensions/clusters/logical_dns:logical_dns_cluster_lib", @@ -76,7 +76,7 @@ envoy_cc_test( envoy_cc_test( name = "dispatcher_test", srcs = ["dispatcher_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/event:libevent_lib", "//source/common/stats:isolated_store_lib", @@ -93,7 +93,7 @@ envoy_cc_fuzz_test( size = "large", srcs = ["config_fuzz_test.cc"], corpus = "//test/server:server_fuzz_test_corpus", - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//source/common/common:thread_lib", "//source/server/config_validation:server_lib", @@ -135,7 +135,7 @@ envoy_cc_test_library( envoy_cc_test( name = "xds_verifier_test", srcs = ["xds_verifier_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":xds_verifier_lib", "//test/config:utility_lib", @@ -146,7 +146,7 @@ envoy_cc_test_library( name = "xds_fuzz_lib", srcs = ["xds_fuzz.cc"], hdrs = ["xds_fuzz.h"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":xds_fuzz_proto_cc_proto", ":xds_verifier_lib", @@ -167,7 +167,7 @@ envoy_cc_fuzz_test( size = "large", srcs = ["xds_fuzz_test.cc"], corpus = "xds_corpus", - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":xds_fuzz_lib", "//source/common/protobuf:utility_lib", diff --git a/test/test_common/BUILD b/test/test_common/BUILD index 591dfce179..3b8d9aeace 100644 --- a/test/test_common/BUILD +++ b/test/test_common/BUILD @@ -70,7 +70,7 @@ envoy_cc_test_library( envoy_cc_test( name = "network_utility_test", srcs = ["network_utility_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":environment_lib", ":network_utility_lib", @@ -210,7 +210,7 @@ envoy_cc_test_library( envoy_cc_test( name = "utility_test", srcs = ["utility_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":utility_lib", "@envoy_api//envoy/service/discovery/v3:pkg_cc_proto", @@ -248,7 +248,7 @@ envoy_cc_library( envoy_cc_test( name = "global_test", srcs = ["global_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":global_lib", ], @@ -316,7 +316,7 @@ envoy_cc_test_library( envoy_cc_test( name = "status_utility_test", srcs = ["status_utility_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":status_utility_lib", ], @@ -325,7 +325,7 @@ envoy_cc_test( envoy_cc_test( name = "simulated_time_system_test", srcs = ["simulated_time_system_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":simulated_time_system_lib", ":utility_lib", @@ -338,7 +338,7 @@ envoy_cc_test( envoy_cc_test( name = "test_time_system_test", srcs = ["test_time_system_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":simulated_time_system_lib", ":test_time_lib", diff --git a/test/tools/config_load_check/BUILD b/test/tools/config_load_check/BUILD index 23d1e63513..84564f3a68 100644 --- a/test/tools/config_load_check/BUILD +++ b/test/tools/config_load_check/BUILD @@ -20,7 +20,7 @@ envoy_cc_test_library( envoy_cc_test_binary( name = "config_load_check_tool", - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":config_load_check_lib", "//source/common/common:minimal_logger_lib", diff --git a/test/tools/router_check/BUILD b/test/tools/router_check/BUILD index c34cfcc732..5046b3c249 100644 --- a/test/tools/router_check/BUILD +++ b/test/tools/router_check/BUILD @@ -17,7 +17,7 @@ envoy_cc_test_binary( name = "router_check_tool", srcs = ["router_check.cc"], linkstatic = envoy_select_linkstatic(), - rbe_pool = "2core", + rbe_pool = "6gig", deps = [":router_check_main_lib"] + select({ "//bazel:coverage_build": [], "//bazel:windows_x86_64": envoy_all_extensions(WINDOWS_SKIP_TARGETS), @@ -38,7 +38,7 @@ envoy_cc_test_library( ], copts = ["-DHAVE_LONG_LONG"], external_deps = ["tclap"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ ":validation_proto_cc_proto", "//source/common/common:random_generator_lib", diff --git a/test/tools/router_check/test/BUILD b/test/tools/router_check/test/BUILD index d32e57e44d..eb3e795e53 100644 --- a/test/tools/router_check/test/BUILD +++ b/test/tools/router_check/test/BUILD @@ -17,7 +17,7 @@ envoy_sh_test( data = [ ":configs", ], - rbe_pool = "2core", + rbe_pool = "6gig", tags = ["nocoverage"], ) @@ -27,7 +27,7 @@ envoy_cc_test( data = [ ":configs", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//test/tools/router_check:router_check_main_lib", ], diff --git a/test/tools/schema_validator/BUILD b/test/tools/schema_validator/BUILD index 12a860364c..476f4e1f4a 100644 --- a/test/tools/schema_validator/BUILD +++ b/test/tools/schema_validator/BUILD @@ -14,7 +14,7 @@ envoy_package() envoy_cc_test_binary( name = "schema_validator_tool", srcs = ["schema_validator.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [":schema_validator_lib"] + select({ "//bazel:windows_x86_64": envoy_all_extensions(WINDOWS_SKIP_TARGETS), "//bazel:linux_ppc": envoy_all_extensions(PPC_SKIP_TARGETS), diff --git a/test/tools/schema_validator/test/BUILD b/test/tools/schema_validator/test/BUILD index 7e359a4640..779951bbc0 100644 --- a/test/tools/schema_validator/test/BUILD +++ b/test/tools/schema_validator/test/BUILD @@ -14,7 +14,7 @@ envoy_cc_test( data = [ ":configs", ], - rbe_pool = "2core", + rbe_pool = "6gig", deps = [ "//test/tools/schema_validator:schema_validator_lib", ], diff --git a/test/tools/type_whisperer/BUILD b/test/tools/type_whisperer/BUILD index d889e4a61b..939c744bcb 100644 --- a/test/tools/type_whisperer/BUILD +++ b/test/tools/type_whisperer/BUILD @@ -7,7 +7,7 @@ envoy_package() envoy_cc_test( name = "api_type_db_test", srcs = ["api_type_db_test.cc"], - rbe_pool = "2core", + rbe_pool = "6gig", # MSVC does not allow strings over a certain length, see error C2026 tags = [ "no-remote-exec", From 202354cb8cdc697926128029c8e0f4b08bf8ea21 Mon Sep 17 00:00:00 2001 From: phlax Date: Wed, 23 Oct 2024 15:18:57 +0100 Subject: [PATCH 05/41] ci/tests: Revert some integration tests to `2core` (#36784) Signed-off-by: Ryan Northey --- test/common/http/BUILD | 2 +- test/integration/BUILD | 14 +++++++------- test/integration/python/BUILD | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/test/common/http/BUILD b/test/common/http/BUILD index e537b9de8c..9cd75bde6e 100644 --- a/test/common/http/BUILD +++ b/test/common/http/BUILD @@ -282,7 +282,7 @@ envoy_cc_test( "conn_manager_impl_test.cc", "conn_manager_impl_test_2.cc", ], - rbe_pool = "6gig", + rbe_pool = "2core", deps = [ ":conn_manager_impl_test_base_lib", ":custom_header_extension_lib", diff --git a/test/integration/BUILD b/test/integration/BUILD index 318ff55f28..c0dc22206a 100644 --- a/test/integration/BUILD +++ b/test/integration/BUILD @@ -136,7 +136,7 @@ envoy_cc_test( data = [ "//test/config/integration/certs", ], - rbe_pool = "6gig", + rbe_pool = "2core", shard_count = 4, tags = [ "cpu:3", @@ -510,7 +510,7 @@ envoy_cc_test( srcs = [ "http2_flood_integration_test.cc", ], - rbe_pool = "6gig", + rbe_pool = "2core", shard_count = 6, tags = [ "cpu:3", @@ -1037,7 +1037,7 @@ envoy_cc_test( name = "idle_timeout_integration_test", size = "large", srcs = ["idle_timeout_integration_test.cc"], - rbe_pool = "6gig", + rbe_pool = "2core", # As this test has many pauses for idle timeouts, it takes a while to run. # Shard it enough to bring the run time in line with other integration tests. shard_count = 8, @@ -1915,7 +1915,7 @@ envoy_cc_test( data = [ "//test/config/integration/certs", ], - rbe_pool = "6gig", + rbe_pool = "2core", shard_count = 30, tags = [ "cpu:3", @@ -2004,7 +2004,7 @@ envoy_cc_test( srcs = [ "tcp_async_client_integration_test.cc", ], - rbe_pool = "6gig", + rbe_pool = "2core", deps = [ ":integration_lib", "//test/integration/filters:test_network_async_tcp_filter_lib", @@ -2102,7 +2102,7 @@ envoy_cc_test( "//test/config/integration:server_xds_files", "//test/config/integration/certs", ], - rbe_pool = "6gig", + rbe_pool = "2core", tags = [ "cpu:3", ], @@ -2416,7 +2416,7 @@ envoy_cc_test( name = "direct_response_integration_test", size = "large", srcs = ["direct_response_integration_test.cc"], - rbe_pool = "6gig", + rbe_pool = "2core", tags = [ "cpu:2", ], diff --git a/test/integration/python/BUILD b/test/integration/python/BUILD index 5fee9408ca..f04ac587f8 100644 --- a/test/integration/python/BUILD +++ b/test/integration/python/BUILD @@ -27,7 +27,7 @@ envoy_py_test( "//tools/h3_request", ], exec_properties = select({ - "//bazel:engflow_rbe": {"Pool": "6gig"}, + "//bazel:engflow_rbe": {"Pool": "2core"}, "//conditions:default": {}, }), main = select({ From d6389ace50fa7b11d64c947885165749795c5652 Mon Sep 17 00:00:00 2001 From: phlax Date: Mon, 21 Oct 2024 16:12:15 +0100 Subject: [PATCH 06/41] deps/release: Bump Ubuntu -> 0e5e4a5 (#36723) Signed-off-by: Ryan Northey Signed-off-by: phlax --- ci/Dockerfile-envoy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/Dockerfile-envoy b/ci/Dockerfile-envoy index 1677f988c1..7d7f0b0262 100644 --- a/ci/Dockerfile-envoy +++ b/ci/Dockerfile-envoy @@ -1,5 +1,5 @@ ARG BUILD_OS=ubuntu -ARG BUILD_TAG=22.04@sha256:58b87898e82351c6cf9cf5b9f3c20257bb9e2dcf33af051e12ce532d7f94e3fe +ARG BUILD_TAG=22.04@sha256:0e5e4a57c2499249aafc3b40fcd541e9a456aab7296681a3994d631587203f97 ARG ENVOY_VRP_BASE_IMAGE=envoy-base From 5325e92a3648e455c35e49f3b6f39839b5edfe36 Mon Sep 17 00:00:00 2001 From: phlax Date: Thu, 24 Oct 2024 19:18:36 +0100 Subject: [PATCH 07/41] ci/rbe: Boost quic integration test (#36805) Signed-off-by: Ryan Northey --- test/integration/BUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/BUILD b/test/integration/BUILD index c0dc22206a..43a0777400 100644 --- a/test/integration/BUILD +++ b/test/integration/BUILD @@ -2509,7 +2509,7 @@ envoy_cc_test( "//conditions:default": ["quic_protocol_integration_test.cc"], }), data = ["//test/config/integration/certs"], - rbe_pool = "6gig", + rbe_pool = "2core", shard_count = 16, tags = [ "cpu:4", From 2fbf1b70447687e2277b7b4470fad33e97d9cf7d Mon Sep 17 00:00:00 2001 From: phlax Date: Thu, 24 Oct 2024 17:42:10 +0100 Subject: [PATCH 08/41] ci/codeql: Only run on main branch (#36806) this is currently triggering on the release branches codeql uses ci cache which is very limited and running this on multiple branches is expiring caches making this take a very long time Signed-off-by: Ryan Northey --- .github/workflows/codeql-push.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codeql-push.yml b/.github/workflows/codeql-push.yml index 1ac4207f92..acf0e9e884 100644 --- a/.github/workflows/codeql-push.yml +++ b/.github/workflows/codeql-push.yml @@ -8,9 +8,11 @@ on: paths: - include/** - source/common/** - branches-ignore: - - dependabot/** + branches: + - main pull_request: + branches: + - main concurrency: group: ${{ github.head_ref || github.run_id }}-${{ github.workflow }} From a7f7715f5ec39bfc36a9193a0a99fbd7efac70f2 Mon Sep 17 00:00:00 2001 From: phlax Date: Mon, 28 Oct 2024 11:20:54 +0000 Subject: [PATCH 09/41] bazel/ci: Add repo customizations (#36831) This allows per-repo configuration/customization of the bazel (eg rbe) settings Signed-off-by: Ryan Northey Signed-off-by: phlax --- .bazelrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bazelrc b/.bazelrc index 5f042f2d25..50bb1032ee 100644 --- a/.bazelrc +++ b/.bazelrc @@ -540,7 +540,6 @@ build:rbe-envoy-engflow --define=engflow_rbe=true build:remote-envoy-engflow --config=common-envoy-engflow build:remote-envoy-engflow --config=cache-envoy-engflow -build:remote-envoy-engflow --config=bes-envoy-engflow build:remote-envoy-engflow --config=rbe-envoy-engflow ############################################################################# @@ -565,6 +564,7 @@ common:debug --config=debug-sandbox common:debug --config=debug-coverage common:debug --config=debug-tests +try-import %workspace%/repo.bazelrc try-import %workspace%/clang.bazelrc try-import %workspace%/user.bazelrc try-import %workspace%/local_tsan.bazelrc From 418f3b1ab891d14c110132e10178282fdf4c5081 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 28 Oct 2024 08:49:43 +0000 Subject: [PATCH 10/41] build(deps): bump distroless/base-nossl-debian12 from `e130c09` to `aa91f01` in /ci (#36847) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Signed-off-by: Ryan Northey --- ci/Dockerfile-envoy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/Dockerfile-envoy b/ci/Dockerfile-envoy index 7d7f0b0262..ac6eb6ae77 100644 --- a/ci/Dockerfile-envoy +++ b/ci/Dockerfile-envoy @@ -58,7 +58,7 @@ COPY --chown=0:0 --chmod=755 \ # STAGE: envoy-distroless -FROM gcr.io/distroless/base-nossl-debian12:nonroot@sha256:e130c09889f3b6c05dacd52d2612c30811e04eefe3280a6659037cfdd018de6c AS envoy-distroless +FROM gcr.io/distroless/base-nossl-debian12:nonroot@sha256:aa91f01b56d02af049a3984dd5dd7c0ea39c97f398ac415cfc92b085bd63f6fd AS envoy-distroless EXPOSE 10000 ENTRYPOINT ["/usr/local/bin/envoy"] CMD ["-c", "/etc/envoy/envoy.yaml"] From 01727b5af96a6ce66403aecde647f310dae59ed6 Mon Sep 17 00:00:00 2001 From: phlax Date: Wed, 2 Oct 2024 18:33:22 +0100 Subject: [PATCH 11/41] ci: Fix coverage/docs upload redirect path (#36423) Signed-off-by: Ryan Northey Signed-off-by: phlax --- ci/do_ci.sh | 1 + ci/run_envoy_docker.sh | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/do_ci.sh b/ci/do_ci.sh index d4b0c5ebf6..72d193876e 100755 --- a/ci/do_ci.sh +++ b/ci/do_ci.sh @@ -57,6 +57,7 @@ FETCH_PROTO_TARGETS=( @com_github_bufbuild_buf//:bin/buf //tools/proto_format/...) + retry () { local n wait iterations wait="${1}" diff --git a/ci/run_envoy_docker.sh b/ci/run_envoy_docker.sh index 37a1e98882..7d90dbd820 100755 --- a/ci/run_envoy_docker.sh +++ b/ci/run_envoy_docker.sh @@ -157,15 +157,14 @@ docker run --rm \ -e ENVOY_PUBLISH_DRY_RUN \ -e ENVOY_REPO \ -e ENVOY_TARBALL_DIR \ - -e SYSTEM_PULLREQUEST_PULLREQUESTNUMBER \ -e GCS_ARTIFACT_BUCKET \ + -e GCS_REDIRECT_PATH \ -e GITHUB_REF_NAME \ -e GITHUB_REF_TYPE \ -e GITHUB_TOKEN \ -e GITHUB_APP_ID \ -e GITHUB_INSTALL_ID \ -e MOBILE_DOCS_CHECKOUT_DIR \ - -e BUILD_SOURCEBRANCHNAME \ -e BAZELISK_BASE_URL \ -e ENVOY_BUILD_ARCH \ -e SYSTEM_STAGEDISPLAYNAME \ From f1c0c6e8d9bcf61799855aaf114a1f879a2149b8 Mon Sep 17 00:00:00 2001 From: "publish-envoy[bot]" <140627008+publish-envoy[bot]@users.noreply.github.com> Date: Mon, 21 Oct 2024 09:38:04 +0000 Subject: [PATCH 12/41] repo: Release v1.31.3 **Summary of changes** - Minor tracing bug fix - CI and release container updates **Docker images**: https://hub.docker.com/r/envoyproxy/envoy/tags?page=1&name=v1.31.3 **Docs**: https://www.envoyproxy.io/docs/envoy/v1.31.3/ **Release notes**: https://www.envoyproxy.io/docs/envoy/v1.31.3/version_history/v1.31/v1.31.3 **Full changelog**: https://github.com/envoyproxy/envoy/compare/v1.31.2...v1.31.3 Signed-off-by: Kateryna Nezdolii Signed-off-by: Ryan Northey Signed-off-by: publish-envoy[bot] <140627008+publish-envoy[bot]@users.noreply.github.com> --- VERSION.txt | 2 +- changelogs/1.29.10.yaml | 6 ++++++ changelogs/1.30.7.yaml | 6 ++++++ changelogs/current.yaml | 16 +--------------- docs/inventories/v1.29/objects.inv | Bin 168427 -> 168441 bytes docs/inventories/v1.30/objects.inv | Bin 172187 -> 172251 bytes docs/inventories/v1.31/objects.inv | Bin 175670 -> 175768 bytes docs/versions.yaml | 6 +++--- 8 files changed, 17 insertions(+), 19 deletions(-) create mode 100644 changelogs/1.29.10.yaml create mode 100644 changelogs/1.30.7.yaml diff --git a/VERSION.txt b/VERSION.txt index 3f79d90534..d7f92f5886 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -1.31.3-dev +1.31.3 diff --git a/changelogs/1.29.10.yaml b/changelogs/1.29.10.yaml new file mode 100644 index 0000000000..5dc086dcaf --- /dev/null +++ b/changelogs/1.29.10.yaml @@ -0,0 +1,6 @@ +date: October 29, 2024 + +bug_fixes: +- area: tracing + change: | + Fixed a bug where the OpenTelemetry tracer exports the OTLP request even when no spans are present. diff --git a/changelogs/1.30.7.yaml b/changelogs/1.30.7.yaml new file mode 100644 index 0000000000..5dc086dcaf --- /dev/null +++ b/changelogs/1.30.7.yaml @@ -0,0 +1,6 @@ +date: October 29, 2024 + +bug_fixes: +- area: tracing + change: | + Fixed a bug where the OpenTelemetry tracer exports the OTLP request even when no spans are present. diff --git a/changelogs/current.yaml b/changelogs/current.yaml index d9aab1c275..5dc086dcaf 100644 --- a/changelogs/current.yaml +++ b/changelogs/current.yaml @@ -1,20 +1,6 @@ -date: Pending - -behavior_changes: -# *Changes that are expected to cause an incompatibility if applicable; deployment changes are likely required* - -minor_behavior_changes: -# *Changes that may cause incompatibilities for some users, but should not for most* +date: October 29, 2024 bug_fixes: -# *Changes expected to improve the state of the world and are unlikely to have negative effects* - area: tracing change: | Fixed a bug where the OpenTelemetry tracer exports the OTLP request even when no spans are present. - -removed_config_or_runtime: -# *Normally occurs at the end of the* :ref:`deprecation period ` - -new_features: - -deprecated: diff --git a/docs/inventories/v1.29/objects.inv b/docs/inventories/v1.29/objects.inv index d6586b52fa2adff9ee22a94e9c35b961095f6d11..f39a46f04de2fccd53df68ab00b93ded2987b0b7 100644 GIT binary patch delta 23192 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 delta 23177 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 USVUw({e7yo=~vNF6>iY~0eSql!2kdN delta 11717 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 Sb28+)8uRG|@o#xz*8c#57HKR1 diff --git a/docs/inventories/v1.31/objects.inv b/docs/inventories/v1.31/objects.inv index 144ce7dbd8121b04b1a45e66e65858850736ab3d..8bd3786841cb44937eb0d734f954bd9f8e7adebe 100644 GIT binary patch delta 4394 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 JD_7Zu{||AtJdFSV delta 4295 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 Date: Wed, 30 Oct 2024 15:09:28 +0000 Subject: [PATCH 13/41] repo: Dev v1.31.4 Signed-off-by: Ryan Northey --- VERSION.txt | 2 +- changelogs/1.31.3.yaml | 6 ++++++ changelogs/current.yaml | 19 +++++++++++++++---- 3 files changed, 22 insertions(+), 5 deletions(-) create mode 100644 changelogs/1.31.3.yaml diff --git a/VERSION.txt b/VERSION.txt index d7f92f5886..6e24a0f33c 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -1.31.3 +1.31.4-dev diff --git a/changelogs/1.31.3.yaml b/changelogs/1.31.3.yaml new file mode 100644 index 0000000000..5dc086dcaf --- /dev/null +++ b/changelogs/1.31.3.yaml @@ -0,0 +1,6 @@ +date: October 29, 2024 + +bug_fixes: +- area: tracing + change: | + Fixed a bug where the OpenTelemetry tracer exports the OTLP request even when no spans are present. diff --git a/changelogs/current.yaml b/changelogs/current.yaml index 5dc086dcaf..9ecf0d6e48 100644 --- a/changelogs/current.yaml +++ b/changelogs/current.yaml @@ -1,6 +1,17 @@ -date: October 29, 2024 +date: Pending + +behavior_changes: +# *Changes that are expected to cause an incompatibility if applicable; deployment changes are likely required* + +minor_behavior_changes: +# *Changes that may cause incompatibilities for some users, but should not for most* bug_fixes: -- area: tracing - change: | - Fixed a bug where the OpenTelemetry tracer exports the OTLP request even when no spans are present. +# *Changes expected to improve the state of the world and are unlikely to have negative effects* + +removed_config_or_runtime: +# *Normally occurs at the end of the* :ref:`deprecation period ` + +new_features: + +deprecated: From e5ef1c4b87857e30dca97c4e0534737a21113418 Mon Sep 17 00:00:00 2001 From: Ryan Northey Date: Thu, 31 Oct 2024 08:39:33 +0000 Subject: [PATCH 14/41] ci/rbe: Boost cpu for another flakey integration test Signed-off-by: Ryan Northey --- contrib/config/test/BUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/config/test/BUILD b/contrib/config/test/BUILD index 4aa48a23bf..abfd044846 100644 --- a/contrib/config/test/BUILD +++ b/contrib/config/test/BUILD @@ -39,7 +39,7 @@ envoy_cc_test( data = [ "//test/config/integration/certs", ], - rbe_pool = "6gig", + rbe_pool = "2core", deps = [ ":invalid_proto_kv_store_config_proto_cc_proto", "//contrib/config/source:kv_store_xds_delegate", From b2126aeed559009dd0474ebc2b8a0fe4f8ea9786 Mon Sep 17 00:00:00 2001 From: John Howard Date: Tue, 5 Nov 2024 11:06:41 -0800 Subject: [PATCH 15/41] Relax recent SNI restrictions (#36950) See https://github.com/istio/istio/issues/53426. Istio has used underscores in their SNI since the beginning and it is critical to its functionality. Usage of underscores in SNI is a bit of a grey area in the RFCs, which are extremely under-specified wrt to what exactly is the allowed formats. However, the de-facto standard is to allow them, as virtually every TLS library does so (including, but not limited to, Golang, rustls, openssl, boringssl). This PR loosens the restriction to additionally allow underscores. Note the intent of the SNI restrictions was not RFC compliance, etc -- but rather to fix [log injection](https://github.com/envoyproxy/envoy/security/advisories/GHSA-p222-xhp9-39rc) attacks (putting ANSI escapes, HTML, etc) into logs. This change does not loosen the security properties we hoped to gain with the initial patch. Signed-off-by: John Howard (cherry picked from commit 79ee3427d9aae17cb008f1c71ea6e6e25a458069) --- source/common/common/utility.cc | 3 ++- source/common/common/utility.h | 4 ++-- test/common/formatter/substitution_formatter_test.cc | 9 +++++++++ 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/source/common/common/utility.cc b/source/common/common/utility.cc index 690017ddcc..d03551088c 100644 --- a/source/common/common/utility.cc +++ b/source/common/common/utility.cc @@ -505,7 +505,8 @@ std::string StringUtil::sanitizeInvalidHostname(const absl::string_view source) std::string ret_str = std::string(source); bool sanitized = false; for (size_t i = 0; i < ret_str.size(); ++i) { - if (absl::ascii_isalnum(ret_str[i]) || ret_str[i] == '.' || ret_str[i] == '-') { + if (absl::ascii_isalnum(ret_str[i]) || ret_str[i] == '.' || ret_str[i] == '-' || + ret_str[i] == '_') { continue; } sanitized = true; diff --git a/source/common/common/utility.h b/source/common/common/utility.h index bd807e0900..02e95403c7 100644 --- a/source/common/common/utility.h +++ b/source/common/common/utility.h @@ -431,8 +431,8 @@ class StringUtil { /** * Sanitize host name strings for logging purposes. Replace invalid hostname characters (anything - * that's not alphanumeric, hyphen, or period) with underscore. The sanitized string is not a - * valid host name. + * that's not alphanumeric, hyphen, or period) with underscore. The sanitized string + * is not a valid host name. * @param source supplies the string to sanitize. * @return sanitized string. */ diff --git a/test/common/formatter/substitution_formatter_test.cc b/test/common/formatter/substitution_formatter_test.cc index aea6f5cc6e..25da45dba6 100644 --- a/test/common/formatter/substitution_formatter_test.cc +++ b/test/common/formatter/substitution_formatter_test.cc @@ -959,6 +959,15 @@ TEST(SubstitutionFormatterTest, streamInfoFormatter) { ProtoEq(ValueUtil::nullValue())); } + { + StreamInfoFormatter upstream_format("REQUESTED_SERVER_NAME"); + std::string requested_server_name = "outbound_.8080_._.example.com"; + stream_info.downstream_connection_info_provider_->setRequestedServerName(requested_server_name); + EXPECT_EQ("outbound_.8080_._.example.com", upstream_format.formatWithContext({}, stream_info)); + EXPECT_THAT(upstream_format.formatValueWithContext({}, stream_info), + ProtoEq(ValueUtil::stringValue("outbound_.8080_._.example.com"))); + } + { StreamInfoFormatter upstream_format("REQUESTED_SERVER_NAME"); std::string requested_server_name = "stub-server"; From 4069a7e2f33941eade71390a4c164a5b766ca422 Mon Sep 17 00:00:00 2001 From: John Howard Date: Tue, 5 Nov 2024 14:24:59 -0800 Subject: [PATCH 16/41] Add release note for "Relax recent SNI restrictions" (#37000) Adds a release note for https://github.com/envoyproxy/envoy/pull/36950#issuecomment-2458147011 Signed-off-by: John Howard (cherry picked from commit db63605c2515a98e17835975e75fd80ca3c38a68) --- changelogs/current.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changelogs/current.yaml b/changelogs/current.yaml index 9ecf0d6e48..af40a5824c 100644 --- a/changelogs/current.yaml +++ b/changelogs/current.yaml @@ -8,6 +8,10 @@ minor_behavior_changes: bug_fixes: # *Changes expected to improve the state of the world and are unlikely to have negative effects* +- area: access_log + change: | + Relaxed the restriction on SNI logging to allow the ``_`` character, even if + ``envoy.reloadable_features.sanitize_sni_in_access_log`` is enabled. removed_config_or_runtime: # *Normally occurs at the end of the* :ref:`deprecation period ` From cb61284a83e7185bb5b5017b7c2f7fcee028f60a Mon Sep 17 00:00:00 2001 From: Ryan Northey Date: Fri, 15 Nov 2024 18:25:15 +0000 Subject: [PATCH 17/41] ci: Add bazel client caching (#37096) Signed-off-by: Ryan Northey --- .bazelrc | 38 +++++++++++++++++------------------ .github/workflows/request.yml | 17 +++++++++++----- 2 files changed, 31 insertions(+), 24 deletions(-) diff --git a/.bazelrc b/.bazelrc index 50bb1032ee..6e2c9c02c5 100644 --- a/.bazelrc +++ b/.bazelrc @@ -522,25 +522,25 @@ build:rbe-engflow --bes_upload_mode=fully_async build:rbe-engflow --nolegacy_important_outputs # RBE (Engflow Envoy) -build:common-envoy-engflow --google_default_credentials=false -build:common-envoy-engflow --credential_helper=*.engflow.com=%workspace%/bazel/engflow-bazel-credential-helper.sh -build:common-envoy-engflow --grpc_keepalive_time=30s - -build:cache-envoy-engflow --remote_cache=grpcs://mordenite.cluster.engflow.com -build:cache-envoy-engflow --remote_timeout=3600s -build:bes-envoy-engflow --bes_backend=grpcs://mordenite.cluster.engflow.com/ -build:bes-envoy-engflow --bes_results_url=https://mordenite.cluster.engflow.com/invocation/ -build:bes-envoy-engflow --bes_timeout=3600s -build:bes-envoy-engflow --bes_upload_mode=fully_async -build:bes-envoy-engflow --nolegacy_important_outputs -build:rbe-envoy-engflow --remote_executor=grpcs://mordenite.cluster.engflow.com -build:rbe-envoy-engflow --remote_default_exec_properties=container-image=docker://gcr.io/envoy-ci/envoy-build@sha256:7adc40c09508f957624c4d2e0f5aeecb73a59207ee6ded53b107eac828c091b2 -build:rbe-envoy-engflow --jobs=200 -build:rbe-envoy-engflow --define=engflow_rbe=true - -build:remote-envoy-engflow --config=common-envoy-engflow -build:remote-envoy-engflow --config=cache-envoy-engflow -build:remote-envoy-engflow --config=rbe-envoy-engflow +common:common-envoy-engflow --google_default_credentials=false +common:common-envoy-engflow --credential_helper=*.engflow.com=%workspace%/bazel/engflow-bazel-credential-helper.sh +common:common-envoy-engflow --grpc_keepalive_time=30s + +common:cache-envoy-engflow --remote_cache=grpcs://mordenite.cluster.engflow.com +common:cache-envoy-engflow --remote_timeout=3600s +common:bes-envoy-engflow --bes_backend=grpcs://mordenite.cluster.engflow.com/ +common:bes-envoy-engflow --bes_results_url=https://mordenite.cluster.engflow.com/invocation/ +common:bes-envoy-engflow --bes_timeout=3600s +common:bes-envoy-engflow --bes_upload_mode=fully_async +common:bes-envoy-engflow --nolegacy_important_outputs +common:rbe-envoy-engflow --remote_executor=grpcs://mordenite.cluster.engflow.com +common:rbe-envoy-engflow --remote_default_exec_properties=container-image=docker://gcr.io/envoy-ci/envoy-build@sha256:7adc40c09508f957624c4d2e0f5aeecb73a59207ee6ded53b107eac828c091b2 +common:rbe-envoy-engflow --jobs=200 +common:rbe-envoy-engflow --define=engflow_rbe=true + +common:remote-envoy-engflow --config=common-envoy-engflow +common:remote-envoy-engflow --config=cache-envoy-engflow +common:remote-envoy-engflow --config=rbe-envoy-engflow ############################################################################# # debug: Various Bazel debugging flags diff --git a/.github/workflows/request.yml b/.github/workflows/request.yml index a245052db1..734241ea3d 100644 --- a/.github/workflows/request.yml +++ b/.github/workflows/request.yml @@ -22,14 +22,9 @@ concurrency: jobs: request: - # For branches this can be pinned to a specific version if required - # NB: `uses` cannot be dynamic so it _must_ be hardcoded anywhere it is read - uses: envoyproxy/envoy/.github/workflows/_request.yml@main - if: ${{ vars.ENVOY_CI || github.repository == 'envoyproxy/envoy' }} permissions: actions: read contents: read - # required for engflow/bazel caching (not yet used) packages: read # required to fetch merge commit pull-requests: read @@ -37,3 +32,15 @@ jobs: # these are required to start checks app-key: ${{ secrets.ENVOY_CI_APP_KEY }} app-id: ${{ secrets.ENVOY_CI_APP_ID }} + lock-app-key: ${{ secrets.ENVOY_CI_MUTEX_APP_KEY }} + lock-app-id: ${{ secrets.ENVOY_CI_MUTEX_APP_ID }} + gcs-cache-key: ${{ secrets.GCS_CACHE_WRITE_KEY }} + with: + gcs-cache-bucket: ${{ vars.ENVOY_CACHE_BUCKET }} + # For branches this can be pinned to a specific version if required + # NB: `uses` cannot be dynamic so it _must_ be hardcoded anywhere it is read + uses: envoyproxy/envoy/.github/workflows/_request.yml@main + if: >- + ${{ github.repository == 'envoyproxy/envoy' + || (vars.ENVOY_CI && github.event_name != 'schedule') + || (vars.ENVOY_SCHEDULED_CI && github.event_name == 'schedule') }} From 96b6aac433db65900bf56457ff6d4778f3be87a1 Mon Sep 17 00:00:00 2001 From: phlax Date: Tue, 5 Nov 2024 13:24:29 +0000 Subject: [PATCH 18/41] bazel/distribution: Cleanups to fix aquery (#36977) Signed-off-by: Ryan Northey --- .github/workflows/_publish_build.yml | 5 ++ ci/do_ci.sh | 4 +- distribution/BUILD | 78 +++++++++++++++++++--------- 3 files changed, 61 insertions(+), 26 deletions(-) diff --git a/.github/workflows/_publish_build.yml b/.github/workflows/_publish_build.yml index 3ce77d4dc6..3f809ac06f 100644 --- a/.github/workflows/_publish_build.yml +++ b/.github/workflows/_publish_build.yml @@ -159,6 +159,11 @@ jobs: uses: ./.github/workflows/_run.yml with: target: release.signed + bazel-extra: >- + --//distribution:x64-packages=//distribution:custom/x64/packages.x64.tar.gz + --//distribution:arm64-packages=//distribution:custom/arm64/packages.arm64.tar.gz + --//distribution:x64-release=//distribution:custom/x64/bin/release.tar.zst + --//distribution:arm64-release=//distribution:custom/arm64/bin/release.tar.zst cache-build-image: ${{ fromJSON(inputs.request).request.build-image.default }} downloads: | packages.arm64: envoy/arm64/ diff --git a/ci/do_ci.sh b/ci/do_ci.sh index 72d193876e..a599d09450 100755 --- a/ci/do_ci.sh +++ b/ci/do_ci.sh @@ -911,7 +911,9 @@ case $CI_TARGET in release.signed) echo "Signing binary packages..." setup_clang_toolchain - bazel build "${BAZEL_BUILD_OPTIONS[@]}" //distribution:signed + bazel build \ + "${BAZEL_BUILD_OPTIONS[@]}" \ + //distribution:signed cp -a bazel-bin/distribution/release.signed.tar.zst "${BUILD_DIR}/envoy/" ;; diff --git a/distribution/BUILD b/distribution/BUILD index 578f6de6f3..a222747815 100644 --- a/distribution/BUILD +++ b/distribution/BUILD @@ -77,55 +77,88 @@ sh_binary( ], ) +genrule( + name = "placeholder", + outs = ["PLACEHOLDER.TXT"], + cmd = """ + touch $@ + """, +) + label_flag( name = "x64-packages", - build_setting_default = "//distribution:custom/x64/packages.x64.tar.gz", + build_setting_default = ":placeholder", ) label_flag( name = "arm64-packages", - build_setting_default = "//distribution:custom/arm64/packages.arm64.tar.gz", + build_setting_default = ":placeholder", ) label_flag( name = "x64-release", - build_setting_default = "//distribution:custom/x64/bin/release.tar.zst", + build_setting_default = ":placeholder", ) label_flag( name = "arm64-release", - build_setting_default = "//distribution:custom/arm64/bin/release.tar.zst", + build_setting_default = ":placeholder", ) genrule( name = "multi_arch_debs", + srcs = [ + ":arm64-packages", + ":x64-packages", + ], outs = ["multiarch-debs.tar.gz"], # To ensure the debs tarball is not extracted and kept as a tarball, it is # placed into a 2nd archive. cmd = """ - tmpdir=$$(mktemp -d) \ - && tmpdir2=$$(mktemp -d) \ - && tar xf $(location :x64-packages) -C "$$tmpdir" \ - && tar xf $(location :arm64-packages) -C "$$tmpdir" \ - && rm "$${tmpdir}/signing.key" \ - && mv "$${tmpdir}/deb/"* "$${tmpdir}" \ - && rm -rf "$${tmpdir}/deb/" \ - && tar cf $$tmpdir2/debs.tar.gz -C "$${tmpdir}" . \ - && tar cf $@ -C "$${tmpdir2}" . \ + tmpdir=$$(mktemp -d) + tmpdir2=$$(mktemp -d) + NEEDS_PATH= + if [[ $$(basename $(location :x64-packages)) == "PLACEHOLDER.TXT" ]]; then + NEEDS_PATH=1 + elif [[ $$(basename $(location :arm64-packages)) == "PLACEHOLDER.TXT" ]]; then + NEEDS_PATH=1 + fi + if [[ -n $$NEEDS_PATH ]]; then + echo "You must set //distribution:x64-packages and //distribution:arm64-packages to build multiarch debs" >&2 + exit 1 + fi + tar xf $(location :x64-packages) -C "$$tmpdir" + tar xf $(location :arm64-packages) -C "$$tmpdir" + rm "$${tmpdir}/signing.key" + mv "$${tmpdir}/deb/"* "$${tmpdir}" + rm -rf "$${tmpdir}/deb/" + tar cf $$tmpdir2/debs.tar.gz -C "$${tmpdir}" . + tar cf $@ -C "$${tmpdir2}" . """, - tools = [ - ":arm64-packages", - ":x64-packages", - ], ) genrule( name = "signed", + srcs = [ + ":arm64-release", + ":multi_arch_debs", + ":x64-release", + ], outs = ["release.signed.tar.zst"], cmd = """ # Sign the packages - VERSION=%s \ - && $(location //tools/distribution:sign) \ + VERSION=%s + NEEDS_PATH= + if [[ $$(basename $(location :x64-release)) == "PLACEHOLDER.TXT" ]]; then + NEEDS_PATH=1 + elif [[ $$(basename $(location :arm64-release)) == "PLACEHOLDER.TXT" ]]; then + NEEDS_PATH=1 + fi + if [[ -n $$NEEDS_PATH ]]; then + echo "You must set //distribution:x64-release and //distribution:arm64-release for signing packages" >&2 + exit 1 + fi + $(location //tools/distribution:sign) \ "bin:$(location :multi_arch_debs)" \ "x64:$(location :x64-release)" \ "arm64:$(location :arm64-release)" \ @@ -136,10 +169,5 @@ genrule( --out $@ """ % VERSION, tags = ["no-remote"], - tools = [ - ":arm64-release", - ":multi_arch_debs", - ":x64-release", - "//tools/distribution:sign", - ], + tools = ["//tools/distribution:sign"], ) From b0da58df127b2a69c313c3551b1dafb7cd15e18c Mon Sep 17 00:00:00 2001 From: phlax Date: Fri, 8 Nov 2024 13:36:36 +0000 Subject: [PATCH 19/41] bazel: Make `ci` config common (#37027) Signed-off-by: Ryan Northey --- .bazelrc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.bazelrc b/.bazelrc index 6e2c9c02c5..2085088e30 100644 --- a/.bazelrc +++ b/.bazelrc @@ -403,9 +403,9 @@ build:remote-ci --config=ci build:remote-ci --remote_download_minimal # Note this config is used by mobile CI also. -build:ci --noshow_progress -build:ci --noshow_loading_progress -build:ci --test_output=errors +common:ci --noshow_progress +common:ci --noshow_loading_progress +common:ci --test_output=errors # Fuzz builds From 2124bbac7570b2d1aec534c4e14d0ddac4d7a817 Mon Sep 17 00:00:00 2001 From: phlax Date: Mon, 4 Nov 2024 16:21:24 +0000 Subject: [PATCH 20/41] headers/geoip: Fix macro (#36964) Currently this breaks running `bazel aquery "deps(...)"` - not sure why Signed-off-by: Ryan Northey --- envoy/geoip/BUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/envoy/geoip/BUILD b/envoy/geoip/BUILD index 05d323b6a0..7f9b2462e7 100644 --- a/envoy/geoip/BUILD +++ b/envoy/geoip/BUILD @@ -1,6 +1,6 @@ load( "//bazel:envoy_build_system.bzl", - "envoy_cc_extension", + "envoy_cc_library", "envoy_package", ) @@ -11,7 +11,7 @@ envoy_package() # HTTP L7 filter that decorates request with geolocation data # Public docs: https://envoyproxy.io/docs/envoy/latest/configuration/http/http_filters/geoip_filter -envoy_cc_extension( +envoy_cc_library( name = "geoip_provider_driver_interface", hdrs = [ "geoip_provider_driver.h", From 4bcfd5a7896d57a3d854f7cf465464224fd34f50 Mon Sep 17 00:00:00 2001 From: phlax Date: Thu, 25 Jul 2024 18:59:02 +0100 Subject: [PATCH 21/41] deps: Bump python -> 3.12.3 (#35334) Signed-off-by: Ryan Northey Co-authored-by: dependency-envoy[bot] <148525496+dependency-envoy[bot]@users.noreply.github.com> Signed-off-by: phlax --- bazel/python_dependencies.bzl | 2 +- bazel/repositories.bzl | 7 ------- bazel/repositories_extra.bzl | 2 +- bazel/repository_locations.bzl | 13 ------------- .../network/test/broker/integration_test/BUILD | 6 ++---- .../network/test/mesh/integration_test/BUILD | 6 ++---- .../python/hotrestart_handoff_test.py | 2 +- tools/api/validate_structure.py | 4 ++-- .../detector.py | 2 +- tools/api_proto_plugin/annotations.py | 2 +- tools/base/requirements.in | 3 ++- tools/base/requirements.txt | 6 +++++- tools/build_profile.py | 2 +- tools/dependency/validate.py | 4 ++-- tools/deprecate_version/deprecate_version.py | 2 +- tools/docs/generate_external_deps_rst.py | 2 +- .../_crcfunext.cpython-311-x86_64-linux-gnu.so | Bin 55536 -> 0 bytes .../_crcfunext.cpython-312-x86_64-linux-gnu.so | Bin 0 -> 54888 bytes tools/gsutil/vendor_util.sh | 2 +- tools/proto_format/format_api.py | 6 +++--- tools/protoprint/protoprint.py | 6 +++--- tools/spelling/check_spelling_pedantic.py | 6 +++--- tools/stack_decode.py | 6 +++--- tools/type_whisperer/typedb_gen.py | 8 ++++---- 24 files changed, 40 insertions(+), 59 deletions(-) delete mode 100755 tools/gsutil/crcmod/_crcfunext.cpython-311-x86_64-linux-gnu.so create mode 100755 tools/gsutil/crcmod/_crcfunext.cpython-312-x86_64-linux-gnu.so diff --git a/bazel/python_dependencies.bzl b/bazel/python_dependencies.bzl index b015e851c0..9f2b336b1a 100644 --- a/bazel/python_dependencies.bzl +++ b/bazel/python_dependencies.bzl @@ -1,6 +1,6 @@ load("@com_google_protobuf//bazel:system_python.bzl", "system_python") load("@envoy_toolshed//:packages.bzl", "load_packages") -load("@python3_11//:defs.bzl", "interpreter") +load("@python3_12//:defs.bzl", "interpreter") load("@rules_python//python:pip.bzl", "pip_parse") def envoy_python_dependencies(): diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl index 9190c4aedd..36fc850c8b 100644 --- a/bazel/repositories.bzl +++ b/bazel/repositories.bzl @@ -1446,13 +1446,6 @@ filegroup( build_file_content = BUILD_ALL_CONTENT, ) - # This archive provides Kafka client in Python, so we can use it to interact with Kafka server - # during integration tests. - external_http_archive( - name = "kafka_python_client", - build_file_content = BUILD_ALL_CONTENT, - ) - def _com_github_fdio_vpp_vcl(): external_http_archive( name = "com_github_fdio_vpp_vcl", diff --git a/bazel/repositories_extra.bzl b/bazel/repositories_extra.bzl index 7fd1dc4095..bfa5d750a6 100644 --- a/bazel/repositories_extra.bzl +++ b/bazel/repositories_extra.bzl @@ -9,7 +9,7 @@ def _python_minor_version(python_version): return "_".join(python_version.split(".")[:-1]) # Python version for `rules_python` -PYTHON_VERSION = "3.11.9" +PYTHON_VERSION = "3.12.3" PYTHON_MINOR_VERSION = _python_minor_version(PYTHON_VERSION) # Envoy deps that rely on a first stage of dependency loading in envoy_dependencies(). diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl index 439206a2d1..6060f921c9 100644 --- a/bazel/repository_locations.bzl +++ b/bazel/repository_locations.bzl @@ -1367,19 +1367,6 @@ REPOSITORY_LOCATIONS_SPEC = dict( release_date = "2023-07-21", use_category = ["test_only"], ), - kafka_python_client = dict( - project_name = "Kafka (Python client)", - project_desc = "Open-source distributed event streaming platform", - project_url = "https://kafka.apache.org", - version = "2.0.2", - sha256 = "5dcf87c559e7aee4f18d621a02e247db3e3552ee4589ca611d51eef87b37efed", - strip_prefix = "kafka-python-{version}", - urls = ["https://github.com/dpkp/kafka-python/archive/{version}.tar.gz"], - release_date = "2020-09-30", - use_category = ["test_only"], - license = "Apache-2.0", - license_url = "https://github.com/dpkp/kafka-python/blob/{version}/LICENSE", - ), proxy_wasm_cpp_sdk = dict( project_name = "WebAssembly for Proxies (C++ SDK)", project_desc = "WebAssembly for Proxies (C++ SDK)", diff --git a/contrib/kafka/filters/network/test/broker/integration_test/BUILD b/contrib/kafka/filters/network/test/broker/integration_test/BUILD index 30444088ec..c0cd122eb2 100644 --- a/contrib/kafka/filters/network/test/broker/integration_test/BUILD +++ b/contrib/kafka/filters/network/test/broker/integration_test/BUILD @@ -12,10 +12,7 @@ envoy_contrib_package() # This test sets up multiple services, and this can take variable amount of time (30-60 seconds). envoy_py_test( name = "kafka_broker_integration_test", - srcs = [ - "kafka_broker_integration_test.py", - "@kafka_python_client//:all", - ], + srcs = ["kafka_broker_integration_test.py"], data = [ "//bazel:remote_jdk11", "//contrib/exe:envoy-static", @@ -24,6 +21,7 @@ envoy_py_test( flaky = True, deps = [ requirement("Jinja2"), + requirement("kafka-python-ng"), requirement("MarkupSafe"), ], ) diff --git a/contrib/kafka/filters/network/test/mesh/integration_test/BUILD b/contrib/kafka/filters/network/test/mesh/integration_test/BUILD index 3db16d2987..8d21011431 100644 --- a/contrib/kafka/filters/network/test/mesh/integration_test/BUILD +++ b/contrib/kafka/filters/network/test/mesh/integration_test/BUILD @@ -12,10 +12,7 @@ envoy_contrib_package() # This test sets up multiple services, and this can take variable amount of time (30-60 seconds). envoy_py_test( name = "kafka_mesh_integration_test", - srcs = [ - "kafka_mesh_integration_test.py", - "@kafka_python_client//:all", - ], + srcs = ["kafka_mesh_integration_test.py"], data = [ "//bazel:remote_jdk11", "//contrib/exe:envoy-static", @@ -24,6 +21,7 @@ envoy_py_test( flaky = True, deps = [ requirement("Jinja2"), + requirement("kafka-python-ng"), requirement("MarkupSafe"), ], ) diff --git a/test/integration/python/hotrestart_handoff_test.py b/test/integration/python/hotrestart_handoff_test.py index 913ed95994..c9915b538f 100644 --- a/test/integration/python/hotrestart_handoff_test.py +++ b/test/integration/python/hotrestart_handoff_test.py @@ -451,7 +451,7 @@ async def test_connection_handoffs(self) -> None: "slow request should be incomplete when the test waits for it, otherwise the test is not necessarily validating during-drain behavior", ) for response in slow_responses: - self.assertEquals(await response.join(), 0) + self.assertEqual(await response.join(), 0) log.info("waiting for parent instance to terminate") await envoy_process_1.wait() log.info("sending second request to fast upstream") diff --git a/tools/api/validate_structure.py b/tools/api/validate_structure.py index 0ccddf38ff..2b0af7de75 100755 --- a/tools/api/validate_structure.py +++ b/tools/api/validate_structure.py @@ -40,7 +40,7 @@ class ValidationError(Exception): # Extract major version and full API version string from a proto path. def proto_api_version(proto_path): - match = re.match('v(\d+).*', proto_path.parent.name) + match = re.match(r'v(\d+).*', proto_path.parent.name) if match: return str(proto_path.parent.name)[1:], int(match.group(1)) return None, 0 @@ -57,7 +57,7 @@ def validate_proto_path(proto_path): # Validate that v3+ versions are regular. if major_version >= 3: - if not re.match('\d+(alpha)?$', version_str): + if not re.match(r'\d+(alpha)?$', version_str): raise ValidationError('Invalid v3+ version: %s' % version_str) # Validate v2-only paths. diff --git a/tools/api_proto_breaking_change_detector/detector.py b/tools/api_proto_breaking_change_detector/detector.py index 8a4273cb76..3bde205212 100644 --- a/tools/api_proto_breaking_change_detector/detector.py +++ b/tools/api_proto_breaking_change_detector/detector.py @@ -81,7 +81,7 @@ def __init__( if Path.cwd() not in Path(path_to_changed_dir).parents: raise ValueError( - f"path_to_changed_dir {path_to_changed_dir} must be a subdirectory of the cwd ({ Path.cwd() })" + f"path_to_changed_dir {path_to_changed_dir} must be a subdirectory of the cwd ({Path.cwd()})" ) if not Path(git_path).exists(): diff --git a/tools/api_proto_plugin/annotations.py b/tools/api_proto_plugin/annotations.py index 3ae1244150..bdff4125b0 100644 --- a/tools/api_proto_plugin/annotations.py +++ b/tools/api_proto_plugin/annotations.py @@ -4,7 +4,7 @@ from functools import partial # Key-value annotation regex. -ANNOTATION_REGEX = re.compile('\[#([\w-]+?):\s*(.*?)\](\s?)', re.DOTALL) +ANNOTATION_REGEX = re.compile(r'\[#([\w-]+?):\s*(.*?)\](\s?)', re.DOTALL) # Page/section titles with special prefixes in the proto comments DOC_TITLE_ANNOTATION = 'protodoc-title' diff --git a/tools/base/requirements.in b/tools/base/requirements.in index d40737e941..fd06e58b56 100644 --- a/tools/base/requirements.in +++ b/tools/base/requirements.in @@ -25,7 +25,8 @@ frozendict>=2.3.7 gitpython gsutil icalendar -jinja2 +jinja2>=3.1.4 +kafka-python-ng multidict>=6.0.2 orjson pep8-naming diff --git a/tools/base/requirements.txt b/tools/base/requirements.txt index a81f45aa11..aa64f5a698 100644 --- a/tools/base/requirements.txt +++ b/tools/base/requirements.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # pip-compile --allow-unsafe --generate-hashes requirements.in @@ -788,6 +788,10 @@ jinja2==3.1.4 \ # envoy-base-utils # envoy-dependency-check # sphinx +kafka-python-ng==2.2.3 \ + --hash=sha256:adc6e82147c441ca4ae1f22e291fc08efab0d10971cbd4aa1481d2ffa38e9480 \ + --hash=sha256:f79f28e10ade9b5a9860b2ec15b7cc8dc510d5702f5a399430478cff5f93a05a + # via -r requirements.in markupsafe==2.1.5 \ --hash=sha256:00e046b6dd71aa03a41079792f8473dc494d564611a8f89bbbd7cb93295ebdcf \ --hash=sha256:075202fa5b72c86ad32dc7d0b56024ebdbcf2048c0ba09f1cde31bfdd57bcfff \ diff --git a/tools/build_profile.py b/tools/build_profile.py index 5c47d7a589..c6212a9a20 100755 --- a/tools/build_profile.py +++ b/tools/build_profile.py @@ -13,7 +13,7 @@ def print_profile(f): prev_cmd = None prev_timestamp = None for line in f: - sr = re.match('\++ (\d+\.\d+) (.*)', line) + sr = re.match(r'\++ (\d+\.\d+) (.*)', line) if sr: timestamp, cmd = sr.groups() if prev_cmd: diff --git a/tools/dependency/validate.py b/tools/dependency/validate.py index b5c9e26aab..f3025d40d2 100755 --- a/tools/dependency/validate.py +++ b/tools/dependency/validate.py @@ -15,8 +15,8 @@ import envoy_repo -BAZEL_QUERY_EXTERNAL_DEP_RE = re.compile('@(\w+)//') -EXTENSION_LABEL_RE = re.compile('(//source/extensions/.*):') +BAZEL_QUERY_EXTERNAL_DEP_RE = re.compile(r'@(\w+)//') +EXTENSION_LABEL_RE = re.compile(r'(//source/extensions/.*):') # We can safely ignore these as they are from Bazel or internal repository structure. IGNORE_DEPS = set([ diff --git a/tools/deprecate_version/deprecate_version.py b/tools/deprecate_version/deprecate_version.py index 5ccb22ee75..72b3e3fa58 100644 --- a/tools/deprecate_version/deprecate_version.py +++ b/tools/deprecate_version/deprecate_version.py @@ -171,7 +171,7 @@ def get_runtime_and_pr(): if runtime_guard == 'envoy_reloadable_features_test_feature_true': found_test_feature_true = True continue - pr_num = re.search('\(#(\d+)\)', commit.message) + pr_num = re.search(r'\(#(\d+)\)', commit.message) # Some commits may not come from a PR (if they are part of a security point release). pr = (int(pr_num.group(1))) if pr_num else None pr_date = date.fromtimestamp(commit.committed_date) diff --git a/tools/docs/generate_external_deps_rst.py b/tools/docs/generate_external_deps_rst.py index e0ee926931..3560728555 100755 --- a/tools/docs/generate_external_deps_rst.py +++ b/tools/docs/generate_external_deps_rst.py @@ -50,7 +50,7 @@ def csv_table(headers, widths, rows): csv_rows = '\n '.join(', '.join(row) for row in rows) return f'''.. csv-table:: :header: {', '.join(headers)} - :widths: {', '.join(str(w) for w in widths) } + :widths: {', '.join(str(w) for w in widths)} {csv_rows} diff --git a/tools/gsutil/crcmod/_crcfunext.cpython-311-x86_64-linux-gnu.so b/tools/gsutil/crcmod/_crcfunext.cpython-311-x86_64-linux-gnu.so deleted file mode 100755 index 017fb28eff648d8f66095a664ee6f6af22c98046..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 55536 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 SyuRvR_q^0!nNcAlYy3Zz{!GmP diff --git a/tools/gsutil/crcmod/_crcfunext.cpython-312-x86_64-linux-gnu.so b/tools/gsutil/crcmod/_crcfunext.cpython-312-x86_64-linux-gnu.so new file mode 100755 index 0000000000000000000000000000000000000000..37da1f52bc44a0424afa9e3c41bf3b860690f154 GIT binary patch literal 54888 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 Y$28{Y?UQ%|)wg~k_1C6VNXr`k4-+W#*Z=?k literal 0 HcmV?d00001 diff --git a/tools/gsutil/vendor_util.sh b/tools/gsutil/vendor_util.sh index ceded21a48..f7e08dd1e9 100755 --- a/tools/gsutil/vendor_util.sh +++ b/tools/gsutil/vendor_util.sh @@ -16,7 +16,7 @@ fi ARCH=x86_64 HOST_UID="$(id -u)" HOST_GID="$(id -g)" -PYTHON_VERSION=3.11 +PYTHON_VERSION=3.12 docker run --rm \ -v "$PWD/tools/gsutil/crcmod:/output" \ diff --git a/tools/proto_format/format_api.py b/tools/proto_format/format_api.py index d096f06773..ca0b189c46 100644 --- a/tools/proto_format/format_api.py +++ b/tools/proto_format/format_api.py @@ -76,9 +76,9 @@ ) """) -IMPORT_REGEX = re.compile('import "(.*)";') -SERVICE_REGEX = re.compile('service \w+ {') -PACKAGE_REGEX = re.compile('\npackage ([a-z0-9_\.]*);') +IMPORT_REGEX = re.compile(r'import "(.*)";') +SERVICE_REGEX = re.compile(r'service \w+ {') +PACKAGE_REGEX = re.compile(r'\npackage ([a-z0-9_\.]*);') PREVIOUS_MESSAGE_TYPE_REGEX = re.compile(r'previous_message_type\s+=\s+"([^"]*)";') diff --git a/tools/protoprint/protoprint.py b/tools/protoprint/protoprint.py index ca081ef1bb..67648576ec 100644 --- a/tools/protoprint/protoprint.py +++ b/tools/protoprint/protoprint.py @@ -57,11 +57,11 @@ def extract_clang_proto_style(clang_format_text): format_dict = {} for line in clang_format_text.split('\n'): if lang is None or lang != 'Proto': - match = re.match('Language:\s+(\w+)', line) + match = re.match(r'Language:\s+(\w+)', line) if match: lang = match.group(1) continue - match = re.match('(\w+):\s+(\w+)', line) + match = re.match(r'(\w+):\s+(\w+)', line) if match: key, value = match.groups() format_dict[key] = value @@ -196,7 +196,7 @@ def format_header_from_file( if t.startswith('envoy.') and typedb.types[t].proto_path != file_proto.name) def camel_case(s): - return ''.join(t.capitalize() for t in re.split('[\._]', s)) + return ''.join(t.capitalize() for t in re.split(r'[\._]', s)) package_line = 'package %s;\n' % file_proto.package file_block = '\n'.join(['syntax = "proto3";\n', package_line]) diff --git a/tools/spelling/check_spelling_pedantic.py b/tools/spelling/check_spelling_pedantic.py index 909024b983..d94f60a1ae 100755 --- a/tools/spelling/check_spelling_pedantic.py +++ b/tools/spelling/check_spelling_pedantic.py @@ -57,7 +57,7 @@ def cmp(x, y): TODO = re.compile(r'(TODO|NOTE)\s*\(@?[A-Za-z0-9-]+\):?') # Ignore parameter names in doxygen comments. -METHOD_DOC = re.compile('@(param\s+\w+|return(\s+const)?\s+\w+)') +METHOD_DOC = re.compile(r'@(param\s+\w+|return(\s+const)?\s+\w+)') # Camel Case splitter CAMEL_CASE = re.compile(r'[A-Z]?[a-z]+|[A-Z]+(?=[A-Z]|$)') @@ -164,8 +164,8 @@ def start(self): self.prefixes = prefixes self.suffixes = suffixes - self.prefix_re = re.compile("(?:\s|^)((%s)-)" % ("|".join(prefixes)), re.IGNORECASE) - self.suffix_re = re.compile("(-(%s))(?:\s|$)" % ("|".join(suffixes)), re.IGNORECASE) + self.prefix_re = re.compile(r"(?:\s|^)((%s)-)" % ("|".join(prefixes)), re.IGNORECASE) + self.suffix_re = re.compile(r"(-(%s))(?:\s|$)" % ("|".join(suffixes)), re.IGNORECASE) # Generate aspell personal dictionary. pws = os.path.join(CURR_DIR, '.aspell.en.pws') diff --git a/tools/stack_decode.py b/tools/stack_decode.py index 105cf04acb..62d1b33c48 100755 --- a/tools/stack_decode.py +++ b/tools/stack_decode.py @@ -28,7 +28,7 @@ def decode_stacktrace_log(object_file, input_source, address_offset=0): # Match something like: # [backtrace] [bazel-out/local-dbg/bin/source/server/_virtual_includes/backtrace_lib/server/backtrace.h:84] - backtrace_marker = "\[backtrace\] [^\s]+" + backtrace_marker = r'\[backtrace\] [^\s]+' # Match something like: # ${backtrace_marker} Address mapping: 010c0000-02a77000 offset_re = re.compile("%s Address mapping: ([0-9A-Fa-f]+)-([0-9A-Fa-f]+)" % backtrace_marker) @@ -36,10 +36,10 @@ def decode_stacktrace_log(object_file, input_source, address_offset=0): # ${backtrace_marker} #10: SYMBOL [0xADDR] # or: # ${backtrace_marker} #10: [0xADDR] - stackaddr_re = re.compile("%s #\d+:(?: .*)? \[(0x[0-9a-fA-F]+)\]$" % backtrace_marker) + stackaddr_re = re.compile(r"%s #\d+:(?: .*)? \[(0x[0-9a-fA-F]+)\]$" % backtrace_marker) # Match something like: # #10 0xLOCATION (BINARY+0xADDR) - asan_re = re.compile(" *#\d+ *0x[0-9a-fA-F]+ *\([^+]*\+(0x[0-9a-fA-F]+)\)") + asan_re = re.compile(r" *#\d+ *0x[0-9a-fA-F]+ *\([^+]*\+(0x[0-9a-fA-F]+)\)") try: while True: diff --git a/tools/type_whisperer/typedb_gen.py b/tools/type_whisperer/typedb_gen.py index 5d418c3355..d118cd40ab 100644 --- a/tools/type_whisperer/typedb_gen.py +++ b/tools/type_whisperer/typedb_gen.py @@ -19,11 +19,11 @@ (r'(envoy[\w\.]*\.)(v1alpha\d?|v1)', r'\1v3'), (r'(envoy[\w\.]*\.)(v2alpha\d?|v2)', r'\1v3'), # These are special cases, e.g. upgrading versionless packages. - ('envoy\.type\.matcher', 'envoy.type.matcher.v3'), - ('envoy\.type', 'envoy.type.v3'), - ('envoy\.config\.cluster\.redis', 'envoy.extensions.clusters.redis.v3'), + (r'envoy\.type\.matcher', 'envoy.type.matcher.v3'), + (r'envoy\.type', 'envoy.type.v3'), + (r'envoy\.config\.cluster\.redis', 'envoy.extensions.clusters.redis.v3'), ( - 'envoy\.config\.retry\.previous_priorities', + r'envoy\.config\.retry\.previous_priorities', 'envoy.extensions.retry.priority.previous_priorities.v3'), ] From 672ea9e0ed326443b82a95aaaa552bc1c08a42e9 Mon Sep 17 00:00:00 2001 From: "dependency-envoy[bot]" <148525496+dependency-envoy[bot]@users.noreply.github.com> Date: Mon, 18 Nov 2024 16:55:31 +0000 Subject: [PATCH 22/41] deps/api: Bump `envoy_toolshed` -> 0.1.16 (#37219) Signed-off-by: dependency-envoy[bot] <148525496+dependency-envoy[bot]@users.noreply.github.com> Signed-off-by: Ryan Northey Signed-off-by: dependency-envoy[bot] <148525496+dependency-envoy[bot]@users.noreply.github.com> --- api/bazel/repository_locations.bzl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/api/bazel/repository_locations.bzl b/api/bazel/repository_locations.bzl index c9bd2ae3ca..f664da169b 100644 --- a/api/bazel/repository_locations.bzl +++ b/api/bazel/repository_locations.bzl @@ -190,12 +190,12 @@ REPOSITORY_LOCATIONS_SPEC = dict( project_name = "envoy_toolshed", project_desc = "Tooling, libraries, runners and checkers for Envoy proxy's CI", project_url = "https://github.com/envoyproxy/toolshed", - version = "0.1.3", - sha256 = "ee6d0b08ae3d9659f5fc34d752578af195147b153f8ca68eb4f8530aceb764d9", + version = "0.1.16", + sha256 = "06939757b00b318e89996ca3d4d2468ac2da1ff48a7b2cd9146b2054c3ff4769", strip_prefix = "toolshed-bazel-v{version}/bazel", urls = ["https://github.com/envoyproxy/toolshed/archive/bazel-v{version}.tar.gz"], use_category = ["build"], - release_date = "2024-04-16", + release_date = "2024-11-18", cpe = "N/A", license = "Apache-2.0", license_url = "https://github.com/envoyproxy/envoy/blob/bazel-v{version}/LICENSE", From 76753044f707b92fd11c094e662c1f1cd7fadbbe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 13 Nov 2024 09:23:09 +0000 Subject: [PATCH 23/41] build(deps): bump distroless/base-nossl-debian12 from `aa91f01` to `174f326` in /ci (#37119) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Signed-off-by: Ryan Northey --- ci/Dockerfile-envoy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/Dockerfile-envoy b/ci/Dockerfile-envoy index ac6eb6ae77..1bf9d5dcab 100644 --- a/ci/Dockerfile-envoy +++ b/ci/Dockerfile-envoy @@ -58,7 +58,7 @@ COPY --chown=0:0 --chmod=755 \ # STAGE: envoy-distroless -FROM gcr.io/distroless/base-nossl-debian12:nonroot@sha256:aa91f01b56d02af049a3984dd5dd7c0ea39c97f398ac415cfc92b085bd63f6fd AS envoy-distroless +FROM gcr.io/distroless/base-nossl-debian12:nonroot@sha256:174f326c2730c718b3f857735c2a55f654dc057285ecacc7c29736ee777acb08 AS envoy-distroless EXPOSE 10000 ENTRYPOINT ["/usr/local/bin/envoy"] CMD ["-c", "/etc/envoy/envoy.yaml"] From b38c0bdbb512ee092096f623207405a55754a7af Mon Sep 17 00:00:00 2001 From: Thomas Ebner <96168670+samohte@users.noreply.github.com> Date: Wed, 20 Nov 2024 20:53:14 +0100 Subject: [PATCH 24/41] limit calculated sampling exponent (#37240) Ensure that calculated sampling exponent stays below a certain limit Risk Level: Low Testing: Unit test, manual Docs Changes: N/A Release Notes: N/A Platform Specific Features: Fixes #37199 Signed-off-by: thomas.ebner Signed-off-by: Thomas Ebner <96168670+samohte@users.noreply.github.com> --- changelogs/current.yaml | 3 +++ .../samplers/dynatrace/sampling_controller.cc | 2 +- .../samplers/dynatrace/sampling_controller_test.cc | 7 +++++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/changelogs/current.yaml b/changelogs/current.yaml index af40a5824c..1a3029e688 100644 --- a/changelogs/current.yaml +++ b/changelogs/current.yaml @@ -12,6 +12,9 @@ bug_fixes: change: | Relaxed the restriction on SNI logging to allow the ``_`` character, even if ``envoy.reloadable_features.sanitize_sni_in_access_log`` is enabled. +- area: tracers + change: | + Avoid possible overflow when setting span attributes in Dynatrace sampler. removed_config_or_runtime: # *Normally occurs at the end of the* :ref:`deprecation period ` diff --git a/source/extensions/tracers/opentelemetry/samplers/dynatrace/sampling_controller.cc b/source/extensions/tracers/opentelemetry/samplers/dynatrace/sampling_controller.cc index e14ad0fa34..e4a7643730 100644 --- a/source/extensions/tracers/opentelemetry/samplers/dynatrace/sampling_controller.cc +++ b/source/extensions/tracers/opentelemetry/samplers/dynatrace/sampling_controller.cc @@ -75,7 +75,7 @@ SamplingState SamplingController::getSamplingState(const std::string& sampling_k } absl::ReaderMutexLock ss_lock{&stream_summary_mutex_}; const uint32_t exp = stream_summary_->getN() / divisor; - return SamplingState{exp}; + return SamplingState{std::min(exp, MAX_SAMPLING_EXPONENT)}; } std::string SamplingController::getSamplingKey(const absl::string_view path_query, diff --git a/test/extensions/tracers/opentelemetry/samplers/dynatrace/sampling_controller_test.cc b/test/extensions/tracers/opentelemetry/samplers/dynatrace/sampling_controller_test.cc index f56f2c86d4..17da6ac7cb 100644 --- a/test/extensions/tracers/opentelemetry/samplers/dynatrace/sampling_controller_test.cc +++ b/test/extensions/tracers/opentelemetry/samplers/dynatrace/sampling_controller_test.cc @@ -206,6 +206,13 @@ TEST(SamplingControllerTest, TestWarmup) { EXPECT_EQ(sc.getSamplingState("GET_1").getExponent(), 8); EXPECT_EQ(sc.getSamplingState("GET_6").getExponent(), 8); EXPECT_EQ(sc.getSamplingState("GET_789").getExponent(), 8); + + offerEntry(sc, "GET_7", 10000); + EXPECT_EQ(sc.getSamplingState("GET_1").getExponent(), SamplingController::MAX_SAMPLING_EXPONENT); + EXPECT_EQ(sc.getSamplingState("GET_6").getExponent(), SamplingController::MAX_SAMPLING_EXPONENT); + EXPECT_EQ(sc.getSamplingState("GET_789").getExponent(), + SamplingController::MAX_SAMPLING_EXPONENT); + EXPECT_EQ(sc.getSamplingState("GET_7").getExponent(), SamplingController::MAX_SAMPLING_EXPONENT); } // Test getting sampling state from an empty SamplingController From a9965ed134aa78bfd2ea2cc7a37abb34cfaa21f9 Mon Sep 17 00:00:00 2001 From: alyssawilk Date: Wed, 20 Nov 2024 10:27:57 -0500 Subject: [PATCH 25/41] validator: add in removed extension (#37261) Fixes https://github.com/envoyproxy/envoy/issues/36808 --------- Signed-off-by: Alyssa Wilk Signed-off-by: Ryan Northey --- test/tools/schema_validator/BUILD | 1 + 1 file changed, 1 insertion(+) diff --git a/test/tools/schema_validator/BUILD b/test/tools/schema_validator/BUILD index 476f4e1f4a..59ac03bea9 100644 --- a/test/tools/schema_validator/BUILD +++ b/test/tools/schema_validator/BUILD @@ -34,6 +34,7 @@ envoy_cc_test_library( "//source/common/protobuf:utility_lib", "//source/common/stats:isolated_store_lib", "//source/common/version:version_lib", + "//source/extensions/filters/http/match_delegate:config", "//test/test_common:utility_lib", "@envoy_api//envoy/config/bootstrap/v3:pkg_cc_proto", "@envoy_api//envoy/config/route/v3:pkg_cc_proto", From 755c3001001cea77aa60dce51f36ac8b3b954819 Mon Sep 17 00:00:00 2001 From: phlax Date: Mon, 25 Nov 2024 17:03:49 +0000 Subject: [PATCH 26/41] github/ci: Only trigger pr-notifier ci on `main` PRs (#37336) Signed-off-by: Ryan Northey --- .github/workflows/pr_notifier.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/pr_notifier.yml b/.github/workflows/pr_notifier.yml index 2c68e16a1b..4df7785e91 100644 --- a/.github/workflows/pr_notifier.yml +++ b/.github/workflows/pr_notifier.yml @@ -1,5 +1,7 @@ on: pull_request: + branches: + - main workflow_dispatch: schedule: - cron: '0 5 * * 1,2,3,4,5' From aa293ae90d8898b0e6b8224595be8247724c9944 Mon Sep 17 00:00:00 2001 From: phlax Date: Mon, 25 Nov 2024 17:39:43 +0000 Subject: [PATCH 27/41] ci/bazel: Fix repo config (#37349) Signed-off-by: Ryan Northey Signed-off-by: phlax --- .bazelrc | 3 +++ .github/workflows/_publish_build.yml | 6 ++---- .github/workflows/_publish_verify.yml | 3 +-- .github/workflows/envoy-macos.yml | 4 +--- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.bazelrc b/.bazelrc index 2085088e30..7638c58171 100644 --- a/.bazelrc +++ b/.bazelrc @@ -542,6 +542,9 @@ common:remote-envoy-engflow --config=common-envoy-engflow common:remote-envoy-engflow --config=cache-envoy-engflow common:remote-envoy-engflow --config=rbe-envoy-engflow +common:remote-cache-envoy-engflow --config=common-envoy-engflow +common:remote-cache-envoy-engflow --config=cache-envoy-engflow + ############################################################################# # debug: Various Bazel debugging flags ############################################################################# diff --git a/.github/workflows/_publish_build.yml b/.github/workflows/_publish_build.yml index 3f809ac06f..7c17547e19 100644 --- a/.github/workflows/_publish_build.yml +++ b/.github/workflows/_publish_build.yml @@ -66,8 +66,7 @@ jobs: name: Release (arm64) arch: arm64 bazel-extra: >- - --config=cache-envoy-engflow - --config=bes-envoy-engflow + --config=remote-cache-envoy-engflow rbe: false runs-on: envoy-arm64-medium @@ -84,8 +83,7 @@ jobs: uses: ./.github/workflows/_run.yml with: bazel-extra: >- - --config=cache-envoy-engflow - --config=bes-envoy-engflow + --config=remote-cache-envoy-engflow downloads: | release.${{ matrix.arch }}: release/${{ matrix.arch }}/bin/ target: ${{ matrix.target }} diff --git a/.github/workflows/_publish_verify.yml b/.github/workflows/_publish_verify.yml index 80e93d0a2b..166842e4dc 100644 --- a/.github/workflows/_publish_verify.yml +++ b/.github/workflows/_publish_verify.yml @@ -130,6 +130,5 @@ jobs: target: verify_distro arch: arm64 bazel-extra: >- - --config=cache-envoy-engflow - --config=bes-envoy-engflow + --config=remote-cache-envoy-engflow runs-on: envoy-arm64-small diff --git a/.github/workflows/envoy-macos.yml b/.github/workflows/envoy-macos.yml index 4c5da31f4e..d0cba38358 100644 --- a/.github/workflows/envoy-macos.yml +++ b/.github/workflows/envoy-macos.yml @@ -64,9 +64,7 @@ jobs: _BAZEL_BUILD_EXTRA_OPTIONS=( --remote_download_toplevel --flaky_test_attempts=2 - --config=bes-envoy-engflow - --config=cache-envoy-engflow - --config=common-envoy-engflow + --config=remote-cache-envoy-engflow --config=ci) export BAZEL_BUILD_EXTRA_OPTIONS=${_BAZEL_BUILD_EXTRA_OPTIONS[*]} From 733e18c34d4dab005df3bf1a1cd31fc24b1139b5 Mon Sep 17 00:00:00 2001 From: phlax Date: Mon, 25 Nov 2024 17:49:06 +0000 Subject: [PATCH 28/41] changelog: Add entry for `schema_validation_tool` fix (#37335) Signed-off-by: Ryan Northey Signed-off-by: phlax --- changelogs/current.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changelogs/current.yaml b/changelogs/current.yaml index 1a3029e688..98d1cd7155 100644 --- a/changelogs/current.yaml +++ b/changelogs/current.yaml @@ -15,6 +15,9 @@ bug_fixes: - area: tracers change: | Avoid possible overflow when setting span attributes in Dynatrace sampler. +- area: validation/tools + change: | + Add back missing extension for ``schema_validator_tool``. removed_config_or_runtime: # *Normally occurs at the end of the* :ref:`deprecation period ` From 37d1d15a6b1dcaec21c1bcbe6d991c26efc41286 Mon Sep 17 00:00:00 2001 From: yanavlasov Date: Mon, 25 Nov 2024 11:58:02 -0500 Subject: [PATCH 29/41] Patch c-ares CVE-2024-25629 (#37269) c-ares is currently behind on upgrades due to incompatibility with gRPC. Patching c-ares CVE-2024-25629 to avoid scanner complaints. Signed-off-by: Yan Avlasov Signed-off-by: yanavlasov Signed-off-by: Ryan Northey --- bazel/foreign_cc/cares.patch | 19 +++++++++++++++++++ changelogs/current.yaml | 3 +++ 2 files changed, 22 insertions(+) diff --git a/bazel/foreign_cc/cares.patch b/bazel/foreign_cc/cares.patch index 6b2f7affae..0ec1860298 100644 --- a/bazel/foreign_cc/cares.patch +++ b/bazel/foreign_cc/cares.patch @@ -56,3 +56,22 @@ index ca597db7ad..2f8e4de30d 100644 if (err < 0) { ares__close_socket(channel, s); return ARES_ECONNREFUSED; +diff --git a/src/lib/ares__read_line.c b/src/lib/ares__read_line.c +index 38beda6f..9fbdc5e6 100644 +--- a/src/lib/ares__read_line.c ++++ b/src/lib/ares__read_line.c +@@ -60,6 +60,14 @@ int ares__read_line(FILE *fp, char **buf, size_t *bufsize) + if (!fgets(*buf + offset, bytestoread, fp)) + return (offset != 0) ? 0 : (ferror(fp)) ? ARES_EFILE : ARES_EOF; + len = offset + strlen(*buf + offset); ++ ++ /* Probably means there was an embedded NULL as the first character in ++ * the line, throw away line */ ++ if (len == 0) { ++ offset = 0; ++ continue; ++ } ++ + if ((*buf)[len - 1] == '\n') + { + (*buf)[len - 1] = 0; diff --git a/changelogs/current.yaml b/changelogs/current.yaml index 98d1cd7155..1d7617e18d 100644 --- a/changelogs/current.yaml +++ b/changelogs/current.yaml @@ -5,6 +5,9 @@ behavior_changes: minor_behavior_changes: # *Changes that may cause incompatibilities for some users, but should not for most* +- area: dns + change: | + Patched c-ares to address CVE-2024-25629. bug_fixes: # *Changes expected to improve the state of the world and are unlikely to have negative effects* From 8a1164647d225a249cb77472e15df74a577551e5 Mon Sep 17 00:00:00 2001 From: phlax Date: Wed, 23 Oct 2024 19:52:15 +0100 Subject: [PATCH 30/41] ci/tests: Boost more worker cores for flakey integration tests (#36793) Signed-off-by: Ryan Northey Signed-off-by: phlax --- test/extensions/filters/http/grpc_json_transcoder/BUILD | 2 +- test/extensions/filters/http/wasm/BUILD | 2 +- test/integration/BUILD | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/extensions/filters/http/grpc_json_transcoder/BUILD b/test/extensions/filters/http/grpc_json_transcoder/BUILD index e45bb375e9..2c3d44af8c 100644 --- a/test/extensions/filters/http/grpc_json_transcoder/BUILD +++ b/test/extensions/filters/http/grpc_json_transcoder/BUILD @@ -66,7 +66,7 @@ envoy_extension_cc_test( "//test/proto:bookstore_proto_descriptor", ], extension_names = ["envoy.filters.http.grpc_json_transcoder"], - rbe_pool = "6gig", + rbe_pool = "2core", tags = [ "cpu:3", ], diff --git a/test/extensions/filters/http/wasm/BUILD b/test/extensions/filters/http/wasm/BUILD index 130216302e..9b191fd458 100644 --- a/test/extensions/filters/http/wasm/BUILD +++ b/test/extensions/filters/http/wasm/BUILD @@ -86,7 +86,7 @@ envoy_extension_cc_test( "//test/extensions/filters/http/wasm/test_data:test_cpp.wasm", ]), extension_names = ["envoy.filters.http.wasm"], - rbe_pool = "2core", + rbe_pool = "4core", shard_count = 16, tags = ["skip_on_windows"], deps = [ diff --git a/test/integration/BUILD b/test/integration/BUILD index 43a0777400..0584dc5ebc 100644 --- a/test/integration/BUILD +++ b/test/integration/BUILD @@ -59,7 +59,7 @@ envoy_cc_test( srcs = envoy_select_admin_functionality( ["ads_integration_test.cc"], ), - rbe_pool = "6gig", + rbe_pool = "2core", tags = [ "cpu:3", ], From 368390f0e700be6cfeac2238c7fa687597e7775e Mon Sep 17 00:00:00 2001 From: phlax Date: Thu, 24 Oct 2024 17:40:52 +0100 Subject: [PATCH 31/41] ci/rbe: Boost cpus for a couple more integration tests (#36807) Signed-off-by: Ryan Northey Signed-off-by: phlax --- test/extensions/filters/http/wasm/BUILD | 2 +- test/integration/BUILD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/extensions/filters/http/wasm/BUILD b/test/extensions/filters/http/wasm/BUILD index 9b191fd458..bac3fadfaf 100644 --- a/test/extensions/filters/http/wasm/BUILD +++ b/test/extensions/filters/http/wasm/BUILD @@ -61,7 +61,7 @@ envoy_extension_cc_test( "//test/extensions/filters/http/wasm/test_data:test_cpp.wasm", ]), extension_names = ["envoy.filters.http.wasm"], - rbe_pool = "6gig", + rbe_pool = "2core", shard_count = 16, tags = ["skip_on_windows"], deps = [ diff --git a/test/integration/BUILD b/test/integration/BUILD index 0584dc5ebc..dd223550d5 100644 --- a/test/integration/BUILD +++ b/test/integration/BUILD @@ -2623,7 +2623,7 @@ envoy_cc_test( name = "weighted_cluster_integration_test", size = "large", srcs = ["weighted_cluster_integration_test.cc"], - rbe_pool = "6gig", + rbe_pool = "2core", tags = [ "cpu:3", ], From 60edc4e3cf877fd6af20315cf3ae94947347b7d3 Mon Sep 17 00:00:00 2001 From: phlax Date: Fri, 25 Oct 2024 13:30:19 +0100 Subject: [PATCH 32/41] ci/rbe: Boost cpu/mem for more integration tests (#36825) Signed-off-by: Ryan Northey Signed-off-by: phlax --- test/extensions/filters/http/rate_limit_quota/BUILD | 4 ++-- test/extensions/filters/network/connection_limit/BUILD | 2 +- test/extensions/filters/network/redis_proxy/BUILD | 2 +- test/integration/BUILD | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/extensions/filters/http/rate_limit_quota/BUILD b/test/extensions/filters/http/rate_limit_quota/BUILD index ed43b1c5cb..284b0d0a78 100644 --- a/test/extensions/filters/http/rate_limit_quota/BUILD +++ b/test/extensions/filters/http/rate_limit_quota/BUILD @@ -107,8 +107,8 @@ envoy_extension_cc_test( size = "large", srcs = ["integration_test.cc"], extension_names = ["envoy.filters.http.rate_limit_quota"], - rbe_pool = "6gig", - shard_count = 2, + rbe_pool = "4core", + shard_count = 4, tags = [ "cpu:3", "skip_on_windows", diff --git a/test/extensions/filters/network/connection_limit/BUILD b/test/extensions/filters/network/connection_limit/BUILD index 54545f1f87..80cf8f9fe5 100644 --- a/test/extensions/filters/network/connection_limit/BUILD +++ b/test/extensions/filters/network/connection_limit/BUILD @@ -30,7 +30,7 @@ envoy_extension_cc_test( size = "large", srcs = ["connection_limit_integration_test.cc"], extension_names = ["envoy.filters.network.connection_limit"], - rbe_pool = "6gig", + rbe_pool = "2core", deps = [ "//source/extensions/filters/network/connection_limit:config", "//source/extensions/filters/network/tcp_proxy:config", diff --git a/test/extensions/filters/network/redis_proxy/BUILD b/test/extensions/filters/network/redis_proxy/BUILD index 5ce18070ca..f8d9630772 100644 --- a/test/extensions/filters/network/redis_proxy/BUILD +++ b/test/extensions/filters/network/redis_proxy/BUILD @@ -18,7 +18,7 @@ envoy_extension_cc_test( name = "command_splitter_impl_test", srcs = ["command_splitter_impl_test.cc"], extension_names = ["envoy.filters.network.redis_proxy"], - rbe_pool = "2core", + rbe_pool = "4core", deps = [ ":redis_mocks", "//source/common/stats:isolated_store_lib", diff --git a/test/integration/BUILD b/test/integration/BUILD index dd223550d5..0a485884c4 100644 --- a/test/integration/BUILD +++ b/test/integration/BUILD @@ -539,7 +539,7 @@ envoy_cc_test( srcs = [ "multiplexed_integration_test.cc", ], - rbe_pool = "6gig", + rbe_pool = "2core", shard_count = 10, tags = [ "cpu:3", @@ -1692,7 +1692,7 @@ envoy_cc_test( name = "listener_extension_discovery_integration_test", size = "large", srcs = ["listener_extension_discovery_integration_test.cc"], - rbe_pool = "6gig", + rbe_pool = "2core", deps = [ ":http_integration_lib", "//source/extensions/filters/network/tcp_proxy:config", From dce7db3c484d6b07a43aec5c65ef82609fff23b5 Mon Sep 17 00:00:00 2001 From: phlax Date: Fri, 25 Oct 2024 22:58:51 +0100 Subject: [PATCH 33/41] ci/rbe: Boost cpus for more integration tests (#36837) Signed-off-by: Ryan Northey Signed-off-by: phlax --- test/extensions/common/wasm/BUILD | 2 +- test/extensions/transport_sockets/http_11_proxy/BUILD | 2 +- test/integration/BUILD | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/extensions/common/wasm/BUILD b/test/extensions/common/wasm/BUILD index 6fc9f6885b..8848211404 100644 --- a/test/extensions/common/wasm/BUILD +++ b/test/extensions/common/wasm/BUILD @@ -42,7 +42,7 @@ envoy_cc_test( "//test/extensions/common/wasm/test_data:test_restriction_cpp.wasm", ]), external_deps = ["abseil_optional"], - rbe_pool = "6gig", + rbe_pool = "2core", tags = ["skip_on_windows"], deps = [ "//source/common/common:hex_lib", diff --git a/test/extensions/transport_sockets/http_11_proxy/BUILD b/test/extensions/transport_sockets/http_11_proxy/BUILD index c634aba714..5867dbbe61 100644 --- a/test/extensions/transport_sockets/http_11_proxy/BUILD +++ b/test/extensions/transport_sockets/http_11_proxy/BUILD @@ -31,7 +31,7 @@ envoy_extension_cc_test( size = "large", srcs = ["connect_integration_test.cc"], extension_names = ["envoy.transport_sockets.http_11_proxy"], - rbe_pool = "6gig", + rbe_pool = "2core", deps = [ "//source/extensions/clusters/dynamic_forward_proxy:cluster", "//source/extensions/filters/http/dynamic_forward_proxy:config", diff --git a/test/integration/BUILD b/test/integration/BUILD index 0a485884c4..5dd99c78a9 100644 --- a/test/integration/BUILD +++ b/test/integration/BUILD @@ -31,7 +31,7 @@ envoy_cc_test_library( "//test/config/integration:server_xds_files", "//test/config/integration/certs", ], - rbe_pool = "6gig", + rbe_pool = "2core", deps = [ ":http_integration_lib", "//source/common/common:matchers_lib", @@ -2509,7 +2509,7 @@ envoy_cc_test( "//conditions:default": ["quic_protocol_integration_test.cc"], }), data = ["//test/config/integration/certs"], - rbe_pool = "2core", + rbe_pool = "4core", shard_count = 16, tags = [ "cpu:4", From b7231f19f60506178ae4c6e479bbd9f5c46dafa0 Mon Sep 17 00:00:00 2001 From: phlax Date: Tue, 29 Oct 2024 10:36:00 +0000 Subject: [PATCH 34/41] ci/rbe: Boost cpu for another integration test (#36885) Signed-off-by: Ryan Northey Signed-off-by: phlax --- test/extensions/filters/http/on_demand/BUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/extensions/filters/http/on_demand/BUILD b/test/extensions/filters/http/on_demand/BUILD index 145fc0ff8f..4314164855 100644 --- a/test/extensions/filters/http/on_demand/BUILD +++ b/test/extensions/filters/http/on_demand/BUILD @@ -33,7 +33,7 @@ envoy_extension_cc_test( size = "large", srcs = ["on_demand_integration_test.cc"], extension_names = ["envoy.filters.http.on_demand"], - rbe_pool = "6gig", + rbe_pool = "2core", tags = [ "cpu:3", ], From 96ba8c5fcca466ab3a918e3f08d3b8f8d157e6ac Mon Sep 17 00:00:00 2001 From: phlax Date: Thu, 31 Oct 2024 11:40:56 +0000 Subject: [PATCH 35/41] ci/rbe: Boost cpus for some more integration tests (#36930) Signed-off-by: Ryan Northey Signed-off-by: phlax --- test/extensions/filters/http/ext_proc/BUILD | 2 +- test/extensions/filters/http/wasm/BUILD | 2 +- test/integration/BUILD | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/extensions/filters/http/ext_proc/BUILD b/test/extensions/filters/http/ext_proc/BUILD index 3ecc8ed945..97bcd52df8 100644 --- a/test/extensions/filters/http/ext_proc/BUILD +++ b/test/extensions/filters/http/ext_proc/BUILD @@ -39,7 +39,7 @@ envoy_extension_cc_test( ], }), extension_names = ["envoy.filters.http.ext_proc"], - rbe_pool = "6gig", + rbe_pool = "2core", tags = ["skip_on_windows"], deps = [ ":mock_server_lib", diff --git a/test/extensions/filters/http/wasm/BUILD b/test/extensions/filters/http/wasm/BUILD index bac3fadfaf..79553cc3ae 100644 --- a/test/extensions/filters/http/wasm/BUILD +++ b/test/extensions/filters/http/wasm/BUILD @@ -35,7 +35,7 @@ envoy_extension_cc_test( "//test/extensions/filters/http/wasm/test_data:shared_queue_rust.wasm", ]), extension_names = ["envoy.filters.http.wasm"], - rbe_pool = "2core", + rbe_pool = "4core", shard_count = 50, tags = [ "cpu:4", diff --git a/test/integration/BUILD b/test/integration/BUILD index 5dd99c78a9..0b39077139 100644 --- a/test/integration/BUILD +++ b/test/integration/BUILD @@ -862,7 +862,7 @@ envoy_cc_test( srcs = [ "instantiate_protocol_integration_test.cc", ], - rbe_pool = "6gig", + rbe_pool = "2core", # As this test has many H1/H2/v4/v6 tests it takes a while to run. # Shard it enough to bring the run time in line with other integration tests. shard_count = 16, From 56938a266a513e6530a1faad0232715ec7ade94c Mon Sep 17 00:00:00 2001 From: phlax Date: Thu, 31 Oct 2024 18:41:26 +0000 Subject: [PATCH 36/41] ci/rbe: Boost cpus for more flakey tests (#36942) Signed-off-by: Ryan Northey Signed-off-by: phlax --- test/extensions/filters/http/dynamic_forward_proxy/BUILD | 2 +- test/extensions/filters/http/grpc_json_transcoder/BUILD | 2 +- test/integration/BUILD | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/extensions/filters/http/dynamic_forward_proxy/BUILD b/test/extensions/filters/http/dynamic_forward_proxy/BUILD index db838f3284..bf6fc9ecd2 100644 --- a/test/extensions/filters/http/dynamic_forward_proxy/BUILD +++ b/test/extensions/filters/http/dynamic_forward_proxy/BUILD @@ -74,7 +74,7 @@ envoy_extension_cc_test( "//test/config/integration/certs", ], extension_names = ["envoy.filters.http.dynamic_forward_proxy"], - rbe_pool = "6gig", + rbe_pool = "2core", # TODO(envoyproxy/windows-dev): Diagnose failure shown on clang-cl build, see: # https://gist.github.com/wrowe/a152cb1d12c2f751916122aed39d8517 tags = ["fails_on_clang_cl"], diff --git a/test/extensions/filters/http/grpc_json_transcoder/BUILD b/test/extensions/filters/http/grpc_json_transcoder/BUILD index 2c3d44af8c..c9af479253 100644 --- a/test/extensions/filters/http/grpc_json_transcoder/BUILD +++ b/test/extensions/filters/http/grpc_json_transcoder/BUILD @@ -66,7 +66,7 @@ envoy_extension_cc_test( "//test/proto:bookstore_proto_descriptor", ], extension_names = ["envoy.filters.http.grpc_json_transcoder"], - rbe_pool = "2core", + rbe_pool = "4core", tags = [ "cpu:3", ], diff --git a/test/integration/BUILD b/test/integration/BUILD index 0b39077139..971b455aef 100644 --- a/test/integration/BUILD +++ b/test/integration/BUILD @@ -642,7 +642,7 @@ envoy_cc_test( srcs = [ "buffer_accounting_integration_test.cc", ], - rbe_pool = "6gig", + rbe_pool = "2core", tags = [ "cpu:3", ], From ea403ec9a40a2cadab15db0cd39b79c6b1109303 Mon Sep 17 00:00:00 2001 From: phlax Date: Wed, 6 Nov 2024 14:31:43 +0000 Subject: [PATCH 37/41] ci: Boost mem for integration test (#37009) Signed-off-by: Ryan Northey --- test/integration/BUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/BUILD b/test/integration/BUILD index 971b455aef..9d54770109 100644 --- a/test/integration/BUILD +++ b/test/integration/BUILD @@ -59,7 +59,7 @@ envoy_cc_test( srcs = envoy_select_admin_functionality( ["ads_integration_test.cc"], ), - rbe_pool = "2core", + rbe_pool = "4core", tags = [ "cpu:3", ], From fd3e049a73906d4e8c7c97cda70c71ebc771872e Mon Sep 17 00:00:00 2001 From: phlax Date: Tue, 19 Nov 2024 02:17:33 +0000 Subject: [PATCH 38/41] ci: Boost cpu for flakey grpc integration test (#37223) Signed-off-by: Ryan Northey Signed-off-by: phlax --- test/extensions/access_loggers/grpc/BUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/extensions/access_loggers/grpc/BUILD b/test/extensions/access_loggers/grpc/BUILD index 3898b5256c..84d573adc9 100644 --- a/test/extensions/access_loggers/grpc/BUILD +++ b/test/extensions/access_loggers/grpc/BUILD @@ -93,7 +93,7 @@ envoy_extension_cc_test( size = "large", srcs = ["http_grpc_access_log_integration_test.cc"], extension_names = ["envoy.access_loggers.http_grpc"], - rbe_pool = "6gig", + rbe_pool = "2core", deps = [ "//source/common/buffer:zero_copy_input_stream_lib", "//source/common/grpc:codec_lib", From faf1db422195010e42acf352e5366c27dbeb8685 Mon Sep 17 00:00:00 2001 From: phlax Date: Thu, 21 Nov 2024 19:51:16 +0000 Subject: [PATCH 39/41] ci: Boost cpu for flakey on_demand integration test (#37294) Signed-off-by: Ryan Northey --- test/extensions/filters/http/on_demand/BUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/extensions/filters/http/on_demand/BUILD b/test/extensions/filters/http/on_demand/BUILD index 4314164855..9c6d25f293 100644 --- a/test/extensions/filters/http/on_demand/BUILD +++ b/test/extensions/filters/http/on_demand/BUILD @@ -33,7 +33,7 @@ envoy_extension_cc_test( size = "large", srcs = ["on_demand_integration_test.cc"], extension_names = ["envoy.filters.http.on_demand"], - rbe_pool = "2core", + rbe_pool = "4core", tags = [ "cpu:3", ], From 7df89cc5519c7a8384a2fbbcaed66f5c407415d5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 29 Nov 2024 10:42:58 +0000 Subject: [PATCH 40/41] build(deps): bump distroless/base-nossl-debian12 from `174f326` to `2a803cc` in /ci (#37410) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Signed-off-by: Ryan Northey --- ci/Dockerfile-envoy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/Dockerfile-envoy b/ci/Dockerfile-envoy index 1bf9d5dcab..174173f951 100644 --- a/ci/Dockerfile-envoy +++ b/ci/Dockerfile-envoy @@ -58,7 +58,7 @@ COPY --chown=0:0 --chmod=755 \ # STAGE: envoy-distroless -FROM gcr.io/distroless/base-nossl-debian12:nonroot@sha256:174f326c2730c718b3f857735c2a55f654dc057285ecacc7c29736ee777acb08 AS envoy-distroless +FROM gcr.io/distroless/base-nossl-debian12:nonroot@sha256:2a803cc873dc1a69a33087ee10c75755367dd2c259219893504680480ad563f0 AS envoy-distroless EXPOSE 10000 ENTRYPOINT ["/usr/local/bin/envoy"] CMD ["-c", "/etc/envoy/envoy.yaml"] From d045f4201477d50bc64a3bd38c28cfec67c272ca Mon Sep 17 00:00:00 2001 From: "publish-envoy[bot]" <140627008+publish-envoy[bot]@users.noreply.github.com> Date: Fri, 29 Nov 2024 15:16:14 +0000 Subject: [PATCH 41/41] repo: Release v1.31.4 **Summary of changes**: - Minor bug fixes **Docker images**: https://hub.docker.com/r/envoyproxy/envoy/tags?page=1&name=v1.31.4 **Docs**: https://www.envoyproxy.io/docs/envoy/v1.31.4/ **Release notes**: https://www.envoyproxy.io/docs/envoy/v1.31.4/version_history/v1.31/v1.31.4 **Full changelog**: https://github.com/envoyproxy/envoy/compare/v1.31.3...v1.31.4 Signed-off-by: Ryan Northey --- VERSION.txt | 2 +- changelogs/1.29.11.yaml | 15 +++++++++++++++ changelogs/1.30.8.yaml | 18 ++++++++++++++++++ changelogs/current.yaml | 14 +------------- docs/inventories/v1.29/objects.inv | Bin 168441 -> 168462 bytes docs/inventories/v1.30/objects.inv | Bin 172251 -> 172296 bytes docs/inventories/v1.31/objects.inv | Bin 175768 -> 175843 bytes docs/versions.yaml | 6 +++--- 8 files changed, 38 insertions(+), 17 deletions(-) create mode 100644 changelogs/1.29.11.yaml create mode 100644 changelogs/1.30.8.yaml diff --git a/VERSION.txt b/VERSION.txt index 6e24a0f33c..cca52685e7 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -1.31.4-dev +1.31.4 diff --git a/changelogs/1.29.11.yaml b/changelogs/1.29.11.yaml new file mode 100644 index 0000000000..1ae719a513 --- /dev/null +++ b/changelogs/1.29.11.yaml @@ -0,0 +1,15 @@ +date: December 8, 2024 + +minor_behavior_changes: +- area: dns + change: | + Patched c-ares to address CVE-2024-25629. + +bug_fixes: +- area: access_log + change: | + Relaxed the restriction on SNI logging to allow the ``_`` character, even if + ``envoy.reloadable_features.sanitize_sni_in_access_log`` is enabled. +- area: validation/tools + change: | + Add back missing extension for ``schema_validator_tool``. diff --git a/changelogs/1.30.8.yaml b/changelogs/1.30.8.yaml new file mode 100644 index 0000000000..1a5d8e83f2 --- /dev/null +++ b/changelogs/1.30.8.yaml @@ -0,0 +1,18 @@ +date: December 8, 2024 + +minor_behavior_changes: +- area: dns + change: | + Patched c-ares to address CVE-2024-25629. + +bug_fixes: +- area: access_log + change: | + Relaxed the restriction on SNI logging to allow the ``_`` character, even if + ``envoy.reloadable_features.sanitize_sni_in_access_log`` is enabled. +- area: tracers + change: | + Avoid possible overflow when setting span attributes in Dynatrace sampler. +- area: validation/tools + change: | + Add back missing extension for ``schema_validator_tool``. diff --git a/changelogs/current.yaml b/changelogs/current.yaml index 1d7617e18d..1a5d8e83f2 100644 --- a/changelogs/current.yaml +++ b/changelogs/current.yaml @@ -1,16 +1,11 @@ -date: Pending - -behavior_changes: -# *Changes that are expected to cause an incompatibility if applicable; deployment changes are likely required* +date: December 8, 2024 minor_behavior_changes: -# *Changes that may cause incompatibilities for some users, but should not for most* - area: dns change: | Patched c-ares to address CVE-2024-25629. bug_fixes: -# *Changes expected to improve the state of the world and are unlikely to have negative effects* - area: access_log change: | Relaxed the restriction on SNI logging to allow the ``_`` character, even if @@ -21,10 +16,3 @@ bug_fixes: - area: validation/tools change: | Add back missing extension for ``schema_validator_tool``. - -removed_config_or_runtime: -# *Normally occurs at the end of the* :ref:`deprecation period ` - -new_features: - -deprecated: diff --git a/docs/inventories/v1.29/objects.inv b/docs/inventories/v1.29/objects.inv index f39a46f04de2fccd53df68ab00b93ded2987b0b7..97f301799921a1f6c534e12687cbd3262349a5be 100644 GIT binary patch delta 4032 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 WfMi0VT1;VEKQ&kRqQli9tN#ZO0=5YN delta 4011 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 Ke5k%<<^KSC8KDgT diff --git a/docs/inventories/v1.30/objects.inv b/docs/inventories/v1.30/objects.inv index 2daecd7fd2166c9baa36bc810fc5b05f1a4eb594..79532a36ef4ea2031acbbf3c9d77a0038d8469eb 100644 GIT binary patch delta 4331 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 H+Qj@HswX)j delta 4286 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 diff --git a/docs/inventories/v1.31/objects.inv b/docs/inventories/v1.31/objects.inv index 8bd3786841cb44937eb0d734f954bd9f8e7adebe..e5393f9ff09e506194bfe32b4c6e92f1c0653cb9 100644 GIT binary patch delta 6839 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 delta 6763 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 Sp1+j;BJ%4Fd-Wb&&;J2@