diff --git a/analysis/pkg.go b/analysis/pkg.go
index 333cac0..6ee3665 100644
--- a/analysis/pkg.go
+++ b/analysis/pkg.go
@@ -101,7 +101,7 @@ func DumpTags(t *testing.T, tc TC, app api.Application) {
fmt.Printf("## GOT TAGS FOR \"%s\":", tc.Name)
fmt.Printf("\n[]api.Tag{\n")
for _, tag := range tags {
- fmt.Printf(" {Name: \"%s\", Category: api.Ref{Name: \"%s\")},\n", tag.Name, tag.Category.Name)
+ fmt.Printf(" {Name: \"%s\", Category: api.Ref{Name: \"%s\"}},\n", tag.Name, tag.Category.Name)
}
fmt.Printf("}\n")
}
diff --git a/analysis/tc_acmeair_webapp_upload_binary.go b/analysis/tc_acmeair_webapp_upload_binary.go
index 643534b..ad9c858 100644
--- a/analysis/tc_acmeair_webapp_upload_binary.go
+++ b/analysis/tc_acmeair_webapp_upload_binary.go
@@ -6,7 +6,7 @@ import (
"github.com/konveyor/tackle2-hub/api"
)
-var AcmeairWebapp = TC{
+var AcmeairWebappBinary = TC{
Name: "acmeair-webapp",
Application: data.UploadBinary,
Task: Analyze,
diff --git a/analysis/tc_administracion_efectivo_upload_binary.go b/analysis/tc_administracion_efectivo_upload_binary.go
index b3a5309..e5397f5 100644
--- a/analysis/tc_administracion_efectivo_upload_binary.go
+++ b/analysis/tc_administracion_efectivo_upload_binary.go
@@ -6,7 +6,7 @@ import (
"github.com/konveyor/tackle2-hub/api"
)
-var AdministracionEfectivo = TC{
+var AdministracionEfectivoBinary = TC{
Name: "administracion-efectivo",
Application: data.UploadBinary,
Task: Analyze,
diff --git a/analysis/tc_tackle_testapp_public_binary.go b/analysis/tc_tackle_testapp_public_binary.go
index b2ecea9..b939792 100644
--- a/analysis/tc_tackle_testapp_public_binary.go
+++ b/analysis/tc_tackle_testapp_public_binary.go
@@ -9,9 +9,9 @@ import (
var TackleTestappPublicBinary = TC{
Name: "tackle-testapp-binary",
- Application: data.TackleTestappPublic,
+ Application: data.TackleTestappPublicBinary,
Identities: []api.Identity{
- identity.MavenPublic,
+ identity.TackleTestappPublicMaven,
},
Task: Analyze,
Labels: addon.Labels{
@@ -94,6 +94,7 @@ var TackleTestappPublicBinary = TC{
},
},
AnalysisTags: []api.Tag{
+ {Name: "EJB XML", Category: api.Ref{Name: "Bean"}},
{Name: "Servlet", Category: api.Ref{Name: "HTTP"}},
{Name: "JNI", Category: api.Ref{Name: "Other"}},
{Name: "Servlet", Category: api.Ref{Name: "Connect"}},
diff --git a/analysis/tc_tackle_testapp_public_deps.go b/analysis/tc_tackle_testapp_public_deps.go
index e7414e3..a6d3d78 100644
--- a/analysis/tc_tackle_testapp_public_deps.go
+++ b/analysis/tc_tackle_testapp_public_deps.go
@@ -19,7 +19,7 @@ var TackleTestappPublicWithDeps = TC{
},
},
Identities: []api.Identity{
- identity.MavenPublic,
+ identity.TackleTestappPublicMaven,
},
Analysis: api.Analysis{
Effort: 3,
diff --git a/analysis/test_cases.go b/analysis/test_cases.go
index 4277d17..7c043b3 100644
--- a/analysis/test_cases.go
+++ b/analysis/test_cases.go
@@ -5,9 +5,9 @@ package analysis
var Tier0TestCases = []TC{
TackleTestappPublicWithDeps,
TackleTestappPublicPackageFilter,
- AcmeairWebapp,
Tomcat,
- TackleTestappPublicBinary,
+ AcmeairWebappBinary, // Binary upload
+ TackleTestappPublicBinary, // Binary fetched from tackle-testapp-public maven registry
}
// Tier 1 Analysis test cases - should work.
@@ -19,7 +19,7 @@ var Tier1TestCases = []TC{
// Tier 2 Analysis test cases - great if works.
// List of applications with expected analysis outputs.
var Tier2TestCases = []TC{
- AdministracionEfectivo,
+ AdministracionEfectivoBinary, // Bug https://issues.redhat.com/browse/MTA-2606
Daytrader,
PetclinicHazelcast,
ApacheWicket,
diff --git a/data/application.go b/data/application.go
index 3c6844c..67de4c6 100644
--- a/data/application.go
+++ b/data/application.go
@@ -10,6 +10,8 @@ var (
Minimal = api.Application{
Name: "Minimal application",
}
+
+ // Repository-based applications
PathfinderGit = api.Application{
Name: "Pathfinder",
Description: "Tackle Pathfinder application.",
@@ -32,10 +34,6 @@ var (
Kind: "git",
URL: "https://github.com/konveyor/tackle-testapp-public",
},
- Binary: "io.konveyor.demo:customers-tomcat:0.0.1-SNAPSHOT:war",
- }
- UploadBinary = api.Application{
- Name: "upload-binary",
}
CustomerTomcatLegacy = api.Application{
Name: "Customer Tomcat Legacy",
@@ -45,5 +43,15 @@ var (
Path: "example-1",
},
}
- ApplicationSamples = []api.Application{Minimal, PathfinderGit, BookServer, TackleTestappPublic, UploadBinary, CustomerTomcatLegacy}
+
+ // Binary applications
+ TackleTestappPublicBinary = api.Application{
+ Name: "Tackle Testapp public binary",
+ Binary: "mvn://io.konveyor.demo:customers-tomcat:0.0.1-SNAPSHOT:war", // To be downloaded from maven repository
+ }
+ UploadBinary = api.Application{
+ Name: "upload-binary", // The file itself to be uploaded during the test
+ }
+
+ ApplicationSamples = []api.Application{Minimal, PathfinderGit, BookServer, TackleTestappPublic, CustomerTomcatLegacy, TackleTestappPublicBinary, UploadBinary}
)
diff --git a/data/identity/identity.go b/data/identity/identity.go
deleted file mode 100644
index 998a8aa..0000000
--- a/data/identity/identity.go
+++ /dev/null
@@ -1,66 +0,0 @@
-package identity
-
-import (
- "github.com/konveyor/tackle2-hub/api"
- "github.com/konveyor/tackle2-hub/test/api/identity"
-)
-
-// Tackle Testapp public Maven registry expects MAVEN_TESTAPP_USER and MAVEN_TESTAPP_TOKEN env variables.
-// For more information, see: https://github.com/konveyor/tackle-testapp-public?tab=readme-ov-file#building-the-application
-var MavenPublic = identity.Mvn
-
-
-var TackleTestappPrivateMaven = api.Identity{
- Kind: "maven",
- Name: "maven-creds",
- Settings: `
-
-
-
-
-
-
-
-
-
-
-
- tackle-testapp
- GITHUB_USER
- GITHUB_TOKEN
-
-
-
-
- maven-default-http-blocker
- external:http:*
- Pseudo repository to mirror external repositories initially using HTTP.
- http://0.0.0.0/
- true
-
-
-
-
- github
-
-
- central
- https://repo1.maven.org/maven2
-
-
- tackle-testapp
- https://maven.pkg.github.com/konveyor/tackle-testapp
-
- true
-
-
-
-
-
-
- github
-
- `,
-}
diff --git a/data/identity/maven.go b/data/identity/maven.go
new file mode 100644
index 0000000..2434f7c
--- /dev/null
+++ b/data/identity/maven.go
@@ -0,0 +1,115 @@
+package identity
+
+import (
+ "github.com/konveyor/tackle2-hub/api"
+)
+
+var TackleTestappPrivateMaven = api.Identity{
+ Kind: "maven",
+ Name: "maven-creds",
+ Settings: `
+
+
+
+
+
+
+
+
+
+
+
+ tackle-testapp
+ GITHUB_USER
+ GITHUB_TOKEN
+
+
+
+
+ maven-default-http-blocker
+ external:http:*
+ Pseudo repository to mirror external repositories initially using HTTP.
+ http://0.0.0.0/
+ true
+
+
+
+
+ github
+
+
+ central
+ https://repo1.maven.org/maven2
+
+
+ tackle-testapp
+ https://maven.pkg.github.com/konveyor/tackle-testapp
+
+ true
+
+
+
+
+
+
+ github
+
+ `,
+}
+
+var TackleTestappPublicMaven = api.Identity{
+ Kind: "maven",
+ Name: "maven-testapp-public-creds",
+ Settings: `
+
+
+
+
+
+
+
+
+
+
+
+ tackle-testapp-public
+ GITHUB_USER
+ GITHUB_TOKEN
+
+
+
+
+ maven-default-http-blocker
+ external:http:*
+ Pseudo repository to mirror external repositories initially using HTTP.
+ http://0.0.0.0/
+ true
+
+
+
+
+ github
+
+
+ central
+ https://repo1.maven.org/maven2
+
+
+ tackle-testapp-public
+ https://maven.pkg.github.com/konveyor/tackle-testapp-public
+
+ true
+
+
+
+
+
+
+ github
+
+`,
+}