From fd6730741942e3fb857095e8f671060ffe11b595 Mon Sep 17 00:00:00 2001 From: qwu16 Date: Mon, 4 Mar 2019 14:12:08 +0800 Subject: [PATCH 1/3] Add resource limit to each container --- test/conference.jenkinsfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/conference.jenkinsfile b/test/conference.jenkinsfile index 71cab47e..67b5e572 100644 --- a/test/conference.jenkinsfile +++ b/test/conference.jenkinsfile @@ -15,7 +15,7 @@ pipeline { stage('Unit test') { steps { podTemplate(name: 'unit-test', label: 'unit-test', cloud: 'kubernetes', containers: [ - containerTemplate(name: 'unit-test', image: "$env.TEST_IMAGE", ttyEnabled: true, alwaysPullImage: true, privileged: true, network: 'host', command: 'cat') + containerTemplate(name: 'unit-test', image: "$env.TEST_IMAGE", ttyEnabled: true, alwaysPullImage: true, privileged: true, resourceRequestCpu: '500m', resourceLimitCpu: '1000m', network: 'host', command: 'cat') ]) { node('unit-test') { container('unit-test') { @@ -28,7 +28,7 @@ pipeline { stage('Build package') { steps { podTemplate(name: 'pack', label: 'pack-mcu', containers: [ - containerTemplate(name: 'pack-on-centos', image: "$env.PACK_IMAGE", ttyEnabled: true, alwaysPullImage: true, privileged: true, network: 'host', command: 'cat') + containerTemplate(name: 'pack-on-centos', image: "$env.PACK_IMAGE", ttyEnabled: true, alwaysPullImage: true, privileged: true, resourceRequestCpu: '7000m', resourceLimitCpu: '8000m', network: 'host', command: 'cat') ]){ node ('pack-mcu') { container ('pack-on-centos') { @@ -44,7 +44,7 @@ pipeline { stage('API test') { steps { podTemplate(name: 'api-test', label: 'api-test', cloud: 'kubernetes', containers: [ - containerTemplate(name: 'api-test', image: "$env.TEST_IMAGE", ttyEnabled: true, alwaysPullImage: true, privileged: true, network: 'host', command: 'cat'), + containerTemplate(name: 'api-test', image: "$env.TEST_IMAGE", ttyEnabled: true, alwaysPullImage: true, privileged: true, resourceRequestCpu: '3000m', resourceLimitCpu: '4000m', network: 'host', command: 'cat'), ]) { node('api-test') { @@ -59,7 +59,7 @@ pipeline { stage('Subscribe test') { steps { podTemplate(name:'subscribe-test', label: 'subscribe-test', cloud: 'kubernetes', containers: [ - containerTemplate(name: 'subscribe-test', image: "$env.TEST_IMAGE", ttyEnabled: true, alwaysPullImage: true, privileged: true, network: 'host', command: 'cat'), + containerTemplate(name: 'subscribe-test', image: "$env.TEST_IMAGE", ttyEnabled: true, alwaysPullImage: true, privileged: true, resourceRequestCpu: '3000m', resourceLimitCpu: '4000m', network: 'host', command: 'cat'), ]) { node('subscribe-test') { From b52ca9bd2ccd5b0f4747daf7467817625700c872 Mon Sep 17 00:00:00 2001 From: qwu16 Date: Thu, 21 Mar 2019 13:25:04 +0800 Subject: [PATCH 2/3] Update certificate expire date for 4.2 release --- src/samples/conference/cert/certificate.pfx | Bin 2549 -> 2549 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/samples/conference/cert/certificate.pfx b/src/samples/conference/cert/certificate.pfx index 4f568aae4153b7a4fccd0cd04c8f1ecadc378a26..d200e73f87daa802e07c6faa7a59866574241ef8 100644 GIT binary patch delta 2416 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 From 5b6e0084d821af7cb0a65419c26ca748e822a161 Mon Sep 17 00:00:00 2001 From: qwu16 Date: Thu, 21 Mar 2019 13:59:31 +0800 Subject: [PATCH 3/3] Update certificate expire date for 4.2 release --- src/samples/conference/cert/certificate.pfx | Bin 2549 -> 2549 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/samples/conference/cert/certificate.pfx b/src/samples/conference/cert/certificate.pfx index d200e73f87daa802e07c6faa7a59866574241ef8..86c6169f9c88d0328c716b8e1d549f9ef32cc865 100644 GIT binary patch delta 2416 zcmV-$36J*m6ZI32U4O5=<%njkn8X4C2mpYB1Q1QIKbc_xJJm8~5{|Aq63-KqknA$A zE5i~Ov4}Rm$1<@R?^$WCYPqD*wQ)33>otk268~acK}p{4*CL(KF&zbOIzrq4^_${@ zL1hRRruP10K0ZgLUsaGrGEEd~l@ zUl7el+RPeF9PiVAnH zJZS5(TZ(eR+J8Tka5r(GIR}iTNmjFfKgMN7q`5N)m8%YF3A;06qAQmWb}n`v7M8r_ z{V5Ahc3MHnH8*T=m^5}V6F`tC<$FbgT8Ua)XEQmzs92%?`6#fo=*H(z%|2%}>Z}a_BCwyy~M3Wto$NJBSZC@F?@x_G$6^>VGBL$a~3&)1hS@CF$5(8I?m@iZeHBH`doUnOgkT`o(OA_Q85Y7NwgEvNwrG z)ytlMd@_tC+2uO-S;3i#V~Bmo3%@r7{|YtlkL&lu5_(c|QmM6WypvA;IErkqEeCvo zJg@~X`sI1uSTrUuje1vSS<3SY!AXMFQ6ynn$#&faF}t(KtY-Z+Z6WpQA!#f$Z! zdV0``Dbv0a`rJYEkrQGB{Y=F)l;-wq&`!<3!xMi#Z!1+Fq&W=&`QrGTaE_=rjhpFJ5;dBbMn^hVR^c3jgdt|jhb-Mr zLVsq1Vv3b;3N0rhD@3Q?kcsMuH6XN|Kwv?*V<_gPjQ%Hm~dlrd@)_V#szw;#b~A zL)WhQs;jR-i^EYXJK1b9i#&oSPvzq~!G9$KtGnT!>NQ;boW!VH1Nj?vzg%wEKH=}L=F6T#Z{=rb|E@+eK> z$V|nu%;qHw%V!j^85JQx2zaKIc2w8%(<zT=a91V(>B<@IyfiaVSF z0tf&Ef&|DD;*{mK{mEzTxvl)F;YWE0IyAoT>Ie-)Y=EEa24ebA z=Pb#TPufk#=iQYkg<5|I9EHS?^+25(1kX+p=eI$d9V$dF)HP9r{S}!ek=nrAFM*i! z@2bnbgfRHzkrZc!a&PK(pSgwC#{4`J>o%^5oq;}!xECF|p`~$f{VaK`+{TsNfN&v% z6Dxz~?&<8f$#BeCpmZ!aL0yDn8`N8KTeKR1hpxkfUF{%)<@bMUqmg$SCqlXNJnDwp z=&f>JUlG%)-a{pxA?xDnme{Zv5N7;n(By7s0DsIG6Rarjnm6{n7aY4t5=GaDlsw^x zVQilddJq$rwpPV>K;=m2>nsNu`zCHiKLf`qL#Co3awI@Wma7X7vEiFk(~#)x6{4P< z>1dcPr2I4hIbMH-bQ84f6jG%3Z>&es%@k&2Mn%%AkVRG0dn!veDi;!zvl;i8Z}Q^mfVQE3ROM%3cORPvH(}biKpQ*Llop}PP@T3SxBP#Q7iZpftn5O_NR$SM)6 zm{#tF)e3tZDM~UzG|%}&c|)a)FNuq}E(JzGx0c7yEYFHe1)B6qgBkD30lA_}Sn4f) zzE^)xg!I5c@x`v}C&#k%V3@Pq?J$>_;$mV#;mK7Q-)6(z%>2JMz}%~pAl)Ep{@dHJ zy@%spJW0Hy-*Y94ap5*7mmYB{7GC~JRb#8^slm;CNW)itJ(-?fsv-6?^8=J^cn zD=8Q}-8vqaUnF^Q&lf4$pJ~B&2{9Yr=KEh7+p-g=5?KnyAlNRtG`fv)@V` z5k`PVtiE=!ilqS&hK{zNG5u(0(+0GM*!BgBf(F=CuH-6r-zuyIBRa}Xb$FWK)ntD~ zX4QscdTD?dSIX*MD=uTq9RV>3AyIH*tjTc62;#|(v*$rOj~os5GHz*p^;!_j#d;uT zW6%=JI`%G9-*{Kk!N-ovKmxpK1u>q$tnA-W3l1I38P&k!(449?@dFm;F(oh~1_>&L zNQU1#1i3O7zCh>qyz{%f~TjkTPSV<0tf(R*07BL delta 2416 zcmV-$36J*m6ZI32U4JF4n*)CED!>8)2mpYB1P}pi{w=-i$^eFc{Ck3Di6rn_k6kr% zuMj`Gw4>JH%5=sfGxFk~Laj}dbdR>nzEG(prlz^<-aC0hu)%15M9O)io5Oa)5O(?z zqT}?r$VqVscPIso1M&`jP~?|oTxq_xv*2F5vSWfGP1VyGPk-AgItvL;)C`tm^QJ_+ z_TwV2J(AsSoDnHThfq5E<2#fhKrH=&_UE8p_7S}ctAi`;$qB?0YGbauMZY)Sl$pSU zs*0vDh&|uCoi9Eyg5T~ZFxyy>GwO`F;opJ%zCS@+06mPxCh+Gt4Ox`cGVT5(l^ZHUxa(qhQFKpVrsp zr32;iVnd=}!>XmDV`OML`j4Q1n+8#)91J*qOfbKw^EnI+Q(I@xC#+RrdR~2UE~QX? zu?~9DNZIFlHJ4amnC>mzM%$E|vHEhq4( z5{+j42H#a7B-a6qezx39rPT#6s96^hL{oxEkVrkC2D8z?s`mB)W3v^G4}B1ol*0!W zm51MN*-jf+w+i7fa#zsrrs=MS(Vxm&X}6j-k$;Su(U97)sSB@fWLWbR1VMo`F(01f z9%`HU+$C$afWP=)bt8Y3f3f0M*8LtL%q|bQs$YY=s?u%{b?3}dWnIWIfq%pLh-YW7 zf4EoNlZ@!cD319c6p~i=hh~#L@eg9Ao}k*!5{|9G0lJt42+sTOWN%9|-o*00LK3vx ze1Bla4C!K?D_Wq-buFYmdZm=u@Tkq>R0Res8WKqI054_&zwLvqRVrkoSAyA?yS#=J zW^U^c?s{OIFJV17Na%oS4swpd+fk;j*oe&q^r%K7UZMH+h+!b}J~UQ}R)%2CuO4&Opg|{F%)g z#tCV1L#a3@T+uPUl|!kz%Pe>hid{;*)24oucMqTWB~~!2kd2+=hPG*^{r|E+TTWi} zs(_fp8=JWFgqZ=9lPJ=p1Q7r`yu8Lth*OiRZs|Fx6HqG39icYlp^w%%Gjw^8JSg3* zx$t^73AX~XtF|YTnOa%Pb7k*5UD9Nk7tV-N@Mb(lzyG^;IE9ma1V(=mubaJI$^1|P z0tf&Ef&|ERK$njUb_-rftb1YDBC#@9PJKrRnnw7W78jbeHWlkkzcjXYjzFyJ=uPg> zT?B6QlEIttA+Ki2LG|RoV!Qw^U!3e zt49;q?RLSHW7~Yn?JtN1pkL_kH{E{oqtsI-O ziVFUkWScpy^q=vWJd0sna9&L;0}n>mnok)BY+p!&#ddUUGE#qC5X)lF3ylV@qe0m3 zTykVX3baWGlCY#vuW@4d@@3-XK!Z_~j-FkllGzbv;F{7GUJ2FQ7uX+0D40b11ZS6v z(JJIo|Ln`yTGS9hd({@!s)^31Htx_@ruW!KM~7S_&4Z}Xl$?d!qvKs5=s+(Hd2plU zX{}KvC#vXo6|#Sy`E`di@~zM2yNuBi?Gw>Yra7Wsb?Rz)UFRO(&;|gC#$)S%h<1aW zJpC0ZHVJNs0Oy=chB;1Kck`nPz$q)>Ab?gw}fTpct3yPECJ@~cW?wRIDOm*F>+b> zYgIxIS0YM8_1)~F!>riYY^&lMN1?yV=Ld9$!Et3w0Tr)IyXK-6)IOhg5(11-?eTe? zmIywLMo;5pO?#>ZS9_}gcI~fGMn$cX2Al5G=O`QwN54W4@V!x02sFcX#=y^yHimXQ z?YbJWJ|urnCta*7N(ZzEjIxhHtWA(NO2BEavBEF-e@Uq%OfByY9=>q^8VMB0gb|tI zrehQzXdrcT#&Y-@>_0%kZXBHZn1k^%Yp$ib?WGwi5{7U6E zUmEeznUBH9j_y#J$VItKN3!+Kv7Oriv<{M{E5k}Nz->Up=^y;lW!aEyKb-Tdg51em z8k{_e`67+B{;hs}GNG-m@V{v}BJ8g8-Um1(8XRV820Hsm2I+;wo#G(P^a*)KavJX3n&HU$;Voxg@> zzhN4NDtinD(`XAA~{;TkFUDZX!8l%VeTz^RG%;XR!7cIjBnA0S9W9y|_iFJTcPX!{?_kF(oh~1_>&L zNQU