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

Rename CrioRoot as just Root

Browse Source 
...and remove other uses of "crio". They're confusing
and misleading. (I'm sure it made sense at one time)

Signed-off-by: Ed Santiago <santiago@redhat.com>
This commit is contained in:
Ed Santiago
2021-12-01 11:44:02 -07:00
parent 078e633294
commit 5ac66e2aab
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
test/e2e/common_test.go
View File

@ -46,7 +46,7 @@ var (
type PodmanTestIntegration struct { type PodmanTestIntegration struct {
PodmanTest PodmanTest
ConmonBinary string ConmonBinary string
CrioRoot string Root string
CNIConfigDir string CNIConfigDir string
OCIRuntime string OCIRuntime string
RunRoot string RunRoot string
@ -130,7 +130,7 @@ var _ = SynchronizedBeforeSuite(func() []byte {
fmt.Printf("%q\n", err) fmt.Printf("%q\n", err)
os.Exit(1) os.Exit(1)
} }
podman.CrioRoot = ImageCacheDir podman.Root = ImageCacheDir
// If running localized tests, the cache dir is created and populated. if the // If running localized tests, the cache dir is created and populated. if the
// tests are remote, this is a no-op // tests are remote, this is a no-op
populateCache(podman) populateCache(podman)
@ -181,14 +181,14 @@ var _ = SynchronizedAfterSuite(func() {},
fmt.Printf("%s\t\t%f\n", result.name, result.length) fmt.Printf("%s\t\t%f\n", result.name, result.length)
} }
// previous crio-run // previous runroot
tempdir, err := CreateTempDirInTempDir() tempdir, err := CreateTempDirInTempDir()
if err != nil { if err != nil {
os.Exit(1) os.Exit(1)
} }
podmanTest := PodmanTestCreate(tempdir) podmanTest := PodmanTestCreate(tempdir)
if err := os.RemoveAll(podmanTest.CrioRoot); err != nil { if err := os.RemoveAll(podmanTest.Root); err != nil {
fmt.Printf("%q\n", err) fmt.Printf("%q\n", err)
} }
@ -272,11 +272,11 @@ func PodmanTestCreateUtil(tempDir string, remote bool) *PodmanTestIntegration {
ImageCacheDir: ImageCacheDir, ImageCacheDir: ImageCacheDir,
}, },
ConmonBinary: conmonBinary, ConmonBinary: conmonBinary,
CrioRoot: filepath.Join(tempDir, "crio"), Root: filepath.Join(tempDir, "root"),
TmpDir: tempDir, TmpDir: tempDir,
CNIConfigDir: CNIConfigDir, CNIConfigDir: CNIConfigDir,
OCIRuntime: ociRuntime, OCIRuntime: ociRuntime,
RunRoot: filepath.Join(tempDir, "crio-run"), RunRoot: filepath.Join(tempDir, "runroot"),
StorageOptions: storageOptions, StorageOptions: storageOptions,
SignaturePolicyPath: filepath.Join(INTEGRATION_ROOT, "test/policy.json"), SignaturePolicyPath: filepath.Join(INTEGRATION_ROOT, "test/policy.json"),
CgroupManager: cgroupManager, CgroupManager: cgroupManager,
@ -741,7 +741,7 @@ func (p *PodmanTestIntegration) RestoreArtifactToCache(image string) error {
fmt.Printf("Restoring %s...\n", image) fmt.Printf("Restoring %s...\n", image)
dest := strings.Split(image, "/") dest := strings.Split(image, "/")
destName := fmt.Sprintf("/tmp/%s.tar", strings.Replace(strings.Join(strings.Split(dest[len(dest)-1], "/"), ""), ":", "-", -1)) destName := fmt.Sprintf("/tmp/%s.tar", strings.Replace(strings.Join(strings.Split(dest[len(dest)-1], "/"), ""), ":", "-", -1))
p.CrioRoot = p.ImageCacheDir p.Root = p.ImageCacheDir
restore := p.PodmanNoEvents([]string{"load", "-q", "-i", destName}) restore := p.PodmanNoEvents([]string{"load", "-q", "-i", destName})
restore.WaitWithDefaultTimeout() restore.WaitWithDefaultTimeout()
return nil return nil
@ -795,7 +795,7 @@ func (p *PodmanTestIntegration) makeOptions(args []string, noEvents, noCache boo
} }
podmanOptions := strings.Split(fmt.Sprintf("%s--root %s --runroot %s --runtime %s --conmon %s --cni-config-dir %s --cgroup-manager %s --tmpdir %s --events-backend %s", podmanOptions := strings.Split(fmt.Sprintf("%s--root %s --runroot %s --runtime %s --conmon %s --cni-config-dir %s --cgroup-manager %s --tmpdir %s --events-backend %s",
debug, p.CrioRoot, p.RunRoot, p.OCIRuntime, p.ConmonBinary, p.CNIConfigDir, p.CgroupManager, p.TmpDir, eventsType), " ") debug, p.Root, p.RunRoot, p.OCIRuntime, p.ConmonBinary, p.CNIConfigDir, p.CgroupManager, p.TmpDir, eventsType), " ")
if os.Getenv("HOOK_OPTION") != "" { if os.Getenv("HOOK_OPTION") != "" {
podmanOptions = append(podmanOptions, os.Getenv("HOOK_OPTION")) podmanOptions = append(podmanOptions, os.Getenv("HOOK_OPTION"))
} }

2
test/e2e/libpod_suite_remote_test.go
View File

@ -148,7 +148,7 @@ func (p *PodmanTestIntegration) StopRemoteService() {
//MakeOptions assembles all the podman main options //MakeOptions assembles all the podman main options
func getRemoteOptions(p *PodmanTestIntegration, args []string) []string { func getRemoteOptions(p *PodmanTestIntegration, args []string) []string {
podmanOptions := strings.Split(fmt.Sprintf("--root %s --runroot %s --runtime %s --conmon %s --cni-config-dir %s --cgroup-manager %s", podmanOptions := strings.Split(fmt.Sprintf("--root %s --runroot %s --runtime %s --conmon %s --cni-config-dir %s --cgroup-manager %s",
p.CrioRoot, p.RunRoot, p.OCIRuntime, p.ConmonBinary, p.CNIConfigDir, p.CgroupManager), " ") p.Root, p.RunRoot, p.OCIRuntime, p.ConmonBinary, p.CNIConfigDir, p.CgroupManager), " ")
if os.Getenv("HOOK_OPTION") != "" { if os.Getenv("HOOK_OPTION") != "" {
podmanOptions = append(podmanOptions, os.Getenv("HOOK_OPTION")) podmanOptions = append(podmanOptions, os.Getenv("HOOK_OPTION"))
} }