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 dee9e3c74d9acbc5be61c3714687617827336421..0000000000000000000000000000000000000000 --- 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 8004aeb2cf4394669fd9efd6344b65e8d3a0ea82..e5aaf637a1cdbc5cbaebe5d1401001485033bde4 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 Binary files a/mantle/kola/tests/rpm/aht-dummy-1.0-1.noarch.rpm and /dev/null differ diff --git a/mantle/kola/tests/rpmostree/deployments.go b/mantle/kola/tests/rpmostree/deployments.go index 5e9a1b8b21edc3904a0e2283d873982afdae1541..1bab4a88870871b43021b3d70afffe605131324f 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) }