Merge pull request #8379 from rhatdan/remote2

Remove build \!remote flags from test phase 2

pkg/api/handlers/compat/networks.go

@@ -289,25 +289,44 @@ func CreateNetwork(w http.ResponseWriter, r *http.Request) {
 
 func RemoveNetwork(w http.ResponseWriter, r *http.Request) {
 	runtime := r.Context().Value("runtime").(*libpod.Runtime)
-	config, err := runtime.GetConfig()
-	if err != nil {
-		utils.InternalServerError(w, err)
+	ic := abi.ContainerEngine{Libpod: runtime}
+
+	query := struct {
+		Force bool `schema:"force"`
+	}{
+		// This is where you can override the golang default value for one of fields
+	}
+
+	decoder := r.Context().Value("decoder").(*schema.Decoder)
+	if err := decoder.Decode(&query, r.URL.Query()); err != nil {
+		utils.Error(w, "Something went wrong.", http.StatusBadRequest, errors.Wrapf(err, "failed to parse parameters for %s", r.URL.String()))
 		return
 	}
+
+	options := entities.NetworkRmOptions{
+		Force: query.Force,
+	}
+
 	name := utils.GetName(r)
-	exists, err := network.Exists(config, name)
+	reports, err := ic.NetworkRm(r.Context(), []string{name}, options)
 	if err != nil {
-		utils.InternalServerError(w, err)
+		utils.Error(w, "remove Network failed", http.StatusInternalServerError, err)
 		return
 	}
-	if !exists {
+	if len(reports) == 0 {
+		utils.Error(w, "remove Network failed", http.StatusInternalServerError, errors.Errorf("internal error"))
+		return
+	}
+	report := reports[0]
+	if report.Err != nil {
+		if errors.Cause(report.Err) == define.ErrNoSuchNetwork {
 			utils.Error(w, "network not found", http.StatusNotFound, define.ErrNoSuchNetwork)
 			return
 		}
-	if err := network.RemoveNetwork(config, name); err != nil {
-		utils.InternalServerError(w, err)
+		utils.InternalServerError(w, report.Err)
 		return
 	}
+
 	utils.WriteResponse(w, http.StatusNoContent, "")
 }
 

pkg/domain/infra/abi/network.go

@@ -96,7 +96,7 @@ func (ic *ContainerEngine) NetworkRm(ctx context.Context, namesOrIds []string, o
 					if err := ic.Libpod.RemovePod(ctx, pod, true, true); err != nil {
 						return reports, err
 					}
-				} else if err := ic.Libpod.RemoveContainer(ctx, c, true, true); err != nil {
+				} else if err := ic.Libpod.RemoveContainer(ctx, c, true, true); err != nil && errors.Cause(err) != define.ErrNoSuchCtr {
 					return reports, err
 				}
 			}

test/e2e/mount_test.go

@@ -1,5 +1,3 @@
-// +build !remote
-
 package integration
 
 import (
@@ -18,6 +16,7 @@ var _ = Describe("Podman mount", func() {
 	)
 
 	BeforeEach(func() {
+		SkipIfRemote("Podman mount not supported for remote connections")
 		SkipIfRootless("Podman mount requires podman unshare first to work")
 		tempdir, err = CreateTempDirInTempDir()
 		if err != nil {

test/e2e/push_test.go

@@ -1,5 +1,3 @@
-// +build !remote
-
 package integration
 
 import (
@@ -39,6 +37,7 @@ var _ = Describe("Podman push", func() {
 	})
 
 	It("podman push to containers/storage", func() {
+		SkipIfRemote("Remote push does not support containers-storage transport")
 		session := podmanTest.Podman([]string{"push", ALPINE, "containers-storage:busybox:test"})
 		session.WaitWithDefaultTimeout()
 		Expect(session.ExitCode()).To(Equal(0))
@@ -49,6 +48,7 @@ var _ = Describe("Podman push", func() {
 	})
 
 	It("podman push to dir", func() {
+		SkipIfRemote("Remote push does not support dir transport")
 		bbdir := filepath.Join(podmanTest.TempDir, "busybox")
 		session := podmanTest.Podman([]string{"push", "--remove-signatures", ALPINE,
 			fmt.Sprintf("dir:%s", bbdir)})
@@ -57,6 +57,7 @@ var _ = Describe("Podman push", func() {
 	})
 
 	It("podman push to local registry", func() {
+		SkipIfRemote("FIXME: This should work")
 		if podmanTest.Host.Arch == "ppc64le" {
 			Skip("No registry image for ppc64le")
 		}
@@ -87,6 +88,7 @@ var _ = Describe("Podman push", func() {
 	})
 
 	It("podman push to local registry with authorization", func() {
+		SkipIfRemote("FIXME: This does not seem to be returning an error")
 		SkipIfRootless("FIXME: Creating content in certs.d we use directories in homedir")
 		if podmanTest.Host.Arch == "ppc64le" {
 			Skip("No registry image for ppc64le")
@@ -163,6 +165,7 @@ var _ = Describe("Podman push", func() {
 	})
 
 	It("podman push to docker-archive", func() {
+		SkipIfRemote("Remote push does not support docker-archive transport")
 		tarfn := filepath.Join(podmanTest.TempDir, "alp.tar")
 		session := podmanTest.Podman([]string{"push", ALPINE,
 			fmt.Sprintf("docker-archive:%s:latest", tarfn)})
@@ -171,6 +174,7 @@ var _ = Describe("Podman push", func() {
 	})
 
 	It("podman push to docker daemon", func() {
+		SkipIfRemote("Remote push does not support docker-daemon transport")
 		setup := SystemExec("bash", []string{"-c", "systemctl status docker 2>&1"})
 
 		if setup.LineInOutputContains("Active: inactive") {
@@ -196,6 +200,7 @@ var _ = Describe("Podman push", func() {
 	})
 
 	It("podman push to oci-archive", func() {
+		SkipIfRemote("Remote push does not support oci-archive transport")
 		tarfn := filepath.Join(podmanTest.TempDir, "alp.tar")
 		session := podmanTest.Podman([]string{"push", ALPINE,
 			fmt.Sprintf("oci-archive:%s:latest", tarfn)})
@@ -204,6 +209,7 @@ var _ = Describe("Podman push", func() {
 	})
 
 	It("podman push to docker-archive no reference", func() {
+		SkipIfRemote("Remote push does not support docker-archive transport")
 		tarfn := filepath.Join(podmanTest.TempDir, "alp.tar")
 		session := podmanTest.Podman([]string{"push", ALPINE,
 			fmt.Sprintf("docker-archive:%s", tarfn)})
@@ -212,6 +218,7 @@ var _ = Describe("Podman push", func() {
 	})
 
 	It("podman push to oci-archive no reference", func() {
+		SkipIfRemote("Remote push does not support oci-archive transport")
 		ociarc := filepath.Join(podmanTest.TempDir, "alp-oci")
 		session := podmanTest.Podman([]string{"push", ALPINE,
 			fmt.Sprintf("oci-archive:%s", ociarc)})

test/e2e/run_cgroup_parent_test.go

@@ -1,5 +1,3 @@
-// +build !remote
-
 package integration
 
 import (

test/e2e/run_signal_test.go

@@ -1,5 +1,3 @@
-// +build !remote
-
 package integration
 
 import (
@@ -46,6 +44,7 @@ var _ = Describe("Podman run with --sig-proxy", func() {
 	})
 
 	Specify("signals are forwarded to container using sig-proxy", func() {
+		SkipIfRemote("FIXME: This looks like it is supposed to work in remote")
 		if podmanTest.Host.Arch == "ppc64le" {
 			Skip("Doesn't work on ppc64le")
 		}
@@ -111,6 +110,7 @@ var _ = Describe("Podman run with --sig-proxy", func() {
 	})
 
 	Specify("signals are not forwarded to container with sig-proxy false", func() {
+		SkipIfRemote("FIXME: This looks like it is supposed to work in remote")
 		signal := syscall.SIGFPE
 		if rootless.IsRootless() {
 			podmanTest.RestoreArtifact(fedoraMinimal)

test/e2e/trust_test.go

@@ -1,5 +1,3 @@
-// +build !remote
-
 package integration
 
 import (
@@ -21,6 +19,7 @@ var _ = Describe("Podman trust", func() {
 	)
 
 	BeforeEach(func() {
+		SkipIfRemote("podman-remote does not support image trust")
 		tempdir, err = CreateTempDirInTempDir()
 		if err != nil {
 			os.Exit(1)