diff --git a/pkg/microservice/aslan/core/common/util/workflow.go b/pkg/microservice/aslan/core/common/util/workflow.go index c4be944872..cf0c4835ab 100644 --- a/pkg/microservice/aslan/core/common/util/workflow.go +++ b/pkg/microservice/aslan/core/common/util/workflow.go @@ -57,6 +57,17 @@ func GenerateScanningModuleJobName(name string) string { return strings.ToLower(name) } +func GenerateExecutionModuleJobName(name string) string { + jobName := []rune(strings.ToLower(name)) + if len(jobName) > 32 { + jobName = jobName[:32] + if len(jobName) > 0 && jobName[len(jobName)-1] == '-' { + jobName = jobName[:len(jobName)-1] + } + } + return string(jobName) +} + func ValidateGeneratedWorkflowJobName(name string, generator func(string) string) error { jobName := generator(name) if !workflowJobNameRegx.MatchString(jobName) { diff --git a/pkg/microservice/aslan/core/workflow/testing/service/scanning.go b/pkg/microservice/aslan/core/workflow/testing/service/scanning.go index 4475ce3ceb..cacf7b2b56 100644 --- a/pkg/microservice/aslan/core/workflow/testing/service/scanning.go +++ b/pkg/microservice/aslan/core/workflow/testing/service/scanning.go @@ -543,7 +543,7 @@ func generateCustomWorkflowFromScanningModule(scanInfo *commonmodels.Scanning, a job := make([]*commonmodels.Job, 0) job = append(job, &commonmodels.Job{ - Name: commonutil.GenerateScanningModuleJobName(scanInfo.Name), + Name: commonutil.GenerateExecutionModuleJobName(scanInfo.Name), JobType: config.JobZadigScanning, Skipped: false, Spec: &commonmodels.ZadigScanningJobSpec{ diff --git a/pkg/microservice/aslan/core/workflow/testing/service/test_task.go b/pkg/microservice/aslan/core/workflow/testing/service/test_task.go index c2e84b1b27..0736dc34c9 100644 --- a/pkg/microservice/aslan/core/workflow/testing/service/test_task.go +++ b/pkg/microservice/aslan/core/workflow/testing/service/test_task.go @@ -340,7 +340,7 @@ func generateCustomWorkflowFromTestingModule(testInfo *commonmodels.Testing, arg job := make([]*commonmodels.Job, 0) job = append(job, &commonmodels.Job{ - Name: util.GenerateTestingModuleJobName(testInfo.Name), + Name: util.GenerateExecutionModuleJobName(testInfo.Name), JobType: config.JobZadigTesting, Skipped: false, Spec: &commonmodels.ZadigTestingJobSpec{