Merge branch 'konveyor:main' into main

Makefile

@@ -44,6 +44,7 @@ test-tier2:
 
 # TIER3
 test-tier3:
+	TIER3=1 MAVEN_TESTAPP_USER=$(GITHUB_USER) MAVEN_TESTAPP_TOKEN=$(GITHUB_TOKEN) $(MAKE) test-analysis
 	$(MAKE) test-jira
 	$(MAKE) test-migrationwave
 

analysis/analysis_test.go

@@ -116,9 +116,20 @@ func TestApplicationAnalysis(t *testing.T) {
 			if tc.Scope != nil {
 				taskData.Scope = *tc.Scope
 			}
+
+			taskData.Mode.Artifact = tc.Artifact
 			tc.Task.Data = taskData
 			assert.Should(t, RichClient.Task.Create(&tc.Task))
 
+			if tc.Artifact != "" {
+				// Upload binary file into the bucket
+				bucketContent := RichClient.Bucket.Content(tc.Task.Bucket.ID)
+				bucketContent.Put("data"+tc.Artifact, tc.Artifact)
+			}
+
+			tc.Task.State = "Ready"
+			assert.Should(t, RichClient.Task.Update(&tc.Task))
+
 			// Wait until task finishes
 			var task *api.Task
 			var err error

analysis/analyzer_defaults.go

@@ -6,7 +6,7 @@ import (
 )
 
 var Analyze = api.Task{
-	State: "Ready", // Created / Ready
+	State: "Created", // Created / Ready
 	Data:  defaultAnalyzerData,
 	Addon: "analyzer",
 }

analysis/pkg.go

@@ -46,6 +46,7 @@ type TC struct {
 	Scope    *addon.Scope
 	WithDeps bool
 	Binary bool
+	Artifact string
 	// After-analysis assertions.
 	ReportContent map[string][]string
 	Analysis      api.Analysis

analysis/tc_administracion_efectivo_upload_binary.go

@@ -0,0 +1,63 @@
+package analysis
+
+import (
+	"github.com/konveyor/go-konveyor-tests/data"
+	"github.com/konveyor/go-konveyor-tests/hack/addon"
+	"github.com/konveyor/tackle2-hub/api"
+)
+
+var AdministracionEfectivo = TC{
+	Name:        "administracion-efectivo",
+	Application: data.UploadBinary,
+	Task:        Analyze,
+	Labels: addon.Labels{
+		Included: []string{
+			"konveyor.io/target=cloud-readiness",
+		},
+	},
+	Binary:   true,
+	Artifact: "/binary/administracion_efectivo.ear",
+	Analysis: api.Analysis{
+		Effort: 1591,
+		Issues: []api.Issue{
+			{
+				Category:    "mandatory",
+				Description: "Java native libraries (JNI, JNA)",
+				Effort:      7,
+				RuleSet:     "cloud-readiness",
+				Rule:        "jni-native-code-00000",
+			},
+			{
+				Category:    "mandatory",
+				Description: "File system - Java IO",
+				Effort:      1,
+				RuleSet:     "cloud-readiness",
+				Rule:        "local-storage-00001",
+			},
+			{
+				Category:    "mandatory",
+				Description: "File system - java.net.URL/URI",
+				Effort:      1,
+				RuleSet:     "cloud-readiness",
+				Rule:        "local-storage-00002",
+			},
+		},
+	},
+	AnalysisTags: []api.Tag{
+		{Name: "Servlet", Category: api.Ref{Name: "HTTP"}},
+		{Name: "EAR Deployment", Category: api.Ref{Name: "Other"}},
+		{Name: "JNI", Category: api.Ref{Name: "Other"}},
+		{Name: "Mail", Category: api.Ref{Name: "Other"}},
+		{Name: "Spring Scheduled", Category: api.Ref{Name: "Processing"}},
+		{Name: "Mail", Category: api.Ref{Name: "Connect"}},
+		{Name: "Servlet", Category: api.Ref{Name: "Connect"}},
+		{Name: "EAR Deployment", Category: api.Ref{Name: "Connect"}},
+		{Name: "JNI", Category: api.Ref{Name: "Connect"}},
+		{Name: "JNI", Category: api.Ref{Name: "Java EE"}},
+		{Name: "Servlet", Category: api.Ref{Name: "Java EE"}},
+		{Name: "EAR Deployment", Category: api.Ref{Name: "Java EE"}},
+		{Name: "Mail", Category: api.Ref{Name: "Java EE"}},
+		{Name: "Spring Scheduled", Category: api.Ref{Name: "Embedded"}},
+		{Name: "Spring Scheduled", Category: api.Ref{Name: "Execute"}},
+	},
+}

analysis/test_cases.go

@@ -5,6 +5,7 @@ package analysis
 var Tier0TestCases = []TC{
 	TackleTestappPublicWithDeps,
 	TackleTestappPublicPackageFilter,
+	AdministracionEfectivo,
 }
 
 // Tier 1 Analysis test cases - should work.

data/application_data.go

@@ -34,5 +34,8 @@ var (
 		},
 		Binary: "io.konveyor.demo:customers-tomcat:0.0.1-SNAPSHOT:war",
 	}
-	ApplicationSamples = []api.Application{Minimal, PathfinderGit, BookServer, TackleTestapp}
+	UploadBinary = api.Application {
+		Name: "upload-binary",
+	}
+	ApplicationSamples = []api.Application{Minimal, PathfinderGit, BookServer, TackleTestapp, UploadBinary}
 )