@@ -2030,7 +2030,7 @@ definitions:

     properties:

       PluginSpec:

         type: "object"

-        description: "Invalid when specified with `ContainerSpec`."

+        description: "Invalid when specified with `ContainerSpec`. *(Experimental release only.)*"

         properties:

           Name:

             description: "The name or 'alias' to use for the plugin."

@@ -185,13 +185,17 @@ func (e *executor) Controller(t *api.Task) (exec.Controller, error) {

 		}

 		switch runtimeKind {

 		case string(swarmtypes.RuntimePlugin):

+			info, _ := e.backend.SystemInfo()

+			if !info.ExperimentalBuild {

+				return ctlr, fmt.Errorf("runtime type %q only supported in experimental", swarmtypes.RuntimePlugin)

+			}

 			c, err := plugin.NewController(e.pluginBackend, t)

 			if err != nil {

 				return ctlr, err

 			}

 			ctlr = c

 		default:

-			return ctlr, fmt.Errorf("unsupported runtime type: %q", r.Generic.Kind)

+			return ctlr, fmt.Errorf("unsupported runtime type: %q", runtimeKind)

 		}

 	case *api.TaskSpec_Container:

 		c, err := newController(e.backend, t, dependencyGetter)

@@ -139,9 +139,16 @@ func (c *Cluster) CreateService(s types.ServiceSpec, encodedAuth string, queryRe

 		case *swarmapi.TaskSpec_Generic:

 			switch serviceSpec.Task.GetGeneric().Kind {

 			case string(types.RuntimePlugin):

+				info, _ := c.config.Backend.SystemInfo()

+				if !info.ExperimentalBuild {

+					return fmt.Errorf("runtime type %q only supported in experimental", types.RuntimePlugin)

+				}

 				if s.TaskTemplate.PluginSpec == nil {

 					return errors.New("plugin spec must be set")

 				}

+

+			default:

+				return fmt.Errorf("unsupported runtime type: %q", serviceSpec.Task.GetGeneric().Kind)

 			}

 			r, err := state.controlClient.CreateService(ctx, &swarmapi.CreateServiceRequest{Spec: &serviceSpec})

@@ -603,7 +603,8 @@ func (s *DockerSwarmSuite) TestAPISwarmServicesStateReporting(c *check.C) {

 // Test plugins deployed via swarm services

 func (s *DockerSwarmSuite) TestAPISwarmServicesPlugin(c *check.C) {

-	testRequires(c, DaemonIsLinux, IsAmd64)

+	testRequires(c, ExperimentalDaemon, DaemonIsLinux, IsAmd64)

+

 	reg := setupRegistry(c, false, "", "")

 	defer reg.Close()