From 5fdce0e2b51d4856a0dd48431ded1f82da337687 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Fri, 16 Aug 2024 08:52:56 +0200 Subject: [PATCH] hydra: move from bagel-box to build-coord --- hosts/bagel-box/default.nix | 5 ----- hosts/build-coord/default.nix | 6 ++++++ secrets.nix | 8 ++++---- secrets/hydra-postgres-key.age | Bin 1245 -> 1245 bytes secrets/hydra-s3-credentials.age | Bin 1150 -> 1150 bytes secrets/hydra-signing-priv.age | Bin 1124 -> 1124 bytes secrets/hydra-ssh-key-priv.age | Bin 1429 -> 1429 bytes 7 files changed, 10 insertions(+), 9 deletions(-) diff --git a/hosts/bagel-box/default.nix b/hosts/bagel-box/default.nix index f8ca29a..201cb88 100644 --- a/hosts/bagel-box/default.nix +++ b/hosts/bagel-box/default.nix @@ -37,11 +37,6 @@ bagel.services = { postgres.enable = true; - - hydra.enable = true; - # Takes 10 builders (0 → 9). - hydra.builders = lib.genList (i: "builder-${builtins.toString i}") 10; - ofborg.enable = true; }; diff --git a/hosts/build-coord/default.nix b/hosts/build-coord/default.nix index 05c6ec1..3c0ce60 100644 --- a/hosts/build-coord/default.nix +++ b/hosts/build-coord/default.nix @@ -7,6 +7,12 @@ bagel.sysadmin.enable = true; + bagel.services = { + hydra.enable = true; + # Takes 10 builders (0 → 9). + hydra.builders = lib.genList (i: "builder-${builtins.toString i}") 10; + }; + system.stateVersion = "24.05"; deployment.targetHost = "build-coord.wob01.infra.forkos.org"; } diff --git a/secrets.nix b/secrets.nix index fb35cad..d3df1bf 100644 --- a/secrets.nix +++ b/secrets.nix @@ -4,10 +4,10 @@ let commonKeys = keys.users.delroth ++ keys.users.raito; secrets = with keys; { - hydra-postgres-key = [ machines.bagel-box ]; - hydra-s3-credentials = [ machines.bagel-box ]; - hydra-signing-priv = [ machines.bagel-box ]; - hydra-ssh-key-priv = [ machines.bagel-box ]; + hydra-postgres-key = [ machines.build-coord ]; + hydra-s3-credentials = [ machines.build-coord ]; + hydra-signing-priv = [ machines.build-coord ]; + hydra-ssh-key-priv = [ machines.build-coord ]; netbox-environment = [ machines.meta01 ]; mimir-environment = [ machines.meta01 ]; diff --git a/secrets/hydra-postgres-key.age b/secrets/hydra-postgres-key.age index c8c98ab7d1daf3de1b88fde0e86bf69053e78dfd..389210c48fe5c2f068003805793a8fa57f519fc4 100644 GIT binary patch literal 1245 zcmZXT+pp6E0LI}EJXoWKoDdV_VK2m(a#*{y-5R`gU3b=YYu9eQ4US3IcGs?5+pX;? zfp~c!0U;WEfCqR$1B4Jvj1dBfh!IH)K7hu=D~cFmBBBW%6F}vK7yJu;-nvmkNUJyk%xk6vk8FB&3E>s#A>Iwme2CTE)~(S{n?YQlBwg z9w}%EGAyt>Lkz*}!X%3T%&6|GppUqY|L1v|4hSh@+4EY$G$W8IyRB z#%5c&0+HgefR7`X*UUM$V;CW0d#z#-ECrxQ{;Zwy(d zmA9SIf====RpSUK;oQ33gF9S1XHJX*Jn$~C$aUxkJ`&yeVs*xWb+4*SE1Ddr(c#6W9GYBYhekjT_Ld*TIs9T}wi_LvP}h32T* zg5%Z&6v!6}Lth;Drs3D4fPk@a-s7zrLBhR$)(sQE=5$l1qZWgz-K3$*W7Mq{`7GHp zvo6;f0Pt9gI!?8ywRp0P$x{ioX|RSeRSpUfqgi)B+pC1FaPv|K1{G0XvCa~D{bap(4JIs8Oa}EC0gS8 zDANI&y04D9xd}E#EKu=u6>PZO|1BvUMuH)v2q?huhDXUl2|_ixsFSTAJ&nzFn>PzG zI>}GSR*thXkOTo%OrZ$GXS__MmK#;38KT$4<1peyLmo7%U>VHgZiqTb6y0}w|0R%! z=W0YML={3`uzQ8DgY~RtL?q)P=ys)6HOEd-L?hxUn{=Xntk3{Rs@;hy)X0*ncFSfc ziw#OE;CW5MRf?0ebO5r64TeXte5J}JC5D+CQf?&u{sQ^~G zb$m!p;Hm&retziA!K1>HCl0N_Ixjp5{C@M1#nn4*pIsv`$2K0idusjp3rEGnH_C5* z_3*2E54?BrT;bNTJ9Eh{@uj(w@2WSR{taChAKbR{{3pBDexdK#b!|DkV(XXtK0WjN z-?Nvm-`P52TwU6}d&Rt^=Weat@WzD$Ge08&!OO@4Y`9F?(PyDj~ zpWRPwTlPca!{u|u{aa3Ny@IYgw&nfKrpI>8Uib@H-2C|W)TO(Nuf4c_^VMhKSC+Pm zr)NI9dgaXQhTztv*(3kXcC-5~f2VJvps(jneslQkkKc*pA8&kcO<6^~{Oi)*9e>Vb eb{=i7x_Nfx>&I6L>g}SuV*RO$^y0E}pZ^EGo4)`6 literal 1245 zcmZ9~OXw5@0LSr*qzzQirI3V`AhYrB?9A-5%$(Vo-JPAs&g{$@mz`8`3ScZ2MN{o$Chw_-F$D=d8IAVQuGU=ek zgc9(O%9&O_Uzx=u;NnDfVh9zhsY5be_f0wSkQ|;EPB1TrSkFmmf$5Tkx+mPO(Wq9$ zu?#~O17>U#M8!o|Y|^xA=2##wy9tN7W`k9?01H}^#KM*Ya9XL+EryU?p{j)(<6c!E+*uXP7?G#;StZIS|BifOG_!y^?2 zn21EsB4GvXx~1qbmquo)W|M(cY)z?Q&B-AY->@xC@_V6@q#oFZj7FZ8a=kJXc(4uF zj)ll}P$(xk0rz^XK~GTY@W8I9g4QudLkG?p;xrEAE|Y|Q7bQVhY02#gL(^?ef*~Lx zSw0}iZeo^MrK*B6j_`?Qwli=rLo?>$h-w;rGD*6i&>8YR3Uy`-&zoYu>hm_{_W{=E z2s$$v&s*tW3eqI!x1rYH*4wwbg~CYCg-l4HjIB24WI(5wq3U8Y7CJCuJ9B(K?8W`O zpQX~gFKVy^fMTmq#QUm~P9!GFBPbmzEhu#~FAe5}1dkB838T{}E@f}mvaNEF$1-&X z&8J*sAWFAi#0948`lX;8@w1Xq;iU<04%m@OBF*`T1hjlNUxP~s*(i9mN^gv*tj6vj{Z4$+k9cqru%QOhfn==Hotq_voC)gb(VK5zW&KQ;&3C1huHY5 zW0#)Z_U`PdrPGab+xziO^blnI*8YC|u`hcs5eJUnSDW3$yWQRiXX)WJ>o0zhUBCa} z-|`>G$vvN&TV6ZgTzTZVRX;C3wsqr~ZTnv#KV05-jd`5-VfleiH(!3}_=O2g3g6so Yt~;@~p_6&_)Z*$@&(Gf*J9`iO2gkm`Hvj+t diff --git a/secrets/hydra-s3-credentials.age b/secrets/hydra-s3-credentials.age index 8e0b949f9d3646460a9b34798c0ca4b1a25201e0..17212cc03f095acc37b422b9cc961d9ccc27ee12 100644 GIT binary patch literal 1150 zcmZ9~&CA;a0LO9JK{P0MP$%wE1Rovou}SmR;t-NH&3oH4ZIT8YBx#zLrg?vBm^u|y zm?!lhcu{s0-%#-&q6qFV(Tg5-aGQsD8Myg!5fwc>9`+Y};QRZTu5;)_cD7FnKaL)c zGq+p8z~PgfJogTrbq~YfK?f`=dRKP>I7D%JnR<3aSh<|lBJbf5Mu`vw5z+*4KzCe=ggkuGj9B*&c1jHgJvSVpmXPS-Z zUEI#Ym8A?hlh}sDpddMK*Vk}Y@QH~k#S@VBJzlDNdPQ)#qLy(_sjc-yr5nVB{4Kz3 zbjvg17BdL1-oV)0fD>6qJy_zQbT~`Od_pdy1SeJbNXv4wv(2=jC<7vdl+7;Sla^BS zzPf|M98noOX;XAhdyG0mh|+H%#AZi6BrAJI8OUPH)8lAW_*$?8;&HMIMT_hj^UaiH zdIqXb?U2b6-0n4kg7r+9(_yYM^Ho>#Fer9~rnNG9SEz`gWEmi*8RB9v?ZBh)+8d|4 zMk1rKTd>M*glkGKNKE`nU$YZr!6I zFd!O}qB1jZd9p5b0c4GUBQ&mGNo+S0@+KHSxHiORrcnWgiTX?{toQ|@!K2C8?Y6GE z1nup(&+aXAHDe^kk|TBo+66X=d|nnRQV96iaUzD+EkIRQt(&f6)ARJ13Snzv6|DZR zee~OIRm-;AS@IdOKrsT}Y>){F<(0veT*2sD3fxgM8>LxI9&4t_gec(mr#ZJ@(F$U2 z#2LtGy+wvL*tnn)tyHG4=_A&*frv(59&LN1LGuAIBRl)1rbVF&hm6_RgOqv_vd%$!6?yI7>|uIJo)i=ERqeo_u9sUi#+x zV<%pl5}S{uSMPZ4?epIsoIdl;xqr_eTu={&aQM%u;yU`sYVyAI#S7Pdpsu7(+7*KK)9+{k9Lf4?g_vT~A-=zI^8cH=nv&JNx35H;zf-wfjGM>$5j6(hr?|{;&5w LymaoDZ;$;4hM|u6 literal 1150 zcmZ9~&&%6%0LO7fw?pQ<47bY$#gmxzN%N~eP{ePWG;PwfNs}~fZu!ytZ1c0tFBm8| zWqO!5Q4a$_WH5FSaVH;;XNU&}x{EL#;lV#Z84oHbsFz*#7rc0X_~_2Mxem>=ig#WV z9z>~wOBv2A6mXbzSD)3SLU zC+uXsEm}~;3QFW~wugF}Ccq?|o7?fKAJtyU*1((+G$z$%DTsaNX^q2;P9HSdFzxbH z(Dyw&uv4lWa9xeaCiY5U%Dm?f?AeTTjA$yOG_=SP$6+%#HOcv6q_vX~&%)ep9a=RP zD2~agm6mxP0Py%}4NeyO&}ravCkdQ|V$|uXEPMGj!PY#=P<7ktBz?=><7}p4Kw^Cw z0(OyA>#@BY?yUdId&Jb__q0D1GDVRk9u=l;NJhAiO3@Q7&Gbf)s)LCL0oah`9Uf0N zm4m=5x5QY>W)-k$*VZtUWOt)1iKWcIujP znR#f*UN^;(Q0?qEZB;Rm5BIXHYer?Rhw;o*`{Z^(R)sk220^=Q*DN%)SafGn45+1$ z))uH!rh!3srZXIqv(8{9?w5VUnW#MNg(F*U!QOUX?UH!IR~nje1hfM@XT#2Ru-9j9 zP|K34*U@roPv%l4g=OiKY-=(f=0kvV_bX$_06Zp_-6z<`)+9ND&?KxDm>WyJSthK=Xf-8cfsnd^JY9J}ayVZT5z*CG zCe&;;8%mktQh`!}!6uH}k@pi{TObOyCu~cv#jrgZ%5*XJd!T@RLY{ei{pfq=>%ZT> z_3r&&pF4T>lsfzAcZVmp&)z-%=0~p#&vbq^AK!Z?KBay;zV;S!>5_7EZFBz$P9i-)RqmwGRrIj+(!oqR!Jq$PmY%tMQTPOY``nG=FAuo#^2ZM^{CQh{@cEz6f)9N8Zg$(z_UIL-tP0cPg|yg# z4GfGf4$5*r+WH8N!_;6{H(b&V;Le!N)XG??z8Tm_4;eWn%zNCV@w$X3i-l(@W0y?4 zBM0byXxGTFR~Y9>3J-3AJ!glxRyjIG_KvLs=pWaM*Dml$wpR((7M@@`r6^5WppdM0az zm7A&4DQ)IVHkf2nVBl62i%1}uQQ=`w2cjji4KuZX(P%U{@Y|B8 zmqC}ZylrE>r4c5*wd5QeS)V^6#TJuKa!B>NW1U zZ>MuXy6o)h*|I`!7vkf%E_X literal 1124 zcmZ9~JILGw00(fyCt2*EQbF+6a$NI%sTA_OOLDoppQkpy?g zVK<5dzdzL@CQyQ-vj+uvS~r=PAclEN0Da?69D-*Wa6ibWZSAZ zPS=c5ITChW>*r>b1wC17Q8e6h&eCwg3?d*Gp6nZ;TuWl(+K`BedUXsKD`y#CQrH5m zM|@rolD9dwwUOFoHp2o6w}oL+LUxUmM5bi~H<%9vZ2xSF^S zG+(L>eca9}+UnzhpDHqs&ZK=QY(Pf@nOs1@e1gUbuI7YFQGiNU3n!b@T z7a0eyN;Mm8sz^U(v>Cdx#h1-WNqCjuDX+7`9LY^?)JF_};QT`u$dtk$t=B4~xi_JO zt{BmBOx0Xe?*xqkYs_0@EN2TV-{m@XhSv0|h)Rv;wm>X9QBoUIWPvUe)oN17olcW+ zSgjWz1;?&dASkdUIR;;k;mQf364~<_l4V+Rw)WX? z!Mf2rt=B1P7(+F|V3mx}2ss@UFFWO8N#kBnyPF}R>~qaBJd^^utZ&WwsTfDgtpet7 zqQU4y%CMszS(_+TTaaVdXoIhp(0L8gX>!K&g0cm}G9B~&vCFJTO%KM<06l&u*t(BP zt05a1l?ublPz5TdMUb^n6V9j|b|tGK6+whGxx^@Wq4*e0f{le^DSgBL+kP>wk7x)qsk8QSo5*BC~)09-f;zPLv{U?07>^6ITx*gT$*pZ)sI zL@K5&3UFf~H{{8LVU$6Z1@X3~pKe!8Dc={uG`qd}j=Fa;c z4fmJ%0 zhhQ#7LqJUw6Fmr#pcse=a)M6?8hk+HP!u@{s3)F5PGf=xF$P6n@kalG&x`NxCuwS* zT9vJ#T2nWx_nVgHZTnn(%iN7du}@X}5adJMo>rTv*lvG1sBnI2cp+iVL0SqYwPS(JNgJrFV z_FpX?$Ri=lEjvRdhXJLC5%R-%hs-gyL!_Z_BcQ;cytmx)CzO_+& zMv2NBrsI%8hs9k=DVEm(JzEGGZzMoY zf;h55dm9eG1;n(g)e2>7#TjVxA}%Np$U(da7TX>ZOE<()Kt~ydOApaC5%ZP&Rl#2( zks!|TX$VXRaMg=ds%$Hy4;7?RHzdX%;yCHuc6dD}KCv+jl}(gBFEEhQZ=l4Cd}Yk!;Cd6PQ%NtPa(Qfe_WsQFN66gC-B~(JGxzd!$?=ULjn$ zJf9Tdg4VQwP})jmg%qlBDp1qnS|#kLRwWYi1z0LaM=)1kU!Oam5#@r^@kPuOMe$xr z#%U2n6+F)614LEf6M;}MA|)Jw#9W?D&paZZ&-`)Xr475kJ$iV{TT5bEmp*dk$_t;a zZ2XO+pX{Sne6oFEA^ztt5AE-!wpB-(u^#ihICHY+#BaBc|9Jb% zCKfFk9W5*4K5NmP;Hr0@JvK8v=b<}#GpBo&o;nw;cs8;tXV$2!}B>A7DtqHKQyy>!By_VVeR-&e?@mq_J20U&KZ8=>*t?%eBf93M1J{H b?W?88wxhv&PYvu1Es2iBsK_L{L;vSrP^=cK literal 1429 zcmZXSZH&_d0EQ)=s51nGoZ_i*AOT68>pr`N2-khJTf1)Ux^A5yY+cvxvs=5h+rpVU z5s4uZ2__<#$e|cM1BZfu3Eq(a5*6h01VW5>N)!&|>%c=r{+vJb*ZcFy`@T;~6ih;y zSDKYtPA#XX*C0CjZY6#$`kSfrK(>lj-xB^LKe~5!BVTN$ucwCjjBuxqdK0?7%IaYuGHehI$R6lB|0iFzm z>E3Fi1*4S^kwLXuAX2cCaLqvk2r-fakpIzuDqAm$M%^War52zH!CYPyv3to;LMF&1 zd<;Yg3IrvZc|{cIunjbz=~N^b4(3=*#EAykj0;|$J7uw?Lc9pqNrskug**oYxs*EA zO;J#XWc}OH`qTY8kHXsKm5- zwt|7A79}vNg}@9s*^0KpPz85}qp_qG2vT)33I=(=?{%kfj`JyS2y#HM0J+?aBBr~7 zIUA^!GZ_S>gg`c7u=}GmFdXN+Ee9^Ub%596Dg_j^tV)ATH5SJNfVF@sAf%!|I!Z7J zYXtMAxJDfC<3$Me8E740>OAk^c?%Okf;z?vSzRZ6V2lZikz^UCWx~&tvvNFFFW1zj z0@OIDkFP4p$KB+Xf20PO>>?r${uG#2u7`JQ};$CIFUg^7F`8=;yvdW zn>%30&>2{geE1hj!R~$0ov?v)8aCiOeP}}3*^z77A?wr zq3l;&NB}CbRHF%78kil-s7jg#@i6b?JwC&;n@-&S^mm1E_M82070FHW+vi>MPTgsp zq@agaUk`0K@@Ve)xjrG(vMzo1G0U|J_LZ6ad%tHd0$U%xG<)i|qc5;teadcZ+LwGe0sqrJC29PIn6 z=_rmrw6OoDkDv3dV5YZi>Rx!NXV1QKR~~{7)V`YR+_3q`Xy5RiKvaI9XQb_=kqOU) zQG+hGk1k`O+0fNlw!z;L^Y8p|evz`IiBBYF9OMTQ7rG~{DAs=IJTD%@uB-&RhxXr) z`_9Y-h4k%V_orL8P1@QuwJ)*v?De6u{j0R)LiJi>{RfraYa1q_pDenI1_!mJZ|@j_ z4zuTefA7+~{mQo*|vNIs3tmIS%{dJC<&L;^a4>h0E_-)=PJi