diff options
author | baude <bbaude@redhat.com> | 2020-10-27 09:14:53 -0500 |
---|---|---|
committer | baude <bbaude@redhat.com> | 2020-11-16 08:15:44 -0600 |
commit | 15539c1c4bdb10095bb4d30c6283795dac657600 (patch) | |
tree | 6a0090d6ab89eb7665067ce32194f45b9dfe38da /test/e2e/network_test.go | |
parent | 392075631a284617b7e37b8bdfb3157f5918cdec (diff) | |
download | podman-15539c1c4bdb10095bb4d30c6283795dac657600.tar.gz podman-15539c1c4bdb10095bb4d30c6283795dac657600.tar.bz2 podman-15539c1c4bdb10095bb4d30c6283795dac657600.zip |
use lookaside storage for remote tests
in an effort to speed up the remote testing, we should be using
lookaside storage to avoid pull images as well as importing multiple
images into the RW store.
one test was removed and added into system test by Ed in #8325
Signed-off-by: baude <bbaude@redhat.com>
Diffstat (limited to 'test/e2e/network_test.go')
-rw-r--r-- | test/e2e/network_test.go | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/test/e2e/network_test.go b/test/e2e/network_test.go index 7933580a5..b010010f0 100644 --- a/test/e2e/network_test.go +++ b/test/e2e/network_test.go @@ -2,9 +2,7 @@ package integration import ( "fmt" - "io/ioutil" "os" - "path/filepath" "strings" "time" @@ -15,53 +13,6 @@ import ( . "github.com/onsi/gomega" ) -func writeConf(conf []byte, confPath string) { - if err := ioutil.WriteFile(confPath, conf, 777); err != nil { - fmt.Println(err) - } -} -func removeConf(confPath string) { - if err := os.Remove(confPath); err != nil { - fmt.Println(err) - } -} - -// generateNetworkConfig generates a cni config with a random name -// it returns the network name and the filepath -func generateNetworkConfig(p *PodmanTestIntegration) (string, string) { - // generate a random name to prevent conflicts with other tests - name := "net" + stringid.GenerateNonCryptoID() - path := filepath.Join(p.CNIConfigDir, fmt.Sprintf("%s.conflist", name)) - conf := fmt.Sprintf(`{ - "cniVersion": "0.3.0", - "name": "%s", - "plugins": [ - { - "type": "bridge", - "bridge": "cni1", - "isGateway": true, - "ipMasq": true, - "ipam": { - "type": "host-local", - "subnet": "10.99.0.0/16", - "routes": [ - { "dst": "0.0.0.0/0" } - ] - } - }, - { - "type": "portmap", - "capabilities": { - "portMappings": true - } - } - ] - }`, name) - writeConf([]byte(conf), path) - - return name, path -} - var _ = Describe("Podman network", func() { var ( tempdir string |