opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-10 17:48:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

remove ARTIFACT_DIR and ArtifactPath

Browse Source 
...they're not actually used for anything

Signed-off-by: Ed Santiago <santiago@redhat.com>
This commit is contained in:
Ed Santiago
2021-12-01 12:56:07 -07:00
parent 3ac1b9bc0f
commit 65109494bc
2 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
test/e2e/common_test.go
View File

@ -36,7 +36,6 @@ var (
PODMAN_BINARY string //nolint:golint,stylecheck PODMAN_BINARY string //nolint:golint,stylecheck
INTEGRATION_ROOT string //nolint:golint,stylecheck INTEGRATION_ROOT string //nolint:golint,stylecheck
CGROUP_MANAGER = "systemd" //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 RESTORE_IMAGES = []string{ALPINE, BB, nginx} //nolint:golint,stylecheck
defaultWaitTimeout = 90 defaultWaitTimeout = 90
CGROUPSV2, _ = cgroups.IsCgroup2UnifiedMode() //nolint:golint,stylecheck CGROUPSV2, _ = cgroups.IsCgroup2UnifiedMode() //nolint:golint,stylecheck
@ -111,13 +110,6 @@ var _ = SynchronizedBeforeSuite(func() []byte {
cwd, _ := os.Getwd() cwd, _ := os.Getwd()
INTEGRATION_ROOT = filepath.Join(cwd, "../../") INTEGRATION_ROOT = filepath.Join(cwd, "../../")
podman := PodmanTestSetup("/tmp") 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 // Pull cirros but don't put it into the cache
pullImages := []string{cirros, fedoraToolbox, volumeTest} pullImages := []string{cirros, fedoraToolbox, volumeTest}
@ -170,7 +162,6 @@ var _ = SynchronizedBeforeSuite(func() []byte {
func (p *PodmanTestIntegration) Setup() { func (p *PodmanTestIntegration) Setup() {
cwd, _ := os.Getwd() cwd, _ := os.Getwd()
INTEGRATION_ROOT = filepath.Join(cwd, "../../") INTEGRATION_ROOT = filepath.Join(cwd, "../../")
p.ArtifactPath = ARTIFACT_DIR
} }
var _ = SynchronizedAfterSuite(func() {}, var _ = SynchronizedAfterSuite(func() {},
@ -265,7 +256,6 @@ func PodmanTestCreateUtil(tempDir string, remote bool) *PodmanTestIntegration {
PodmanTest: PodmanTest{ PodmanTest: PodmanTest{
PodmanBinary: podmanBinary, PodmanBinary: podmanBinary,
RemotePodmanBinary: podmanRemoteBinary, RemotePodmanBinary: podmanRemoteBinary,
ArtifactPath: ARTIFACT_DIR,
TempDir: tempDir, TempDir: tempDir,
RemoteTest: remote, RemoteTest: remote,
ImageCacheFS: storageFs, ImageCacheFS: storageFs,

1
test/utils/utils.go
View File

@ -36,7 +36,6 @@ type PodmanTestCommon interface {
type PodmanTest struct { type PodmanTest struct {
PodmanMakeOptions func(args []string, noEvents, noCache bool) []string PodmanMakeOptions func(args []string, noEvents, noCache bool) []string
PodmanBinary string PodmanBinary string
ArtifactPath string
TempDir string TempDir string
RemoteTest bool RemoteTest bool
RemotePodmanBinary string RemotePodmanBinary string