diff --git a/pkg/microservice/aslan/core/common/service/it_report.go b/pkg/microservice/aslan/core/common/service/it_report.go index 055031b481..9f3a488a7a 100644 --- a/pkg/microservice/aslan/core/common/service/it_report.go +++ b/pkg/microservice/aslan/core/common/service/it_report.go @@ -23,6 +23,7 @@ import ( "fmt" "io/ioutil" "os" + "path" "path/filepath" "strings" @@ -201,6 +202,10 @@ func GetWorkflowV4LocalTestSuite(workflowName, jobName string, taskID int64, log if err != nil { log.Errorf("GetLocalTestSuite GenerateTmpFile err:%v", err) } + + if len(stepSpec.S3Storage.Subfolder) > 0 { + stepSpec.S3DestDir = strings.TrimLeft(path.Join(stepSpec.S3Storage.Subfolder, stepSpec.S3DestDir), "/") + } objectKey := filepath.Join(stepSpec.S3DestDir, stepSpec.FileName) client, err := s3tool.NewClient(s3Storage.Endpoint, s3Storage.Ak, s3Storage.Sk, s3Storage.Region, s3Storage.Insecure, s3Storage.Provider) if err != nil { diff --git a/pkg/microservice/jobexecutor/core/service/step/step_junit_report.go b/pkg/microservice/jobexecutor/core/service/step/step_junit_report.go index 54c60383c6..25052fc585 100644 --- a/pkg/microservice/jobexecutor/core/service/step/step_junit_report.go +++ b/pkg/microservice/jobexecutor/core/service/step/step_junit_report.go @@ -109,7 +109,7 @@ func (s *JunitReportStep) Run(ctx context.Context) error { return err } } - log.Infof("Finish archive %s.", s.spec.FileName) + log.Infof("Finish archive %s to %s.", s.spec.FileName) if results.Failures > 0 || results.Errors > 0 { return fmt.Errorf("%d case(s) failed, %d case(s) error", results.Failures, results.Errors) }