mirror of
https://github.com/containers/podman.git
synced 2025-05-28 13:40:33 +08:00

One or more tests are not taking advantage of the local image cache. This has been observed to cause a testing flake in at least one `--sigproxy` test which uses `PodmanTestIntegration.PodmanPID()`. It has a rather short timeout of 15-seconds, which isn't always enough time to pull down a remote image. Fix this by reloacing the `noCache` logic from `PodmanTest.PodmanAsUserBase()` down the stack into `PodmanTestIntegration.makeOptions()`. This also eliminates the need to also check if a remote-client is being used - since it uses a different function. Also reverse the parameter order in `PodmanTest.PodmanBase` so that everywhere is consistently `noEvents` then `noCache`. Signed-off-by: Chris Evich <cevich@redhat.com>
203 lines
6.1 KiB
Go
203 lines
6.1 KiB
Go
// +build remoteclient
|
|
|
|
package integration
|
|
|
|
import (
|
|
"bytes"
|
|
"fmt"
|
|
"github.com/containers/libpod/pkg/rootless"
|
|
"io/ioutil"
|
|
"os"
|
|
"os/exec"
|
|
"path/filepath"
|
|
"strconv"
|
|
"strings"
|
|
"syscall"
|
|
"time"
|
|
|
|
"github.com/onsi/ginkgo"
|
|
)
|
|
|
|
func SkipIfRemote() {
|
|
ginkgo.Skip("This function is not enabled for remote podman")
|
|
}
|
|
|
|
func SkipIfRootless() {
|
|
if os.Geteuid() != 0 {
|
|
ginkgo.Skip("This function is not enabled for remote podman")
|
|
}
|
|
}
|
|
|
|
// Podman is the exec call to podman on the filesystem
|
|
func (p *PodmanTestIntegration) Podman(args []string) *PodmanSessionIntegration {
|
|
podmanSession := p.PodmanBase(args, false, false)
|
|
return &PodmanSessionIntegration{podmanSession}
|
|
}
|
|
|
|
// PodmanNoCache calls podman with out adding the imagecache
|
|
func (p *PodmanTestIntegration) PodmanNoCache(args []string) *PodmanSessionIntegration {
|
|
podmanSession := p.PodmanBase(args, false, true)
|
|
return &PodmanSessionIntegration{podmanSession}
|
|
}
|
|
|
|
// PodmanNoEvents calls the Podman command without an imagecache and without an
|
|
// events backend. It is used mostly for caching and uncaching images.
|
|
func (p *PodmanTestIntegration) PodmanNoEvents(args []string) *PodmanSessionIntegration {
|
|
podmanSession := p.PodmanBase(args, true, true)
|
|
return &PodmanSessionIntegration{podmanSession}
|
|
}
|
|
|
|
func (p *PodmanTestIntegration) setDefaultRegistriesConfigEnv() {
|
|
defaultFile := filepath.Join(INTEGRATION_ROOT, "test/registries.conf")
|
|
os.Setenv("REGISTRIES_CONFIG_PATH", defaultFile)
|
|
}
|
|
|
|
func (p *PodmanTestIntegration) setRegistriesConfigEnv(b []byte) {
|
|
outfile := filepath.Join(p.TempDir, "registries.conf")
|
|
os.Setenv("REGISTRIES_CONFIG_PATH", outfile)
|
|
ioutil.WriteFile(outfile, b, 0644)
|
|
}
|
|
|
|
func resetRegistriesConfigEnv() {
|
|
os.Setenv("REGISTRIES_CONFIG_PATH", "")
|
|
}
|
|
func PodmanTestCreate(tempDir string) *PodmanTestIntegration {
|
|
pti := PodmanTestCreateUtil(tempDir, true)
|
|
pti.StartVarlink()
|
|
return pti
|
|
}
|
|
|
|
func (p *PodmanTestIntegration) ResetVarlinkAddress() {
|
|
os.Unsetenv("PODMAN_VARLINK_ADDRESS")
|
|
}
|
|
|
|
func (p *PodmanTestIntegration) SetVarlinkAddress(addr string) {
|
|
os.Setenv("PODMAN_VARLINK_ADDRESS", addr)
|
|
}
|
|
|
|
func (p *PodmanTestIntegration) StartVarlink() {
|
|
if os.Geteuid() == 0 {
|
|
os.MkdirAll("/run/podman", 0755)
|
|
}
|
|
varlinkEndpoint := p.VarlinkEndpoint
|
|
p.SetVarlinkAddress(p.VarlinkEndpoint)
|
|
|
|
args := []string{"varlink", "--timeout", "0", varlinkEndpoint}
|
|
podmanOptions := getVarlinkOptions(p, args)
|
|
command := exec.Command(p.PodmanBinary, podmanOptions...)
|
|
fmt.Printf("Running: %s %s\n", p.PodmanBinary, strings.Join(podmanOptions, " "))
|
|
command.Start()
|
|
command.SysProcAttr = &syscall.SysProcAttr{Setpgid: true}
|
|
p.VarlinkCommand = command
|
|
p.VarlinkSession = command.Process
|
|
p.DelayForVarlink()
|
|
}
|
|
|
|
func (p *PodmanTestIntegration) StopVarlink() {
|
|
var out bytes.Buffer
|
|
var pids []int
|
|
varlinkSession := p.VarlinkSession
|
|
|
|
if !rootless.IsRootless() {
|
|
if err := varlinkSession.Kill(); err != nil {
|
|
fmt.Fprintf(os.Stderr, "error on varlink stop-kill %q", err)
|
|
}
|
|
if _, err := varlinkSession.Wait(); err != nil {
|
|
fmt.Fprintf(os.Stderr, "error on varlink stop-wait %q", err)
|
|
}
|
|
|
|
} else {
|
|
p.ResetVarlinkAddress()
|
|
parentPid := fmt.Sprintf("%d", p.VarlinkSession.Pid)
|
|
pgrep := exec.Command("pgrep", "-P", parentPid)
|
|
fmt.Printf("running: pgrep %s\n", parentPid)
|
|
pgrep.Stdout = &out
|
|
err := pgrep.Run()
|
|
if err != nil {
|
|
fmt.Fprint(os.Stderr, "unable to find varlink pid")
|
|
}
|
|
|
|
for _, s := range strings.Split(out.String(), "\n") {
|
|
if len(s) == 0 {
|
|
continue
|
|
}
|
|
p, err := strconv.Atoi(s)
|
|
if err != nil {
|
|
fmt.Fprintf(os.Stderr, "unable to convert %s to int", s)
|
|
}
|
|
if p != 0 {
|
|
pids = append(pids, p)
|
|
}
|
|
}
|
|
|
|
pids = append(pids, p.VarlinkSession.Pid)
|
|
for _, pid := range pids {
|
|
syscall.Kill(pid, syscall.SIGKILL)
|
|
}
|
|
}
|
|
socket := strings.Split(p.VarlinkEndpoint, ":")[1]
|
|
if err := os.Remove(socket); err != nil {
|
|
fmt.Println(err)
|
|
}
|
|
}
|
|
|
|
//MakeOptions assembles all the podman main options
|
|
func (p *PodmanTestIntegration) makeOptions(args []string, noEvents, noCache bool) []string {
|
|
return args
|
|
}
|
|
|
|
//MakeOptions assembles all the podman main options
|
|
func getVarlinkOptions(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",
|
|
p.CrioRoot, p.RunRoot, p.OCIRuntime, p.ConmonBinary, p.CNIConfigDir, p.CgroupManager), " ")
|
|
if os.Getenv("HOOK_OPTION") != "" {
|
|
podmanOptions = append(podmanOptions, os.Getenv("HOOK_OPTION"))
|
|
}
|
|
podmanOptions = append(podmanOptions, strings.Split(p.StorageOptions, " ")...)
|
|
podmanOptions = append(podmanOptions, args...)
|
|
return podmanOptions
|
|
}
|
|
|
|
func (p *PodmanTestIntegration) RestoreArtifactToCache(image string) error {
|
|
fmt.Printf("Restoring %s...\n", image)
|
|
dest := strings.Split(image, "/")
|
|
destName := fmt.Sprintf("/tmp/%s.tar", strings.Replace(strings.Join(strings.Split(dest[len(dest)-1], "/"), ""), ":", "-", -1))
|
|
p.CrioRoot = p.ImageCacheDir
|
|
restore := p.PodmanNoEvents([]string{"load", "-q", "-i", destName})
|
|
restore.WaitWithDefaultTimeout()
|
|
return nil
|
|
}
|
|
|
|
// SeedImages restores all the artifacts into the main store for remote tests
|
|
func (p *PodmanTestIntegration) SeedImages() error {
|
|
return p.RestoreAllArtifacts()
|
|
}
|
|
|
|
// RestoreArtifact puts the cached image into our test store
|
|
func (p *PodmanTestIntegration) RestoreArtifact(image string) error {
|
|
fmt.Printf("Restoring %s...\n", image)
|
|
dest := strings.Split(image, "/")
|
|
destName := fmt.Sprintf("/tmp/%s.tar", strings.Replace(strings.Join(strings.Split(dest[len(dest)-1], "/"), ""), ":", "-", -1))
|
|
args := []string{"load", "-q", "-i", destName}
|
|
podmanOptions := getVarlinkOptions(p, args)
|
|
command := exec.Command(p.PodmanBinary, podmanOptions...)
|
|
fmt.Printf("Running: %s %s\n", p.PodmanBinary, strings.Join(podmanOptions, " "))
|
|
command.Start()
|
|
command.Wait()
|
|
return nil
|
|
}
|
|
|
|
func (p *PodmanTestIntegration) DelayForVarlink() {
|
|
for i := 0; i < 5; i++ {
|
|
session := p.Podman([]string{"info"})
|
|
session.WaitWithDefaultTimeout()
|
|
if session.ExitCode() == 0 || i == 4 {
|
|
break
|
|
}
|
|
time.Sleep(1 * time.Second)
|
|
}
|
|
}
|
|
|
|
func populateCache(podman *PodmanTestIntegration) {}
|
|
func removeCache() {}
|