mirror/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2026-03-15 21:29:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12529 from vrothberg/fix-12436

Browse Source 
remove runlabel test for global opts
This commit is contained in:
OpenShift Merge Robot
2021-12-08 14:42:19 +00:00
committed by GitHub
parent 2d88c5f543 d7f6f4e881
commit d6079debd8
2 changed files with 2 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/domain/infra/abi/containers_runlabel.go
View File

@@ -111,7 +111,6 @@ func generateRunlabelCommand(runlabel string, img *libimage.Image, inputName str
var (
err error
name, imageName string
globalOpts string
cmd []string
)
@@ -144,7 +143,7 @@ func generateRunlabelCommand(runlabel string, img *libimage.Image, inputName str
runlabel = fmt.Sprintf("%s %s", runlabel, strings.Join(args, " "))
}
cmd, err = generateCommand(runlabel, imageName, name, globalOpts)
cmd, err = generateCommand(runlabel, imageName, name)
if err != nil {
return nil, nil, err
}
@@ -209,7 +208,7 @@ func replaceImage(arg, image string) string {
}
// generateCommand takes a label (string) and converts it to an executable command
func generateCommand(command, imageName, name, globalOpts string) ([]string, error) {
func generateCommand(command, imageName, name string) ([]string, error) {
if name == "" {
name = imageName
}
@@ -231,8 +230,6 @@ func generateCommand(command, imageName, name, globalOpts string) ([]string, err
newArg = fmt.Sprintf("IMAGE=%s", imageName)
case "NAME=NAME":
newArg = fmt.Sprintf("NAME=%s", name)
case "$GLOBAL_OPTS":
newArg = globalOpts
default:
newArg = replaceName(arg, name)
newArg = replaceImage(newArg, imageName)

20
test/e2e/runlabel_test.go
View File

@@ -18,10 +18,6 @@ var LsDockerfile = fmt.Sprintf(`
FROM %s
LABEL RUN ls -la`, ALPINE)
var GlobalDockerfile = fmt.Sprintf(`
FROM %s
LABEL RUN echo \$GLOBAL_OPTS`, ALPINE)
var PodmanRunlabelNameDockerfile = fmt.Sprintf(`
FROM %s
LABEL RUN podman run --name NAME IMAGE`, ALPINE)
@@ -104,22 +100,6 @@ var _ = Describe("podman container runlabel", func() {
Expect(result.OutputToString()).To(Not(ContainSubstring("panic")))
})
It("podman container runlabel global options", func() {
fmt.Printf("FIXME: for lint. Remove when you fix this test: %s", GlobalDockerfile)
Skip("FIXME: $GLOBAL_OPTS does not work at all, #12436")
image := "podman-global-test:ls"
podmanTest.BuildImage(GlobalDockerfile, image, "false")
result := podmanTest.Podman([]string{"--syslog", "--log-level", "debug", "container", "runlabel", "RUN", image})
result.WaitWithDefaultTimeout()
Expect(result).Should(Exit(0))
Expect(result.OutputToString()).To(ContainSubstring("--syslog true"))
Expect(result.OutputToString()).To(ContainSubstring("--log-level debug"))
result = podmanTest.Podman([]string{"rmi", image})
result.WaitWithDefaultTimeout()
Expect(result).Should(Exit(0))
})
It("runlabel should fail with nonexistent authfile", func() {
image := "podman-runlabel-test:podman"
podmanTest.BuildImage(PodmanDockerfile, image, "false")