Refactor InstallerURL config passing. (#259)

In order to accommodate unique installers on a per test basis always
treat the InstallerURL from the provisioner as the default and override
it when `installer_url` is specified in the test parameter JSON. This
was previously available for the install test, but is now available for
all tests in the sanity suite.

This is needed to spit the images between upgrade and all other testing
for incremental rollout of new robotest images:
  gravitational/gravity#1908
  gravitational/gravity#1915

Author: wadells

suite/sanity/install.go

@@ -96,12 +96,7 @@ func install(p interface{}) (gravity.TestFunc, error) {
 			g.Maybe("destroy", cluster.Destroy())
 		}()
 
-		installerURL := cfg.InstallerURL
-		if param.InstallerURL != "" {
-			installerURL = param.InstallerURL
-		}
-
-		g.OK("installer downloaded", g.SetInstaller(cluster.Nodes, installerURL, "install"))
+		g.OK("installer downloaded", g.SetInstaller(cluster.Nodes, param.InstallerURL, "install"))
 		if param.Script != nil {
 			g.OK("post bootstrap script",
 				g.ExecScript(cluster.Nodes, param.Script.Url, param.Script.Args, param.Script.Timeout.Duration))
@@ -121,11 +116,6 @@ func provision(p interface{}) (gravity.TestFunc, error) {
 			g.Maybe("destroy", cluster.Destroy())
 		}()
 
-		installerURL := cfg.InstallerURL
-		if param.InstallerURL != "" {
-			installerURL = param.InstallerURL
-		}
-
-		g.OK("download installer", g.SetInstaller(cluster.Nodes, installerURL, "install"))
+		g.OK("download installer", g.SetInstaller(cluster.Nodes, param.InstallerURL, "install"))
 	}, nil
 }

suite/sanity/loss_recover.go

@@ -96,7 +96,7 @@ func lossAndRecovery(p interface{}) (gravity.TestFunc, error) {
 			g.Maybe("destroy", cluster.Destroy())
 		}()
 
-		g.OK("download installer", g.SetInstaller(cluster.Nodes, cfg.InstallerURL, "install"))
+		g.OK("download installer", g.SetInstaller(cluster.Nodes, param.InstallerURL, "install"))
 
 		nodes := cluster.Nodes[0:param.NodeCount]
 		g.OK("install", g.OfflineInstall(nodes, param.InstallParam))

suite/sanity/resize.go

@@ -54,7 +54,7 @@ func resize(p interface{}) (gravity.TestFunc, error) {
 			g.Maybe("destroy", cluster.Destroy())
 		}()
 
-		g.OK("download installer", g.SetInstaller(cluster.Nodes, cfg.InstallerURL, "install"))
+		g.OK("download installer", g.SetInstaller(cluster.Nodes, param.InstallerURL, "install"))
 		g.OK(fmt.Sprintf("install on %d node", param.NodeCount),
 			g.OfflineInstall(cluster.Nodes[:param.NodeCount], param.InstallParam))
 		g.OK("wait for active status", g.WaitForActiveStatus(cluster.Nodes[:param.NodeCount]))

suite/sanity/sanity.go

@@ -22,16 +22,17 @@ import (
 	"github.com/gravitational/robotest/lib/defaults"
 )
 
-var defaultInstallParam = installParam{
-	InstallParam: gravity.InstallParam{
-		StateDir: defaults.GravityDir,
-	},
-}
-
 // Suite returns base configuration for a suite which may be further customized
-func Suite() *config.Config {
+func Suite(provisionerConfig gravity.ProvisionerConfig) *config.Config {
 	cfg := config.New()
 
+	defaultInstallParam := installParam{
+		InstallParam: gravity.InstallParam{
+			InstallerURL: provisionerConfig.InstallerURL,
+			StateDir:     defaults.GravityDir,
+		},
+	}
+
 	cfg.Add("noop", noop, noopParam{})
 	cfg.Add("noopV", noopVariety, noopParam{})
 	cfg.Add("provision", provision, defaultInstallParam)
@@ -40,7 +41,7 @@ func Suite() *config.Config {
 	cfg.Add("recover", lossAndRecovery, lossAndRecoveryParam{installParam: defaultInstallParam})
 	cfg.Add("recoverV", lossAndRecoveryVariety, defaultInstallParam)
 	cfg.Add("shrink", shrink, defaultInstallParam)
-	cfg.Add("upgrade", upgrade, upgradeParam{installParam: defaultInstallParam})
+	cfg.Add("upgrade", upgrade, upgradeParam{installParam: defaultInstallParam, GravityURL: provisionerConfig.GravityURL})
 	// upgrade3lts is vestigial alias for upgrade needed for backwards compat
 	// to prevent issues like:
 	//   https://github.com/gravitational/gravity/issues/1508

suite/sanity/shrink.go

@@ -42,7 +42,7 @@ func shrink(p interface{}) (gravity.TestFunc, error) {
 		copy(others, cluster.Nodes[1:])
 		g.Logger().WithFields(logrus.Fields{"target": target, "others": others}).Info("Select join/shrink target.")
 
-		g.OK("Download installer.", g.SetInstaller(all, cfg.InstallerURL, "install"))
+		g.OK("Download installer.", g.SetInstaller(all, param.InstallerURL, "install"))
 
 		g.OK("Install.", g.OfflineInstall(others, param.InstallParam))
 		g.OK("Wait for active status.", g.WaitForActiveStatus(others))

suite/sanity/upgrade.go

@@ -27,6 +27,7 @@ type upgradeParam struct {
 	installParam
 	// BaseInstallerURL is initial app installer URL
 	BaseInstallerURL string `json:"from" validate:"required"`
+	GravityURL       string `json:"gravity_url"`
 }
 
 func (p upgradeParam) Save() (row map[string]bigquery.Value, insertID string, err error) {
@@ -52,7 +53,7 @@ func upgrade(p interface{}) (gravity.TestFunc, error) {
 		g.OK("base installer", g.SetInstaller(cluster.Nodes, param.BaseInstallerURL, "base"))
 		g.OK("install", g.OfflineInstall(cluster.Nodes, param.InstallParam))
 		g.OK("wait for active status", g.WaitForActiveStatus(cluster.Nodes))
-		g.OK("upgrade", g.Upgrade(cluster.Nodes, cfg.InstallerURL, cfg.GravityURL, "upgrade"))
+		g.OK("upgrade", g.Upgrade(cluster.Nodes, param.InstallerURL, param.GravityURL, "upgrade"))
 		g.OK("wait for active status", g.WaitForActiveStatus(cluster.Nodes))
 	}, nil
 }

suite/suite_test.go

@@ -38,7 +38,7 @@ import (
 )
 
 var testSuite = flag.String("suite", "sanity", "test suite to run")
-var provision = flag.String("provision", "", "cloud credentials in JSON string")
+var provision = flag.String("provision", "", "cloud credentials in YAML string")
 var tag = flag.String("tag", "", "tag to uniquely mark resources in cloud")
 
 var repeat = flag.Int("repeat", 1, "the number of times to schedule each test")
@@ -60,10 +60,6 @@ var versionFlag = flag.Bool("version", false, "Display version information")
 // max amount of time test will run
 var testMaxTime = time.Hour * 12
 
-var suites = map[string]*config.Config{
-	"sanity": sanity.Suite(),
-}
-
 func setupSignals(suite gravity.TestSuite) {
 	c := make(chan os.Signal, 3)
 	signal.Notify(c, syscall.SIGTERM, syscall.SIGHUP, syscall.SIGINT)
@@ -99,8 +95,12 @@ func TestMain(t *testing.T) {
 	log.Debugf("Version:\t%s", robotest.Version)
 	log.Debugf("Git Commit:\t%s", robotest.GitCommit)
 
-	config := gravity.LoadConfig(t, []byte(*provision))
-	config = config.WithTag(*tag)
+	provisionerConfig := gravity.LoadConfig(t, []byte(*provision))
+	provisionerConfig = provisionerConfig.WithTag(*tag)
+
+	suites := map[string]*config.Config{
+		"sanity": sanity.Suite(provisionerConfig),
+	}
 
 	suiteCfg, there := suites[*testSuite]
 	if !there {
@@ -141,7 +141,7 @@ func TestMain(t *testing.T) {
 	for r := 1; r <= *repeat; r++ {
 		for ts, entry := range testSet {
 			suite.Schedule(entry.TestFunc,
-				config.WithTag(fmt.Sprintf("%s-%d", ts, r)),
+				provisionerConfig.WithTag(fmt.Sprintf("%s-%d", ts, r)),
 				entry.Param)
 		}
 	}