From 64d039f8bc18964c7a9f65e25ee33423289a59fe Mon Sep 17 00:00:00 2001 From: fu-shanqing Date: Tue, 27 Sep 2022 15:16:56 +0800 Subject: [PATCH] fix kola test error --- .../docs/nestos-ignition-resource-local.txt | 1 - mantle/kola/tests/ignition/resource.go | 8 +++----- mantle/kola/tests/rpm/aht-dummy-1.0-1.noarch.rpm | Bin 6552 -> 0 bytes mantle/kola/tests/rpmostree/deployments.go | 4 ++-- 4 files changed, 5 insertions(+), 8 deletions(-) delete mode 100644 mantle/kola/tests/docs/nestos-ignition-resource-local.txt delete mode 100644 mantle/kola/tests/rpm/aht-dummy-1.0-1.noarch.rpm diff --git a/mantle/kola/tests/docs/nestos-ignition-resource-local.txt b/mantle/kola/tests/docs/nestos-ignition-resource-local.txt deleted file mode 100644 index dee9e3c7..00000000 --- a/mantle/kola/tests/docs/nestos-ignition-resource-local.txt +++ /dev/null @@ -1 +0,0 @@ -NestOS \ No newline at end of file diff --git a/mantle/kola/tests/ignition/resource.go b/mantle/kola/tests/ignition/resource.go index 8004aeb2..e5aaf637 100644 --- a/mantle/kola/tests/ignition/resource.go +++ b/mantle/kola/tests/ignition/resource.go @@ -91,9 +91,9 @@ func init() { "storage": { "files": [ { - "path": "/var/resource/https", + "path": "/var/resource/http", "contents": { - "source": "https://gitee.com/openeuler/nestos-assembler/tree/master/mantle/kola/tests/nestos-ignition-resource-local.txt" + "source": "http://124.126.103.127/nestos/kola/nestos-ignition-resource-remote.txt" }, "mode": 420 } @@ -131,9 +131,7 @@ func resourceRemote(c cluster.TestCluster) { m := c.Machines()[0] checkResources(c, m, map[string]string{ - "http": "kola-anonymous", - "https": "kola-anonymous", - "s3-anon": "kola-anonymous", + "http": "NestOS", }) } diff --git a/mantle/kola/tests/rpm/aht-dummy-1.0-1.noarch.rpm b/mantle/kola/tests/rpm/aht-dummy-1.0-1.noarch.rpm deleted file mode 100644 index 07ab17941dedbbbc8cc3078582c11a893111f3c2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6552 zcmeI1TWl0n7{|}DRZ0Qn;surHHi$xGwllMH+aLnAv@}-Qv>*k+a%SdCcVxS>&din; zNB~2C2U4qOqVY*YB?89ajrd?B-jEPVj1nS>plFI*ygVpGas9s8(@JV zL{&$#MA=g1l&a`v+EOLmF&VQRi887gilwC~abzW>84guMT~t$46&-46x+>bLo;Fj4 z%4|iK460ewN*N~8G~3c0)s`hmmlTUCupl9o>-2KrxQ{!1;ay#dwDEMNpjI<9rzu<7+to#d$-CD{wBXTR3B1OigX&jB_FP zajpWz{^%L3UojdK{dk%)o*VfK&X{My{>M094~p@xIHNDfr#RmLihKBh^NpY|9+oPt zcQYvTkKvrS{v=S0<2;ZDtGI>7@8k@*ps4>7oTq`p{IT7jIKH0q8=Myki$NiX~xW9{>?Glgpjx*yt$l2k1 zmUEUfzE?P32nzd)!=589aK`6^@orFv#nC_HRXlz#=N`^;IQMd{e{ZwGQM8P10i$cGY%)M0Kk(c1E0!twkB4ZSYc z5;9&83Ly)^Ao=ed%uC0oW<85$aTF{9Woko9Q@4B%S(FR%%yJ!<*(B@c3Oyv}QQyi$ zeKvrDI5wRU4I?efk|K$UEmBz*siE1jOsVNej-AqMQ_(1O6h&oBarCreLt#!@QJAGD z(TZ^KJufU>hR;~a`6dJ3O8WUO=mUR?io?-p;2bom>dIPUy1AMlLtsSKHK)~jU3s4c z0kiAfEL%XkSTKDkhAnk&CmJ=})j?YL}->1LT5tA zyLpxn7Sn7NuFUs6e-=FUE*c5}vkJZ&_CkAphEUg0-`u*ev3^NMTl1pU+Ih2Jc&WXi zsqy~W_V$jsZEf?QNArTVgx~}rwN?sw-wT-)dcF{ZzL$gLI(=q&zAbcGmJqCRLo36A zgn;ivFe};|7+eEB*L1QR^YO)_z74mwU|AB(OM~8=m4UguLLd}!tK6I|gw)L9EPPQb zOM}eN(yo^yR^IhU&uSv`cTMo}EH|%^Wxf!-fTW3TOAVcW0v>s$J|$bM+5EQF3=5UNSKZONL! z6v(xwHI_0QO_mkI6g4BQ8JcK{Of;CN8m4BYMMsh(!?aW}rOQk*jc6hG{g%Fq#p0j+ za6j&{zPf!Wyr-xB81upiQXRvO+mwBqXPk`PO>)c0q_JODnDV8<==Iw_>=oR$$DVrh z#evt4{OZm=7u)mMCV%lOCk_lAeruie<>TG?*_+lJJhXn~N9zWjn-Z_j)FdBDy(4W< zkB&-J?|oq8%ey|kT;25i!0pd$e1Gf1^rjDrpWL;7+qX@J`>#EC;<~+6FGc?gdA6fr zUEgiRh3}28TCif}K)1K~_X#uCX3maU+tR#y)0)#Hwmr5JzSv`SzFYnFnQtcJ$D33w GS^76!zu{T{ diff --git a/mantle/kola/tests/rpmostree/deployments.go b/mantle/kola/tests/rpmostree/deployments.go index 5e9a1b8b..1bab4a88 100644 --- a/mantle/kola/tests/rpmostree/deployments.go +++ b/mantle/kola/tests/rpmostree/deployments.go @@ -169,7 +169,7 @@ func rpmOstreeUpgradeRollback(c cluster.TestCluster) { // This uses a dummy RPM that was originally created for the atomic-host-tests; // see: https://github.com/projectatomic/atomic-host-tests func rpmOstreeInstallUninstall(c cluster.TestCluster) { - var ahtRpmPath = "/var/home/core/aht-dummy.rpm" + var ahtRpmPath = "/var/home/core/aht-dummy-1.0-1.noarch.rpm" var installPkgName = "aht-dummy-1.0-1.noarch" var installBinName = "aht-dummy" var installBinPath string @@ -182,7 +182,7 @@ func rpmOstreeInstallUninstall(c cluster.TestCluster) { m := c.Machines()[0] - _, err := c.SSH(m, `sudo curl -L https://gitee.com/openeuler/nestos-assembler/tree/master/mantle/kola/tests/rpm/aht-dummy-1.0-1.noarch.rpm -o /var/home/core/aht-dummy.rpm`) + _, err := c.SSH(m, `sudo wget http://124.126.103.127/nestos/kola/rpm/aht-dummy-1.0-1.noarch.rpm`) if err != nil { c.Fatal(err) } -- Gitee