diff options
| author | Ed Santiago <santiago@redhat.com> | 2021-12-01 12:56:07 -0700 |
|---|---|---|
| committer | Ed Santiago <santiago@redhat.com> | 2021-12-01 14:06:22 -0700 |
| commit | 65109494bca511fbcfd36c8d5b2f70e33c210409 (patch) | |
| tree | bcc0242bde9f4895a30dfade10ab3afff8046740 | |
| parent | 3ac1b9bc0f1d45289d0f014d667f7b45302992b6 (diff) | |
| download | podman-65109494bca511fbcfd36c8d5b2f70e33c210409.tar.gz podman-65109494bca511fbcfd36c8d5b2f70e33c210409.tar.bz2 podman-65109494bca511fbcfd36c8d5b2f70e33c210409.zip | |
remove ARTIFACT_DIR and ArtifactPath
...they're not actually used for anything
Signed-off-by: Ed Santiago <santiago@redhat.com>
| -rw-r--r-- | test/e2e/common_test.go | 10 | ||||
| -rw-r--r-- | test/utils/utils.go | 1 |
2 files changed, 0 insertions, 11 deletions
diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go index 4137dfb0f..a411a860b 100644 --- a/test/e2e/common_test.go +++ b/test/e2e/common_test.go @@ -36,7 +36,6 @@ var ( PODMAN_BINARY string //nolint:golint,stylecheck INTEGRATION_ROOT string //nolint:golint,stylecheck CGROUP_MANAGER = "systemd" //nolint:golint,stylecheck - ARTIFACT_DIR = "/tmp/.artifacts" //nolint:golint,stylecheck RESTORE_IMAGES = []string{ALPINE, BB, nginx} //nolint:golint,stylecheck defaultWaitTimeout = 90 CGROUPSV2, _ = cgroups.IsCgroup2UnifiedMode() //nolint:golint,stylecheck @@ -111,13 +110,6 @@ var _ = SynchronizedBeforeSuite(func() []byte { cwd, _ := os.Getwd() INTEGRATION_ROOT = filepath.Join(cwd, "../../") podman := PodmanTestSetup("/tmp") - podman.ArtifactPath = ARTIFACT_DIR - if _, err := os.Stat(ARTIFACT_DIR); os.IsNotExist(err) { - if err = os.Mkdir(ARTIFACT_DIR, 0777); err != nil { - fmt.Printf("%q\n", err) - os.Exit(1) - } - } // Pull cirros but don't put it into the cache pullImages := []string{cirros, fedoraToolbox, volumeTest} @@ -170,7 +162,6 @@ var _ = SynchronizedBeforeSuite(func() []byte { func (p *PodmanTestIntegration) Setup() { cwd, _ := os.Getwd() INTEGRATION_ROOT = filepath.Join(cwd, "../../") - p.ArtifactPath = ARTIFACT_DIR } var _ = SynchronizedAfterSuite(func() {}, @@ -265,7 +256,6 @@ func PodmanTestCreateUtil(tempDir string, remote bool) *PodmanTestIntegration { PodmanTest: PodmanTest{ PodmanBinary: podmanBinary, RemotePodmanBinary: podmanRemoteBinary, - ArtifactPath: ARTIFACT_DIR, TempDir: tempDir, RemoteTest: remote, ImageCacheFS: storageFs, diff --git a/test/utils/utils.go b/test/utils/utils.go index 944c1ac3c..f41024072 100644 --- a/test/utils/utils.go +++ b/test/utils/utils.go @@ -36,7 +36,6 @@ type PodmanTestCommon interface { type PodmanTest struct { PodmanMakeOptions func(args []string, noEvents, noCache bool) []string PodmanBinary string - ArtifactPath string TempDir string RemoteTest bool RemotePodmanBinary string |