Merge branch 'V20211115' into liuzx_trainjob

routers/repo/cloudbrain.go

@@ -200,7 +200,7 @@ func CloudBrainCreate(ctx *context.Context, form auth.CreateCloudBrainForm) {
 	command := form.Command
 	uuid := form.Attachment
 	jobType := form.JobType
-	gpuQueue := setting.JobType
+	gpuQueue := form.GpuType
 	codePath := setting.JobPath + jobName + cloudbrain.CodeMountPath
 	resourceSpecId := form.ResourceSpecId
 
@@ -243,7 +243,6 @@ func CloudBrainCreate(ctx *context.Context, form auth.CreateCloudBrainForm) {
 
 	benchmarkPath := setting.JobPath + jobName + cloudbrain.BenchMarkMountPath
 	if setting.IsBenchmarkEnabled && jobType == string(models.JobTypeBenchmark) {
-		gpuQueue = form.GpuType
 		var gpuType string
 		for _, gpuInfo := range gpuInfos.GpuInfo {
 			if gpuInfo.Queue == gpuQueue {

templates/repo/cloudbrain/new.tmpl

@@ -165,7 +165,7 @@
                     </div>
                     <input  id="store_category" type="hidden" name="get_benchmark_category">
 
-                    <div class="inline required field cloudbrain_benchmark">
+                    <div class="inline required field">
                         <label>GPU类型</label>
                         <select id="cloudbrain_gpu_type" class="ui search dropdown" placeholder="选择GPU类型" style='width:385px' name="gpu_type">
                             {{range .gpu_types}}