From 27fcd0cb577f61967379482e3af94fb6c668d119 Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" <6454655+adoroszlai@users.noreply.github.com> Date: Tue, 12 Nov 2024 21:29:46 +0100 Subject: [PATCH] HDDS-11685. Use ozone-testkrb5 from GitHub (#7424) --- .github/workflows/ci.yml | 1 - hadoop-ozone/dist/pom.xml | 4 ++-- hadoop-ozone/dist/src/main/keytabs/HTTP.keytab | Bin 580 -> 580 bytes hadoop-ozone/dist/src/main/keytabs/dn.keytab | Bin 576 -> 576 bytes .../dist/src/main/keytabs/hadoop.keytab | Bin 146 -> 146 bytes .../dist/src/main/keytabs/httpfs.keytab | Bin 616 -> 616 bytes hadoop-ozone/dist/src/main/keytabs/jhs.keytab | Bin 142 -> 142 bytes hadoop-ozone/dist/src/main/keytabs/nm.keytab | Bin 138 -> 138 bytes hadoop-ozone/dist/src/main/keytabs/om.keytab | Bin 576 -> 576 bytes hadoop-ozone/dist/src/main/keytabs/recon.keytab | Bin 606 -> 606 bytes hadoop-ozone/dist/src/main/keytabs/rm.keytab | Bin 138 -> 138 bytes hadoop-ozone/dist/src/main/keytabs/s3g.keytab | Bin 586 -> 586 bytes hadoop-ozone/dist/src/main/keytabs/scm.keytab | Bin 586 -> 586 bytes .../dist/src/main/keytabs/testuser.keytab | Bin 908 -> 908 bytes .../dist/src/main/keytabs/testuser2.keytab | Bin 920 -> 920 bytes 15 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c7d2227962a..9cb9f538548 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,7 +32,6 @@ env: TEST_JAVA_VERSION: 17 # JDK version used by CI build and tests; should match the JDK version in apache/ozone-runner image MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.http.retryHandler.class=standard -Dmaven.wagon.http.retryHandler.count=3 OZONE_RUNNER_IMAGE: ghcr.io/apache/ozone-runner - OZONE_RUNNER_VERSION: 20241108-jdk17-1 OZONE_WITH_COVERAGE: ${{ github.event_name == 'push' }} jobs: build-info: diff --git a/hadoop-ozone/dist/pom.xml b/hadoop-ozone/dist/pom.xml index b0fd526b809..223f728f4ee 100644 --- a/hadoop-ozone/dist/pom.xml +++ b/hadoop-ozone/dist/pom.xml @@ -28,8 +28,8 @@ UTF-8 true - 20241104-jdk17-1 - apache/ozone-testkrb5:20230318-1 + 20241108-jdk17-1 + ghcr.io/apache/ozone-testkrb5:20241112-1 true diff --git a/hadoop-ozone/dist/src/main/keytabs/HTTP.keytab b/hadoop-ozone/dist/src/main/keytabs/HTTP.keytab index 889de4410dcd664619083ca5dd85e57050312510..d1715a75062729608dd21db062b3dafa105015d7 100755 GIT binary patch delta 313 zcmX@Ya)f1qie|d8Wj!N<5QD<@mCi3UBc{LVUBp*!HdFNi&z&wO-wYFmPtM}~$FAow zO!QTggeVqd5ZDvn`u41m*SU1n7(1Jl?b9drs3A;J(w=dF@msk?t+#igzxL%v@$Xc7 z<=4o%a#fw&(9-a?W1_Euym2}M0|O)6yjZ4y;Ft4PoVlF%qR(;8lr58`7&Q?FPTBnC z$sOPPe=>U#y%XZ%LMF{M(9m47+UnWvoZ2<-t=~@0VbnypZQ`kO0iwcPAH!xd$}u>x z_)K2MsDUu6^Xq06KeL~@$F!cEvWOK-TG1H0^~&>Us>j2RnHHa5iJ$zRQ9~B)uCw}z U^_-0nmvijQ{wc8kc@J_l08-p^SpWb4 delta 313 zcmX@Ya)f1qie`#v;C@C1AqIuG;y^8pN4HFkj;epL*NVUJ_2q*n#}4=TNk+d7ymW2B zk%_))k`Tp$3<3*Gu6>G}wxH(cx&OaUpJTf}u}2MI($keQXU$%#A^PdurKA%a=RQ8V zUnQU#`rPI5!X7KlubXC1^i_~IPG?|XV1%33G=1&6&HKAv{rz}aFwtag=42^GO@x75 zOJpr(EI;vyPor_UW`M=!9s2`1;-2|lZ#_OCbn?|*PbcRvY9idGF!6V|HQO`u`3{%W z&g?Lbn7ocr17TLg9P5uuv<g@jxGk)AS@n-YZ*f$af^lUi48A467BEmGF zTavmtd;E4->02$F#kOSmy&q8Be(1V6N>YnUN{dsAFx->&(rKUUy=3#-r_9BTrntw( zGS3g1@-}|Y0dcnleTK~0P!sKlG!f{glKroLE4ECSnm8+={!Ka88>k8X=q7N&++>8| zsN+I^J-xXd4P^hm{gQoX`G2zm6J>XAxmL5OXobJ6$%(m8BkhSb66h+ipqOVy6TepM O{bVojLNZnWWCQ?9(W5c| literal 576 zcmZQ&VqjqKU|?e4c8zfK4e)W*bN2UTU`ojYV+IDs6w$!_j0{2y3W@tK>$5N%OEVYJ z?L0m4&-YI)tXyug60RHGtp3>lOfLs$4kHj-5Hw4WLBRcO_nwxC^Ml{rIV^KiT~`#U z*9%=Qi$_RE0ESCec7@GMNMu>d67J8n;nw{%yN{ZzO~3Bk%PJ%mB5*S<2x^)Y5vBp% z^5u$^fWn6Kds|X0f{vaoafa&lL)Xnwl3H9+TAW&h;hwdLrUxHf|9EY0!u9j`SpBUP!sKlG!f{gC7=JSUijH#Uay^40jIJ|3Dg9CbQ3sXZZg7f z)Md7t+ojlNzU6h%m;ZF@f$)F-8Q1ps$(&~Ty^jBG($rF@k@mzI33Syj@!0sl;N=?X Oiq$#`c1(K=G6Ddapr1AX diff --git a/hadoop-ozone/dist/src/main/keytabs/hadoop.keytab b/hadoop-ozone/dist/src/main/keytabs/hadoop.keytab index 239f72714040b5aaaa9d2f3a3dab7e69c05f44e9..ae3cd11e70ff98b88c4e5c30619f36b1769c2506 100755 GIT binary patch delta 81 zcmbQlIEitBs%E;eWj!N<5Q9Qw>3XNb+iFwppF6IS_Wa!WhINU>g)L_PJ=k3@oS2fm jXriCGEJU#&gFwm2KYqEV+eC_9{^$JMsquq>fq@YKHvJ(E delta 81 zcmbQlIEitBs%DC4;C@C1AqIt@ls)0H_oPxRY($UtX7M!Zu9dt#XNB8t_K<^7T*V!# i6aCa>A&LbV1pae3NXY9iebXX1&rVie;0FT(10w)4MH!0# diff --git a/hadoop-ozone/dist/src/main/keytabs/httpfs.keytab b/hadoop-ozone/dist/src/main/keytabs/httpfs.keytab index 99b446f21783cf14a49234ffc7700a4141e66cd4..e5eec5375cb900d6bdd672b2e9efe7b301372629 100755 GIT binary patch delta 315 zcmaFC@`7c8re?aaWj!N<5QD<*4eE1e6m@%En7>YA)n>t;kCupqn@SxJ;IR`Zdb7jy z_rxG=MTlZS27xHPq}x6xjQ6_Cls~-Y@b5hg3=E7w>^Jd)BErNeo8LUS2Db zLR?(Pq`3wfnrl{DJ=>jAyXL+1+lenUCE+GcJasNWRJiM7*lb2Q1}7Gu$y$uM2&3#T z#4o6Own#Uyc^B)I_Mawskt;&ZP7utLtW6B@z5c#)as#6-!mO}KzBlgkOlS=K{i-77 z+mtnvk1^^Y%;K(d*6`4d&C4khZruLhL*!|OJE1e@O>w&>;Lx^X53k8&StdPMxVs*` W3i{OMqa^sMW^2SY+ZVndp8^04lXrFi delta 315 zcmaFC@`7c8re=z0;C@C1AqIv2)6TIbE6G_iCQTN(qQaiQ7I%ZAz{0t!Onpi~v!k)g z#2{@&h+;tofeBys-2J+YW!>U?4V#{u&lY1~U|<{ROd**w+_4tI)$yawho%lji5^kcx#NXl8Y|qT+J6u*fv%@%IvKFH*!YKYJ z+kTnq9_qS3+iYJ*MLSE5*MSR@4Od=IEUqYj70Q-Axq(p^VODpAbBo6XZY{AHHq#Z( zn)yyX#;Audi_c2!MR|NJugA6uCHvNvtv9c{d_6($(BFcObM*X!H|I{4Wzv&{yURQI VSMl}OgE#ohPMXBV*$RPt3IJvabgcjY diff --git a/hadoop-ozone/dist/src/main/keytabs/jhs.keytab b/hadoop-ozone/dist/src/main/keytabs/jhs.keytab index 458b42240a59f1a56a88e9300eb3544bf45fd8d3..d7cd324ec560b8d0e5ee54e7ff46beb6f6a2afa6 100755 GIT binary patch delta 81 zcmeBU>|>muteI|XS|>muteGMjxSx?hh(Te=y{UU9Ep6^q5PtfE{kVgQRK~5z9*@)bd>202dcWqu j?1?_AvJl0B3e@zP8N1_nj|86h82 diff --git a/hadoop-ozone/dist/src/main/keytabs/nm.keytab b/hadoop-ozone/dist/src/main/keytabs/nm.keytab index 8b325773acd0a0ebdb7afe81e13eb1676f5dcadf..7b73f49a05925c4b4ac76a12410128f64756b84e 100755 GIT binary patch delta 81 zcmeBT>|>sF`kTS|>sF@-fxSx?hh(RGb_sX)xGX=dJ_jpQO(sA`qm6X}y_0{sff1wc1%xHhD#Umsn0K+Aj{u5b>9Ksxn%sT~+|J5ig48GR?T6^o~ntg&hw|v~d3^mP)2-ARW z*?!G>^NYl#X3`3UuHO&M_zTtThpwBWB(=Dtv^cd0!#%xo=jK;QJ}`|6^_UYh-C^qe zR-v+V$9ZWFPwqQ1t@l67cXmXY2z1kalivT9_oN{^Ll)vc0z=e;Xcnz0TJoh(g`%i<9d5`f_nkFU2P_eyaUPRX;*yV9ioqx!f3bMvIn8+ZiWjIVx4w}hHzMTBWU zw|HB*hs82(vY4eQdg9<@?@Xv}KXlz3C8@fy>XkxfLQS+I(nO$}wzx@6*%iz)uaLj^rPFMK?NAf^(M{llxycB_ zQS%=yj+xG{w6dA;lyl*Cj{V1dz1Zp=G2U@)37Rldspu)xNPA+91iH#TQ|!;>3ZA0Z O=3n=AEl+<4G6Dc7H=pAG diff --git a/hadoop-ozone/dist/src/main/keytabs/recon.keytab b/hadoop-ozone/dist/src/main/keytabs/recon.keytab index 4bd3c9e38f470debc98db8c628a52c911584b5b8..7d0bd3cc3a214559eb6e81a9e709cf27fb00a75b 100755 GIT binary patch delta 323 zcmcb|a*t(#x@NkuWj!N<5QDnA?eK$xf#`NpiXzi!p(J3=e|I-Zq*nix2_kx>O< zWX7hYuXgflJl%UDvOQVYY$wa48E=!1ugW;15b+_f$??bJN=6+?xGOnASQ3_JE-rMo zX$|#SY!xmT!eyf$yL2$QZX Z+^n5@S275=hDJ4CxVma?6HhM4eE_M)eOmwk delta 323 zcmcb|a*t(#x@L-K;C@C1AqIt%wN;W+e%;HN+c5QO;`Q{pgS^d|fzv*piAwKEQoiBs zH!(m{5u#X-L7;op$Mit`J*BTi+5#gVS>9z}U|rDtqYA>v zrw8Z!T2h%&f8gz@Q`c`)WNk6>nZ}X0sBCq@z4fa_N~cY(WYm#_yRvHGmY~NsW?r>7 zxWt>ggXi_+eT=#YvubB(A2Yu9PwCl1#-`QY8mrUx>94x;+#}}1S(zsr%&R6(7Gctr ag`3rw?CAS(>gy%{RsHKW9pv@`xeowp#e$vy diff --git a/hadoop-ozone/dist/src/main/keytabs/rm.keytab b/hadoop-ozone/dist/src/main/keytabs/rm.keytab index 17feed24128ab2345fb396befebb2ae1cf12056f..546b4a476d214f0e687dcc47f9fc16365a417b7f 100755 GIT binary patch delta 81 zcmeBT>|>sF`kTSt*L1`vOHEV jCweK%LKF)!2xN)&?)vfk-QD9HAN|&x`Bcfkz`zIqvSc4R delta 81 zcmeBT>|>sF@-fxSx?hh(W=2SJ+w=t~l8VGp0$i9BCE&y`$XQ<<&*GWzTwaE=}5C jGto;~7NS^?K|uQC1HYepVuT`FG&4iPqW3c}FfalDmQ)c;zs@9e zn%KI|y$h%S}#| zPxMihgeVqd5a>C&XRrBt^#{U}Y>rvjzp9?trG_x+>B^b2X0O!{{dDe9(g}`pA0OSX z5>O3&?(%qHkCo=vO|vK7R7055G=1&6&HKAv{rz}aFwtag=41&*Erd}jGgW0Qv+QQC zUKG!A|A%kZhQle{>?`IkT))BA>rM@~@Z@YpEreN8ZeP|%WPJ{FnRR#h()B3;lh-k7 zBh0Gb_+Q0sX_K_mZOfBOGYfOiO+S+vQs&CzFwtm_)lH|a$xKYzvTz@=-u}L4^QH^p R`T{e9uY_42XJBAp1OT^$dWZl3 diff --git a/hadoop-ozone/dist/src/main/keytabs/scm.keytab b/hadoop-ozone/dist/src/main/keytabs/scm.keytab index adb7cd580545cfa6b202001bbac7dc0ea2edf6f0..531f97a1b79ddcf21d88f47650acaf3f447a3861 100755 GIT binary patch delta 307 zcmX@ba*AbwvSzxmWgR1f5QDGmsxfvpE8C|}mSEIE7}cfnQGNO==JYqK zekWgF`_EHui-+1HuM>fvL*H%MwNY*U(uVd6k zn04aL^Ox<}KNrOLb0kFCHynDlV&Ba9eRg>(|9;}%aMRItG82=wEZm2AmDYkk!~di& QG>Z^PJh0P}fq{V$0FQ8a%m4rY delta 307 zcmX@ba*AbwvSx~C;C@C1AqIuj@9rkq3kk>du5aCRF6QR89hug}vqHT;v!7h?yTao1 z{E0rQk`Tp$3<7VgoV<=v z8(~)Mgtjn?gKFEVQ`H>g9bHZ@y0>3+f^Z^}Nb)ZCX$CdflbM*bW#K;b^{;l}o@9FA Qz=S*eB0W<>7#J8B0XtWG!T(=Hf|6MV!hJ-(YY0`ze@6fX;i4koS^9r zQ}4G5m8Cn*OM7^7-;rs(|7Sr>#1~%3CIa2G-=z1yAA~-UZdw{uVQ~HO!J= zm^oeXx5leJsFC)>8VPijsPvgNvlsH-U9@6dqRok@m&CX#88s5SR6eRtf5n{sX4UWH z>udjc%5Cvbd*pQ@@N?+9O}jR#%_qiH$VLKP6);UGZ2z|Vj~lZz_db2*xfWyu0OsEc A>i_@% literal 908 zcmZQ&VqjqKV_;(7c8zfK4e)W*bN2UT;3!EgE-5WeEn;9w$pb22Oc4#-&&VLeps+U4 z^x%W*AFu6=Jb&w%!`3o4HipzCvWbUx-IQTGzn+f^q!@_ph%`}qCAqck#Y#Ajb1!=`7?&6=a?U$+Up|1P0&Gv;nu0I9@^ew#<#jb`!9I1@t>2dCN3P|a zas5JE^MAGn6BtcziZRtIh0KJSh%da5O$54Wi<{JxUBNu_3i*p)I?XoN4mBYVx6fFM zQj_yhqw(p%Ilq=vX4D^ed+OBn8x>hwjC`hXBrYmjop5jcYLU`uP(vMwHx%fys)bvE z9^aUG)!yI|Z|)AB*HATcWStWp+?#hYb4NBQf^D$sx%Yjvxc7lWe5(QzL9PM- D9mfj3 diff --git a/hadoop-ozone/dist/src/main/keytabs/testuser2.keytab b/hadoop-ozone/dist/src/main/keytabs/testuser2.keytab index 55a9167579a0a9df5b9ae00a10d5d4fbf353359c..da5d6a99e5322c1da4befebdd001f2943378e002 100755 GIT binary patch literal 920 zcmZQ&VqjqKXJBIBc8zfK4e)W*bN2UT;4DckE-5WeEiz(YO34GNU`#i*tY>5pVo*3P z^w-my+tEPw@7pighnD|0J1|jp_m*oln~GNW+nSu13sMZk_QV<~$RHpV6!Xkz;@673 zpX>!*NX804jR?kL1Y1T)NkLjMip#j`oHabOWAk##gd4X%_z-!T;ZEqxc~ji32{^Rv z*u!fAHP)FFV}Y)F^eX66n~##LXE*2X8E}&F3aEWuQXOy%=vlJyYwGN z8kX(775Urn!0UCs9wA@b#WuD&f$VLKP6}H-D)k_D7gBRy@-_iM}7zZ^X2#@Dj zi&B&GQ6qEboL!|l>X+NY*Wb@5w+elro4$ov%=3lZ!N>Z?ydSRxD+ZeEM1rY6x9!}! zl0m>VG^+W+)m3wwc)(!+G$jC!Da^&j=^!t_lNncI|EqbOvY+)o-~CY=K literal 920 zcmZQ&VqjqKXJBIBc8zfK4e)W*bN2UT;4DckE-5WeEiz(YO34GNU`!DW+|S4$#Gr7Q z?dEnV_L*;aUG(KY-FhJW-+#unJ$^E$nSQV1zne6*6r>o4?TIx~kU`*=cx-%N@Nx}x z#cG`eJElE`8WD`g2)2xpl7h5i6qoT?sl6zVujTdFR-t6y+OqZLm6xw4=pFi7@Ntfw zfAHp9sIktZ7z=crck-{|>#+xK@R^-7iH)-rf*ON2%<{pO!NY9+qs1}P`IS~SGoErT z{LZoexUUym-6O_3t}Q_mW-1jug&K)B%#e))y2?IN?9b&2o}$<0U-xz`Pk#tCA_$M? zSc_7V^HC$Sc82yb<9q*;~p%*Dp(AZ73%tKaxv#cgSmw9{?NlS?xTbI(mblNnOx z%HuH6XphxRr!J_O4n&&?bQkOG?|U|Hx*)DEFf;f{nDud@+?9+Pm9-Pv!YmG|ZL3aI zbC7p*IlbuKe$ffSiA*BNyWFQ4)MOLoE@U%-?(+4ocHy36df~u?JNzO&Q$s*z0050M B2Lu2B