Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert 0.5 #147

Merged
merged 5 commits into from
Jul 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions .github/workflows/nightly-tier0.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
name: Test nightly TIER0

on:
workflow_dispatch:
inputs:
logLevel:
description: 'Log level'
default: 'debug'
schedule:
- cron: '14 1,13 * * *'

Expand Down
12 changes: 6 additions & 6 deletions analysis/analysis_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -211,12 +211,12 @@ func TestApplicationAnalysis(t *testing.T) {
if len(got.Incidents) != len(expected.Incidents) {
t.Errorf("Different amount of incidents error. Got %d, expected %d.", len(got.Incidents), len(expected.Incidents))
missing, unexpected := getIncidentsDiff(expected.Incidents, got.Incidents)
for _, incident := range missing {
for _, incident := range missing {
fmt.Printf("Expected incident not found: %s line %d.\n", incident.File, incident.Line)
}
for _, incident := range unexpected {
}
for _, incident := range unexpected {
fmt.Printf("Unexpected incident found: %s line %d.\n", incident.File, incident.Line)
}
}

} else {
// Ensure stable order of Incidents.
Expand Down Expand Up @@ -288,8 +288,8 @@ func TestApplicationAnalysis(t *testing.T) {

// Check Tags (if specified by TestCase).
if len(tc.AnalysisTags) > 0 {
if len(tc.AnalysisTags) != len(gotTags) {
t.Errorf("Different Tags amount error. Got: %d, expected: %d.\n", len(gotTags), len(tc.AnalysisTags))
if len(tc.AnalysisTags) != len(gotApp.Tags) {
t.Errorf("Different Tags amount error. Got: %d, expected: %d.\n", len(gotApp.Tags), len(tc.AnalysisTags))
notFoundTags, unexpectedTags := getTagsDiff(tc.AnalysisTags, gotTags)
for _, notFoundTag := range notFoundTags {
pp.Println("Expected tag not found", notFoundTag)
Expand Down
3 changes: 2 additions & 1 deletion analysis/analyzer_defaults.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ var Analyze = api.Task{
}

var AnalyzeDataDefault = addon.Data{
Output: "/windup/report",
Mode: addon.Mode{
Artifact: "",
Binary: false,
Expand All @@ -27,7 +28,7 @@ var AnalyzeDataDefault = addon.Data{
Labels: addon.Labels{
Excluded: []string{},
Included: []string{
"konveyor.io/target=cloud-readiness",
"cloud-readiness",
},
},
},
Expand Down
12 changes: 6 additions & 6 deletions analysis/tc_acmeair_webapp_upload_binary.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ var AcmeairWebapp = TC{
Binary: true,
Artifact: "/binary/acmeair-webapp-1.0-SNAPSHOT.war",
Analysis: api.Analysis{
Effort: 13,
Effort: 36,
Issues: []api.Issue{
{
Category: "mandatory",
Expand All @@ -33,7 +33,7 @@ var AcmeairWebapp = TC{
Name: "asm.asm",
Version: "3.3.1",
Provider: "java",
SHA: "1d5f20b4ea675e6fab6ab79f1cd60ec268ddc015",
SHA: "1d5f20b4ea675e6fab6ab79f1cd60ec268ddc015",
Labels: []string{"konveyor.io/dep-source=open-source", "konveyor.io/language=java"},
},
{
Expand Down Expand Up @@ -91,10 +91,10 @@ var AcmeairWebapp = TC{
Labels: []string{"konveyor.io/dep-source=open-source", "konveyor.io/language=java"},
},
{
Provider: "java",
Name: "net.wasdev.wlp.sample.acmeair-services-jpa",
Version: "1.0-SNAPSHOT",
Labels: []string{"konveyor.io/dep-source=open-source", "konveyor.io/language=java"},
Provider: "java",
Name: "net.wasdev.wlp.sample.acmeair-services-jpa",
Version: "1.0-SNAPSHOT",
Labels: []string{"konveyor.io/dep-source=open-source", "konveyor.io/language=java"},
},
{
Name: "cglib.cglib",
Expand Down
2 changes: 1 addition & 1 deletion analysis/tc_tackle_testapp_public_deps.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ var TackleTestappPublicWithDeps = TC{

},
Analysis: api.Analysis{
Effort: 1,
Effort: 2,
Issues: []api.Issue{
{
Category: "mandatory",
Expand Down
Loading
Loading