iTest: move generated artifacts into out/

Signed-off-by: Marcus Brandenburger <bur@zurich.ibm.com>

Author: mbrandenburger

.gitignore

@@ -5,8 +5,6 @@
 *.iml
 
 # ignoring all generated artifacts in integration tests
-integration/**/testdata/
-integration/**/cmd/
-!integration/nwo/cmd/
+integration/**/out/
 
 cmd/fsccli/cmd

Makefile

@@ -157,8 +157,7 @@ clean: $(addprefix clean-,$(INTEGRATION_TARGETS)) ## Clean generated testdata
 	rm -rf ./cmd/fsccli/cmd
 
 $(addprefix clean-,$(INTEGRATION_TARGETS)) : clean-%:
-	rm -rf ./integration/$(firstword $(subst -, ,$*))/$(subst $(firstword $(subst -, ,$*))-,,$*)/cmd
-	rm -rf ./integration/$(firstword $(subst -, ,$*))/$(subst $(firstword $(subst -, ,$*))-,,$*)/testdata
+	rm -rf ./integration/$(firstword $(subst -, ,$*))/$(subst $(firstword $(subst -, ,$*))-,,$*)/out
 
 .PHONY: tidy
 tidy: ## Run go mod tidy everywhere

integration/fabric/atsachaincode/atsa_test.go

@@ -41,7 +41,7 @@ type TestSuite struct {
 
 func NewTestSuite(commType fsc.P2PCommunicationType, nodeOpts *integration.ReplicationOptions) *TestSuite {
 	return &TestSuite{integration.NewTestSuite(func() (*integration.Infrastructure, error) {
-		return integration.GenerateAt(StartPort(), "testdata", integration.WithRaceDetection, atsa.Topology(&fabricsdk.SDK{}, commType, nodeOpts)...)
+		return integration.GenerateAt(StartPort(), "out/testdata", integration.WithRaceDetection, atsa.Topology(&fabricsdk.SDK{}, commType, nodeOpts)...)
 	})}
 }
 

integration/fabricx/iou/.gitignore

@@ -1,2 +1,2 @@
-cmd
+out
 my-topo

integration/nwo/cmd/artifactgen/gen.go

@@ -56,7 +56,7 @@ func NewCmd() *cobra.Command {
 	}
 	flags := genCmd.Flags()
 	flags.StringVarP(&topologyFile, "topology", "t", "", "topology file in yaml format")
-	flags.StringVarP(&output, "output", "o", "./testdata", "output folder")
+	flags.StringVarP(&output, "output", "o", "./out/testdata", "output folder")
 	flags.IntVarP(&port, "port", "p", 20000, "host starting port")
 
 	rootCommand.AddCommand(

integration/nwo/fsc/fsc.go

@@ -714,7 +714,7 @@ func (p *Platform) NodeCmdDir(peer *node2.Replica) string {
 	wd, err := os.Getwd()
 	gomega.Expect(err).ToNot(gomega.HaveOccurred())
 
-	return filepath.Join(wd, "cmd", peer.Name)
+	return filepath.Join(wd, "out", "cmd", peer.Name)
 }
 
 func (p *Platform) NodeCmdPackage(peer *node2.Replica) string {
@@ -727,11 +727,11 @@ func (p *Platform) NodeCmdPackage(peer *node2.Replica) string {
 	// both can be built from these paths
 	if withoutGoPath := strings.TrimPrefix(wd, filepath.Join(gopath, "src")); withoutGoPath != wd {
 		return strings.TrimPrefix(
-			filepath.Join(withoutGoPath, "cmd", peer.Name),
+			filepath.Join(withoutGoPath, "out", "cmd", peer.Name),
 			string(filepath.Separator),
 		)
 	}
-	return filepath.Join(wd, "cmd", peer.Name)
+	return filepath.Join(wd, "out", "cmd", peer.Name)
 }
 
 func (p *Platform) NodeCmdPath(peer *node2.Replica) string {