Merge pull request #11078 from wallyworld/merge-2.7-20200107

#11078

## Description of change

Merge 2.7 with these commits:

#11068 update juju/os dependency for focal support
#11070 fix intermittent TestListAll() failure in axctions

## QA steps

See individual PRs

Gopkg.toml

@@ -91,7 +91,7 @@
   name = "github.com/juju/naturalsort"
 
 [[constraint]]
-  revision = "44115a59837dd6cddf93ee4cfb51e48c7ba8bb73"
+  revision = "a3d14ebcfc135bea4a3e437176f2ddb50c6ffad4"
   name = "github.com/juju/os"
 
 [[constraint]]

apiserver/facades/client/action/action_test.go

@@ -6,6 +6,7 @@ package action_test
 import (
 	"encoding/json"
 	"fmt"
+	"sort"
 	"testing"
 	"time"
 
@@ -808,7 +809,16 @@ func stringify(r params.ActionResult) string {
 	if a == nil {
 		a = &params.Action{}
 	}
-	return fmt.Sprintf("%s-%s-%#v-%s-%s-%#v", a.Tag, a.Name, a.Parameters, r.Status, r.Message, r.Output)
+	// Convert action output map to ordered result.
+	var keys, orderedOut []string
+	for k := range r.Output {
+		keys = append(keys, k)
+	}
+	sort.Strings(keys)
+	for _, k := range keys {
+		orderedOut = append(orderedOut, fmt.Sprintf("%v=%v", k, r.Output[k]))
+	}
+	return fmt.Sprintf("%s-%s-%#v-%s-%s-%v", a.Tag, a.Name, a.Parameters, r.Status, r.Message, orderedOut)
 }
 
 func (s *actionSuite) toSupportNewActionID(c *gc.C) {

cmd/juju/commands/bootstrap.go

@@ -105,7 +105,7 @@ supplying a series argument to '--bootstrap-series'.
 An error is emitted if the determined series is not supported. Using the
 '--force' option to override this check:
 
-	juju bootstrap --bootstrap-series=eoan --force
+	juju bootstrap --bootstrap-series=focal --force
 
 Private clouds may need to specify their own custom image metadata and
 tools/agent. Use '--metadata-source' whose value is a local directory.

environs/testing/tools.go

@@ -32,7 +32,13 @@ import (
 )
 
 // toolsltsseries records the known ubuntu lts series.
-var toolsLtsSeries = series.SupportedLts()
+var toolsLtsSeries = supportedJujuSeries()
+
+func supportedJujuSeries() []string {
+	supportedJujuSeries := set.NewStrings(series.SupportedJujuControllerSeries()...)
+	esmSupportedJujuSeries := set.NewStrings(series.ESMSupportedJujuSeries()...)
+	return supportedJujuSeries.Union(esmSupportedJujuSeries).Values()
+}
 
 // ToolsFixture is used as a fixture to stub out the default tools URL so we
 // don't hit the real internet during tests.