From 9b427f148dc5c7f82fb78d7bc8983f68452d3464 Mon Sep 17 00:00:00 2001 From: pemontto Date: Thu, 31 Oct 2019 10:54:28 +0000 Subject: [PATCH] Move integration test files to test directory --- .../files/certs/keystore-password-ca.p12 | Bin 0 -> 2527 bytes .../files}/certs/keystore-password.p12 | Bin .../files/certs/shared-store-no-password-ca.p12 | Bin 0 -> 2527 bytes .../files}/certs/shared-store-no-password.p12 | Bin .../files/certs/truststore-password-ca.p12 | Bin 0 -> 2527 bytes .../files}/certs/truststore-password.p12 | Bin .../integration/files}/templates-6.x/basic.json | 0 .../integration/files}/templates-7.x/basic.json | 0 test/integration/xpack-upgrade-trial.yml | 10 ++++++---- test/integration/xpack-upgrade.yml | 10 ++++++---- 10 files changed, 12 insertions(+), 8 deletions(-) create mode 100644 test/integration/files/certs/keystore-password-ca.p12 rename {files => test/integration/files}/certs/keystore-password.p12 (100%) create mode 100644 test/integration/files/certs/shared-store-no-password-ca.p12 rename {files => test/integration/files}/certs/shared-store-no-password.p12 (100%) create mode 100644 test/integration/files/certs/truststore-password-ca.p12 rename {files => test/integration/files}/certs/truststore-password.p12 (100%) rename {files => test/integration/files}/templates-6.x/basic.json (100%) rename {files => test/integration/files}/templates-7.x/basic.json (100%) diff --git a/test/integration/files/certs/keystore-password-ca.p12 b/test/integration/files/certs/keystore-password-ca.p12 new file mode 100644 index 0000000000000000000000000000000000000000..e8331cf9cf38740742a703f39c29b3c183cf1129 GIT binary patch literal 2527 zcmY+Ec{~%0AICS_Fe{|VZI+=;nA=E29_DDSE=P_WiyS#B3q~_j{h#^T+3(_vicl{Q1U`pllu>2up%y^FlER_=K&)KtA9T z67)Wp1dThuQCJeh{a+Qt4ord&4zR^ROnG7d`#K~5dEi9T>;Q#nwTnY?7 zu@y3rdSu51XI<-YjXy9zDY9;n2L$M}0h7SJsASngq|TP44|BH!85d6qf4?OUitIrr znc`h$6VOTLCjmugs2Sz5Fbsg)c5I}4rg2JSfwp)@mS$8GJ@fiEz<14F*?h!{?ar{C zm~8G*2X4IeLO}w}m#OOW!_I?xpzK znviA%Ga;}A&&4U9D{}Vz$~N}396e%qUnQJI6-+m?YZE=4PTm`hKUx$&v!`T}vaU;k z8xD=!3ZmS`39oQCD|~=}`atPZ=X4x|8VE<$YEHQ%FHqzkedqBXIWFwf9uz3mL?2*P1|LamnU}p7Q9F=o55yo8+}g`)m6r z8vV>4aN^d7Q07|Wq9?&PASR7^_2afHz#}_16ce` z#VUo$Xmr@hX!7QmypH$1Ed`83Y}>Kd#ZjKNMk+P%(aK*~gMmGiZb`ZjMw-HV zI_s*Lgvyz=nW^{Jm7aEUK{p|Ti zrBt1l`YmAX#51cww^%~{%XQJf$s96JiCRv73LvUt01QnD6C*Pry z6n7mF^Xbm3C#xI2wyL0=h()31H(7g;52kDF3<@d$J<}*W?L8rG~6=^iJnVvoAolg$) z>(|z6UJ9A_`eaP1MHV|Xz=yg%FVjspBl!%!nfQ(uK@nH1>OnC9&3-OI3KyIUc)_(x z(2JUSu^HYz`>n#Wc+}%lDYH=z_@e7vb!+6JA}?RL|6upM72^~Q49z*?lb5O-UAl{-cTr!g|7kg zuyFK7m;*^{xXN6TUDpM78S6Gb@f;Q*R|)TvG=VnZXoMSQFhZj_Q{c`*D{igHx13CN ze%oCzKQ~%^{1P?(In&oK`CVYtBY5zH2h1i(3F*auuT{|h%z2O=iV}zze7(R{y#NnT z*TWwDTa{3_ITs~g1s{JeIdyGabuFx(mbL~?L*qc2@V}4vcn>@Z zIY2-jAOK4OegCHc{>!Yq|1oPAnVmDjsZN_h8!u5O^6GNzKRf={tg$3e8~5vM1koh{ zwnvg0r(=Ur24^w!P67pa0_kV(eng&vK|@ll{`3?s0n9UgNi~(Xjnpv|vn_#5RLuH^ zMa&~^e6Mz`EpSXK!%v=Z{mJ~UPt$HBCz(`flj<;5J=wN%XRB4M_lzFPi8M7dj&xe5 z1U>Ayx8qf$>@}p3_~;9b&}piZtP_0J6a^0NN7$JX{oHpVS5=IkOP|!b>1S;nud~w6NO?a&IR;wt<H6X6sf6xqq4>S$)I$s;?qzVh^OY(R z+TTO_gtpr;~>DM|{j&w?BZHA2-@q;-oDZaVu*=+Z{KPU}&mr zT7=xS1hXu6rl-=@)9tJUrX1JbP?(0Oi}lWSi1Sl^!B$RCHl`Y_v43n#|11on4|yEY z1-_bES;<+p9u|HxT|@L_NYBd>)j-vxCL<&c@c-32@s75Z20pfRsP4W$wFk5BS$WGDNfDy zr(JGyaMZ7O)w$m;7laPkM=5J6Cz8E^1d=r~4l}Q(1B!P&!y$|`V)L;s0V?}+Z zY=k9Hp5-RwF)qEVr;tz&K{U39fYztyioXn37XWZmKLz`{)bfX1L@arvSQUb$F7>NZ zu_7ILZr2ta9}41Kz>!xzf*O8Fxb3Fb)Za8W;v??6-QtpKZ>RL8bF7SWuWBp2y~7(D zr8AOO_Nb&CCUI6+$NMs^13~x(IyEed-LFh;^*vt(eTUVQup1mBh>V-w{=DI1%-WnB z;1e;4h8SlD>RP`=KB1pA30R#>q|u{6u(txn>3i6iZ=Z!KQq0?9`89#4tS<}VVMEse z$ZNH0_g)!h--aY~y_a?PyzisExMHi#D&&^RXYtHtv<%0M!T_Qi$MtF7?VQ~peSysI zC1s$EVq(FMu-OlOnCAah}D!c literal 0 HcmV?d00001 diff --git a/files/certs/keystore-password.p12 b/test/integration/files/certs/keystore-password.p12 similarity index 100% rename from files/certs/keystore-password.p12 rename to test/integration/files/certs/keystore-password.p12 diff --git a/test/integration/files/certs/shared-store-no-password-ca.p12 b/test/integration/files/certs/shared-store-no-password-ca.p12 new file mode 100644 index 0000000000000000000000000000000000000000..9b76934b535b05e4399a41286f3f30993d80477f GIT binary patch literal 2527 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 YAbTw#S1=98aLJ0=k$D*e1`>1s4H+hnY5)KL literal 0 HcmV?d00001 diff --git a/files/certs/truststore-password.p12 b/test/integration/files/certs/truststore-password.p12 similarity index 100% rename from files/certs/truststore-password.p12 rename to test/integration/files/certs/truststore-password.p12 diff --git a/files/templates-6.x/basic.json b/test/integration/files/templates-6.x/basic.json similarity index 100% rename from files/templates-6.x/basic.json rename to test/integration/files/templates-6.x/basic.json diff --git a/files/templates-7.x/basic.json b/test/integration/files/templates-7.x/basic.json similarity index 100% rename from files/templates-7.x/basic.json rename to test/integration/files/templates-7.x/basic.json diff --git a/test/integration/xpack-upgrade-trial.yml b/test/integration/xpack-upgrade-trial.yml index 3efff8c..e2500d2 100644 --- a/test/integration/xpack-upgrade-trial.yml +++ b/test/integration/xpack-upgrade-trial.yml @@ -17,6 +17,7 @@ es_config: "{{ es_config_7x if es_major_version == '7.x' else es_config_6x }}" es_heap_size: "1g" es_templates: true + es_templates_fileglob: "test/integration/files/templates-{{ es_major_version }}/*.json" es_major_version: "7.x" es_version: "{{ '7.0.0' if es_major_version == '7.x' else '6.7.1' }}" # This is set to an older version than the current default to force an upgrade es_xpack_license: "" @@ -31,8 +32,8 @@ es_api_sleep: 5 es_enable_http_ssl: false es_enable_transport_ssl: true - es_ssl_keystore: "files/certs/keystore-password.p12" - es_ssl_truststore: "files/certs/truststore-password.p12" + es_ssl_keystore: "test/integration/files/certs/keystore-password.p12" + es_ssl_truststore: "test/integration/files/certs/truststore-password.p12" es_ssl_keystore_password: password1 es_ssl_truststore_password: password2 es_validate_certs: no @@ -134,6 +135,7 @@ es_config: "{{ es_config_7x if es_major_version == '7.x' else es_config_6x }}" es_heap_size: "1g" es_templates: true + es_templates_fileglob: "test/integration/files/templates-{{ es_major_version }}/*.json" es_xpack_license: "" es_xpack_trial: false es_plugins: @@ -146,8 +148,8 @@ es_api_sleep: 5 es_enable_http_ssl: true es_enable_transport_ssl: true - es_ssl_keystore: "files/certs/shared-store-no-password.p12" - es_ssl_truststore: "files/certs/shared-store-no-password.p12" + es_ssl_keystore: "test/integration/files/certs/shared-store-no-password.p12" + es_ssl_truststore: "test/integration/files/certs/shared-store-no-password.p12" es_ssl_keystore_password: "" es_ssl_truststore_password: "" es_validate_certs: no diff --git a/test/integration/xpack-upgrade.yml b/test/integration/xpack-upgrade.yml index ba32202..abfe8ab 100644 --- a/test/integration/xpack-upgrade.yml +++ b/test/integration/xpack-upgrade.yml @@ -17,6 +17,7 @@ es_config: "{{ es_config_7x if es_major_version == '7.x' else es_config_6x }}" es_heap_size: "1g" es_templates: true + es_templates_fileglob: "test/integration/files/templates-{{ es_major_version }}/*.json" es_major_version: "7.x" es_version: "{{ '7.0.0' if es_major_version == '7.x' else '6.7.1' }}" # This is set to an older version than the current default to force an upgrade es_xpack_license: "{{ lookup('file', '/tmp/license.json') }}" @@ -30,8 +31,8 @@ es_api_sleep: 5 es_enable_http_ssl: false es_enable_transport_ssl: true - es_ssl_keystore: "files/certs/keystore-password.p12" - es_ssl_truststore: "files/certs/truststore-password.p12" + es_ssl_keystore: "test/integration/files/certs/keystore-password.p12" + es_ssl_truststore: "test/integration/files/certs/truststore-password.p12" es_ssl_keystore_password: password1 es_ssl_truststore_password: password2 es_validate_certs: no @@ -133,6 +134,7 @@ es_config: "{{ es_config_7x if es_major_version == '7.x' else es_config_6x }}" es_heap_size: "1g" es_templates: true + es_templates_fileglob: "test/integration/files/templates-{{ es_major_version }}/*.json" es_xpack_license: "{{ lookup('file', '/tmp/license.json') }}" es_plugins: - plugin: ingest-attachment @@ -144,8 +146,8 @@ es_api_sleep: 5 es_enable_http_ssl: true es_enable_transport_ssl: true - es_ssl_keystore: "files/certs/shared-store-no-password.p12" - es_ssl_truststore: "files/certs/shared-store-no-password.p12" + es_ssl_keystore: "test/integration/files/certs/shared-store-no-password.p12" + es_ssl_truststore: "test/integration/files/certs/shared-store-no-password.p12" es_ssl_keystore_password: "" es_ssl_truststore_password: "" es_validate_certs: no