plump infra data into tests

test/e2e/runner/main.go

@@ -34,6 +34,7 @@ type CLI struct {
 	testnet  *e2e.Testnet
 	preserve bool
 	infp     infra.Provider
+	ifd      e2e.InfrastructureData
 }
 
 // NewCLI sets up the CLI.
@@ -82,6 +83,7 @@ func NewCLI() *CLI {
 			default:
 				return fmt.Errorf("unknown infrastructure type '%s'", inft)
 			}
+			cli.ifd = ifd
 
 			testnet, err := e2e.LoadTestnet(m, file, ifd)
 			if err != nil {
@@ -166,7 +168,7 @@ func NewCLI() *CLI {
 			if err := Wait(cli.testnet, 5); err != nil { // wait for network to settle before tests
 				return err
 			}
-			if err := Test(cli.testnet); err != nil {
+			if err := Test(cli.testnet, cli.ifd); err != nil {
 				return err
 			}
 			if !cli.preserve {
@@ -271,7 +273,7 @@ func NewCLI() *CLI {
 		Use:   "test",
 		Short: "Runs test cases against a running testnet",
 		RunE: func(cmd *cobra.Command, args []string) error {
-			return Test(cli.testnet)
+			return Test(cli.testnet, cli.ifd)
 		},
 	})
 

test/e2e/runner/test.go

@@ -9,13 +9,23 @@ import (
 )
 
 // Test runs test cases under tests/
-func Test(testnet *e2e.Testnet) error {
+func Test(testnet *e2e.Testnet, ifd e2e.InfrastructureData) error {
 	logger.Info("Running tests in ./tests/...")
 
 	err := os.Setenv("E2E_MANIFEST", testnet.File)
 	if err != nil {
 		return err
 	}
+	if p := ifd.Path(); p != "" {
+		err = os.Setenv("INFRASTRUCTURE_DATA", p)
+		if err != nil {
+			return err
+		}
+	}
+	err = os.Setenv("INFRASTRUCTURE_TYPE", ifd.Provider)
+	if err != nil {
+		return err
+	}
 
 	return exec.CommandVerbose(context.Background(), "go", "test", "-count", "1", "./tests/...")
 }