From 0d4d2831a5c870b0ef07e6630886fc3909437a84 Mon Sep 17 00:00:00 2001 From: Piotr Stachyra Date: Wed, 16 Nov 2022 13:44:30 +0100 Subject: [PATCH 1/2] move e2e tests to preprod --- .github/workflows/e2e-docker.yml | 2 +- .github/workflows/e2e-linux.yml | 2 +- .github/workflows/e2e-macos.yml | 2 +- .github/workflows/e2e-windows.yml | 2 +- test/e2e/env.rb | 2 +- test/e2e/spec/e2e_spec.rb | 2 ++ 6 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/e2e-docker.yml b/.github/workflows/e2e-docker.yml index ad9aa55a139..527b7d797f1 100644 --- a/.github/workflows/e2e-docker.yml +++ b/.github/workflows/e2e-docker.yml @@ -133,7 +133,7 @@ jobs: run: NODE_CONFIG_PATH=`pwd`/state/configs/$NETWORK docker-compose -f docker-compose-test.yml down env: TESTS_E2E_FIXTURES: ${{ secrets.TESTS_E2E_FIXTURES }} - NETWORK: ${{ github.event.inputs.network || 'preview' }} + NETWORK: ${{ github.event.inputs.network || 'preprod' }} WALLET: ${{ github.event.inputs.walletTag || 'dev-master' }} TESTS_E2E_TOKEN_METADATA: https://metadata.cardano-testnet.iohkdev.io/ NODE_DB_CACHE: ${{ github.event.inputs.node_db_cache || 'GH' }} diff --git a/.github/workflows/e2e-linux.yml b/.github/workflows/e2e-linux.yml index 327f6eeb2b9..5f9e6ae4e1a 100644 --- a/.github/workflows/e2e-linux.yml +++ b/.github/workflows/e2e-linux.yml @@ -107,7 +107,7 @@ jobs: env: TESTS_E2E_FIXTURES: ${{ secrets.TESTS_E2E_FIXTURES }} - NETWORK: ${{ github.event.inputs.network || 'preview' }} + NETWORK: ${{ github.event.inputs.network || 'preprod' }} PR: ${{ github.event.inputs.pr || '' }} NODE_DB_CACHE: ${{ github.event.inputs.node_db_cache || 'GH' }} TAGS: ${{ github.event.inputs.tags || 'all' }} diff --git a/.github/workflows/e2e-macos.yml b/.github/workflows/e2e-macos.yml index dbaceba188d..807f30b00bf 100644 --- a/.github/workflows/e2e-macos.yml +++ b/.github/workflows/e2e-macos.yml @@ -111,7 +111,7 @@ jobs: env: TESTS_E2E_FIXTURES: ${{ secrets.TESTS_E2E_FIXTURES }} - NETWORK: ${{ github.event.inputs.network || 'preview' }} + NETWORK: ${{ github.event.inputs.network || 'preprod' }} PR: ${{ github.event.inputs.pr || '' }} NODE_DB_CACHE: ${{ github.event.inputs.node_db_cache || 'GH' }} TAGS: ${{ github.event.inputs.tags || 'all' }} diff --git a/.github/workflows/e2e-windows.yml b/.github/workflows/e2e-windows.yml index c6a644b2c46..262307b1a7c 100644 --- a/.github/workflows/e2e-windows.yml +++ b/.github/workflows/e2e-windows.yml @@ -132,7 +132,7 @@ jobs: path: C:/cardano-wallet/test/e2e/state/wallet_db env: - NETWORK: ${{ github.event.inputs.network || 'preview' }} + NETWORK: ${{ github.event.inputs.network || 'preprod' }} TESTS_E2E_FIXTURES: ${{ secrets.TESTS_E2E_FIXTURES }} PR: ${{ github.event.inputs.pr || 'master' }} NODE_DB_CACHE: ${{ github.event.inputs.node_db_cache || 'GH' }} diff --git a/test/e2e/env.rb b/test/e2e/env.rb index c729e0197c6..7fda2a54f79 100644 --- a/test/e2e/env.rb +++ b/test/e2e/env.rb @@ -22,7 +22,7 @@ ENV['TESTS_E2E_TOKEN_METADATA'] ||= 'https://metadata.cardano-testnet.iohkdev.io/' ENV['TESTS_E2E_SMASH'] ||= 'https://smash.cardano-testnet.iohkdev.io' ENV['WALLET_PORT'] ||= '8090' -ENV['NETWORK'] ||= 'preview' +ENV['NETWORK'] ||= 'preprod' ## # Apply workaround for ADP-827 - Deleting wallets sometimes takes >60s in integration tests diff --git a/test/e2e/spec/e2e_spec.rb b/test/e2e/spec/e2e_spec.rb index 33245fe75c5..986ee1675bd 100644 --- a/test/e2e/spec/e2e_spec.rb +++ b/test/e2e/spec/e2e_spec.rb @@ -78,6 +78,8 @@ script_utxo = '54b4e4e34a022424e441b00d8a73e9aaef71b3c63084e76246d326074c5d3756#1' when 'preview' script_utxo = '0c07395aed88bdddc6de0518d1462dd0ec7e52e1e3a53599f7cdb24dc80237f8#1' + when 'preprod' + script_utxo = '6d2174d3956d8eb2b3e1e198e817ccf1332a599d5d7320400bfd820490d706be#0' else skip %( This test cannot be executed on '#{ENV.fetch('NETWORK', nil)}' yet! From 9ce181107db8e2272c97c27e8471599b797eca9e Mon Sep 17 00:00:00 2001 From: Piotr Stachyra Date: Wed, 16 Nov 2022 20:32:26 +0100 Subject: [PATCH 2/2] regenerate fixtures --- test/e2e/fixtures/fixture_wallets.json.gpg | Bin 2213 -> 1942 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/test/e2e/fixtures/fixture_wallets.json.gpg b/test/e2e/fixtures/fixture_wallets.json.gpg index 6f4d8b4feb3b4c4f7614b4e6ef092d7070a3dd1c..b4b14a1edcf0b08a556e2af180ef065b418f1d74 100644 GIT binary patch literal 1942 zcmV;H2Wj|>4Fm@R0=APhI$ZLp^8eE60bCy%NJLo@Oe^c7OIBEOEmqtaNRSaR)%*|z zpK7mLJ+jon$9(k9l#~Va9=*WQ7xty;#*@8t=rw>4(8trf(DS@j>C2GuNq=F9mYc{c zYi@H=enO8z@?+-7g_;c-f%xJwHoO%1+R+M*m(GPx#bU8r66|f44dCJXDtSiIL%)ul z(A3%2jbbw>z(4eAEjj)f+?n(}ka6kE2lQF8 zJ6&pCUZZ=>c52#FG%sLLvDINgYgZn-XYThrHj^%@_LsdFj7EBsr1%1XJ>x7^Ls*+c zRu>IEEuBgQU%#{_6B5Q6CYz{&KQWNyX`hPdu&pq$8}}|Uf@=Szhi_4kwe{PHUOZ84 z0io1f5lhupOWHoYS!|YFQ%2b8by$vs%i&$#?MKF~!iO1;FbGfS{PW5rCCJ9_z$#{W zbp1Jd!(~+h{KLf)R3neQXtsP;X$F=gyK)L*g^;J;FZ=F$6zWouA)p8bpo*SBYv%igf2=a#fqn07H9*A5fFVVXz5a*?mMw7ZFA;|F=V``t}r04q`Y59;io8eU4D z6?bdUGxxs>AWS(_mBgHupxu^=5maaqIk$-UwyKO?ur)H>UQ0`WyRj;STs1J}m#JSX zF-fU9@d*M;tfrNk8(h->?pF23h~YtyOV~@ShKwd-=WR|Fun*Ynje8+7@4uR1t8xH} zt=IRYg{QbHl`*xopTbsVShk-lzXJEs_u486*?t9BZpk)9mtzn#k)9F02)gm^00KXT z*x_YkVgErSW{8A*=aA`wTY{WMrfk*nR2r2s1@>|tNcehX1nV}RU8wTX4I7yNwY1Zf ze&ZbQkqa8wM9&pn-ZeD%*|rI1qCQxZO1+w-fUN7GH)pjoG?C?4S`_OpWV7{&?{d?` z$ziwR&z||DiUIK%~Qp8!(FTv@8;o0I`8K9T6e`bqfBO8fpYN&X~<#A zfl#Z*&8wVt6%7sjjV}0JW_agmZ!Fkypm`^{SY9xw-M;@oX2as}ZJ>}35Bv^7b~a7* zwjSUP8um9Z99t9t6chrB(k_h<1dTiUwG!8BOdkDeWX8pb^`vCe>2Vncq}^7G985WxlbwJ zxK`))W8}PQEzWDEv9TuxO`0ps6wC~j1>fQ%utDT`6)u1Y@4jRkp100Wk2=mC^gbpP zU$@NoNG=KyuYWZmdU_@9hAIu_b`#IkV$B;I|9!8ck1@gg-pTVfiH#TTiern;YAUxN zs`o9{OI{_v0Vhpxsuow)*ry=WbHp6s;!lh_53+zHXL6c77OxR{zfpL(9^mef_uXTY zEGKq1v^I19qV&|U8-3Jonf_>io6~g_2=$A(i6JcUlOCP}!;nv7$(rmTN4%X~phz5o zR-d7KB8SWECx)heJPnwAU~zJ(k1x?d?`@QfWk8%Csxv+qN#>NdNCB*Haq$oY2*i5k zY;1Oz6gtP*FuhEZHoFO{nCy&)@_xFfLy0-##O_~yUN`j^c1y-*ZMBM!gL&6;3-5M5 z55U3`$sDKWXHf=%396QjOr!s1FN3(^jlFwiRn z%rRwCfMH-@lgo^yxxu%%!<6SmGrS7(fjAM#x=Scm#A}xM!)3tA!!xxD)+eme-p2pe zG4G+|&Pw1Qq$UhG(6Wx5C9l&^ovYnEw!9ycK%nFTU36I+E9l9=reh*fQ9Cwg!e(nE zy=+iO%YP_dD@~Srw#2>-xOa^$khJoim{E&GI!TXI!Zsv^< z%e&w_H!M(Z*^_6?_>+7M>jZ0+pBo;_y)8^^zRsYWDNyR(0JfhGV9FdY_zZ1EdvVH1 zA9A`^pIrjdTYEvc4s)|KT>TF4abtyDxaOw7L8-Q-eV?;1DO*HMx_?CQrnASdJpep) co}^SaZO?g~n92nPwJt(G!C~l;W7ASI-Jt}|(f|Me literal 2213 zcmV;W2wL}y4Fm@R0z=PiR_Y$5O8?U90Y6XXodvZ1+g!ZCsFV*u!=jqVtZ#FZzD}sA z_{}JAE(3W8!#_SgvnL$_S9Sn5+B&NVRlE2O4POjJd}C1)lOU?IuO&ZeH>-c{QxpAl z8RsRi#WXL}Q(^5P#Zw~ndA2gUkEpO-`& zn#WYU?x4UPpCwig>1&_e2CU>LC~<&OAYO6&Em8Kexp?P*q5isoAp7m@DPS7vs2L zBTHa{k`}cmmMJHYL)5rE&z(Is@Z3miBS=2wTjp#1z;!;YQ*!* zl39-k@ek(XZr8*SVS!;hp|Ufm)Ujy1J~l00`Q!JZf$wicU|%so2f{6Tx6D=Rf+IYt z?kd8jJke97^?MNJf<+6oVm$dK&KaUQ&D0akb?jNcNlLKu60~A{zZ4m@_ih4Bw%sr1 zGX?oo>0+(YY~2+j6701C%1CY{#6pFtaM)@O4@8b+9To;?__ZXNkG9F*tB z!rDpD%jf4$;w6v25rgU+p%a|60pY2V7u!VqLr{YWJHHV%58GO-OEq^Bc)Is&d=e1O z_(?g3QK>^zb+)kU8g8_5DXZp#^S4I0hUq%{TH?jl)$7^sz-Go!Jd+!A2% zKKie=|0C)2#)Xu`F}C{1Td8%lj(O+mXRF4|;g2!Bum43?xEW`)o>AkT z6pyF_D}V*yQRk|8tZ=HP*|(O6Szcz)_%5|vcb8FyLMewXoeI%T(Fu%nTb(5hDZgL` zj7AfQ6?V_cqa4)MKAC>qtUiD<`4&Ph0#f$nkKAB60^kIJrKuG_lB2wz`e!c=85qxw zu1z@|`*8*!qgF=yoO zz0%G`>$ACX8KY%-j4~o3S4XsFppAZrW>AQMk@0%iThPDS>DHFy;*R$clkevzMyTsw z;~a(^7E}v%6AJ_)E%-J!t6{1LPh)H$5v~;Jzr6KZNm~q2cx3OHxSOb%_lv+5kBblw z-!$(w(((LaX*?8z^?1+=xG#>AHfG`6oqwC7`spQ0Hh#_Fpk6<0TLT0IDpFi9)+3qZ z?D1{_y?MQ^We=mCFb*LEnMoKrlxN(8d`lsrJKUz715NdV)8>Po*wMD3yylI?S4?g)Vl_tc|WwT+PR?aQFH=C}CKapov8B;04{NHmo2HQfl7(!1GTbKLIX6ULcAh^ zZz7%WCH0JgF=J#6y+#m|8j=9oH0ZUM&aRet4KK>q2416Bj%@`WVWzo6 zE3;PO_hj)NUWSaU-p#!XoW4)EI8ct**Dd8u_fN~HFZ_xIX|a3KNPJCXcRX1!Ba7=B z^ya-zLE;<^@X%A^eVhHLKID+>jEap_iz8Hd!qCt^uEGQ+Ga9{eI<*Q8`+s3_r_*6hq~`=df}RFXsnl5r$QH-YkM zG_;8wRr&4@G+C2$7Si4b&q92+s$+Z5(JSyiFEg#+dsD#ZyO&y<1IU*tx$=^*B zEgk)VB3$TetBb1M^#<&__E+^n&);M`2;yn;=UYPC_)y_^tS>mP6BUWbInVCalN4niTNYdbwI=NW@vXsPSm0NAv13KuS;ugNp~%l zVQ)271#BSU2;>8S!QQF)p6Yn`JQ47fosKiv(#Yiv#>C!=*OJ*`z|&nfPm2xS?b_o> nGFmzQ1C$gPY`&=_+WK8>%hKg