git

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/domain/service/ProjectDomainService.java

@@ -157,10 +157,12 @@ public class ProjectDomainService {
 
 
             if (DictConstants.USE_GPU.equals(isChoiceGpu)) {
-                String replace16 = replace15.replace("vtd-image", kubernetesConfiguration.getImageVtdGpu());
+//                String replace16 = replace15.replace("vtd-image", kubernetesConfiguration.getImageVtdGpu());
+                String replace16 = replace15.replace("vtd-image", softwarePath);
                 finalYaml = replace16.replace("vtd-command", kubernetesConfiguration.getCommandVtdGpu());
             } else if (DictConstants.NOT_USE_GPU.equals(isChoiceGpu)) {
-                String replace16 = replace15.replace("vtd-image", kubernetesConfiguration.getImageVtdNogpu());
+//                String replace16 = replace15.replace("vtd-image", kubernetesConfiguration.getImageVtdNogpu());
+                String replace16 = replace15.replace("vtd-image", softwarePath);
                 finalYaml = replace16.replace("vtd-command", kubernetesConfiguration.getCommandVtdNogpu());
             } else {
                 throw new RuntimeException("是否使用 gpu：" + isChoiceGpu);
@@ -207,10 +209,12 @@ public class ProjectDomainService {
             if (DictConstants.USE_GPU.equals(isChoiceGpu)) {
                 log.info("k8s参数为：" + kubernetesConfiguration);
                 log.info("yaml模板为：" + replace12);
-                String replace20 = replace19.replace("vtd-image", kubernetesConfiguration.getImageVtdGpu());
+//                String replace20 = replace19.replace("vtd-image", kubernetesConfiguration.getImageVtdGpu());
+                String replace20 = replace19.replace("vtd-image", softwarePath);
                 finalYaml = replace20.replace("vtd-command", kubernetesConfiguration.getCommandVtdCarsimGpu());
             } else if (DictConstants.NOT_USE_GPU.equals(isChoiceGpu)) {
-                String replace20 = replace19.replace("vtd-image", kubernetesConfiguration.getImageVtdNogpu());
+//                String replace20 = replace19.replace("vtd-image", kubernetesConfiguration.getImageVtdNogpu());
+                String replace20 = replace19.replace("vtd-image", softwarePath);
                 finalYaml = replace20.replace("vtd-command", kubernetesConfiguration.getCommandVtdCarsimNogpu());
             } else {
                 throw new RuntimeException("是否使用 gpu：" + isChoiceGpu);