Browse Source

优化dvc测试

dev-check
chenzhihang 9 months ago
parent
commit
e8cfaaea05
1 changed files with 5 additions and 4 deletions
  1. +5
    -4
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewDatasetServiceImpl.java

+ 5
- 4
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewDatasetServiceImpl.java View File

@@ -144,7 +144,7 @@ public class NewDatasetServiceImpl implements NewDatasetService {
// 得到项目地址 // 得到项目地址
String projectUrl = gitCloneEndpoint + "/" + owner + "/" + repositoryName + ".git"; String projectUrl = gitCloneEndpoint + "/" + owner + "/" + repositoryName + ".git";


// 创建master分支
// 创建master分支
dvcUtils.gitClone(localPath, projectUrl, "master", gitLinkUsername, gitLinkPassword); dvcUtils.gitClone(localPath, projectUrl, "master", gitLinkUsername, gitLinkPassword);
// 拼接生产的元数据后写入yaml文件 // 拼接生产的元数据后写入yaml文件
datasetVo.setCreateBy(String.valueOf(StringUtils.isNotEmpty((String) userInfo.get("nickname")) ? userInfo.get("nickname") : userInfo.get("login"))); datasetVo.setCreateBy(String.valueOf(StringUtils.isNotEmpty((String) userInfo.get("nickname")) ? userInfo.get("nickname") : userInfo.get("login")));
@@ -174,7 +174,7 @@ public class NewDatasetServiceImpl implements NewDatasetService {


// 创建分支 // 创建分支
String branchName = datasetVo.getVersion(); String branchName = datasetVo.getVersion();
gitService.createBranch(token, owner, repositoryName, branchName, "master");
// gitService.createBranch(token, owner, repositoryName, branchName, "master");


// 得到用户操作的路径 // 得到用户操作的路径
String sourcePath = datasetVo.getDatasetVersionVos().get(0).getUrl(); String sourcePath = datasetVo.getDatasetVersionVos().get(0).getUrl();
@@ -183,7 +183,9 @@ public class NewDatasetServiceImpl implements NewDatasetService {
String datasetPath1 = localPath1 + "/dataset"; String datasetPath1 = localPath1 + "/dataset";


// 命令行操作 git clone 项目地址 // 命令行操作 git clone 项目地址
dvcUtils.gitClone(localPath1, projectUrl, branchName, gitLinkUsername, gitLinkPassword);
dvcUtils.gitClone(localPath1, projectUrl, "master", gitLinkUsername, gitLinkPassword);
dvcUtils.refreshRemoteBranches(localPath1, gitLinkUsername, gitLinkPassword, "master");

String s3Path1 = bucketName + "/mini-model-management-platform-files" + "/" + relatePath1; String s3Path1 = bucketName + "/mini-model-management-platform-files" + "/" + relatePath1;
//删掉已存在文件夹 //删掉已存在文件夹
dvcUtils.deleteDirectory(datasetPath1); dvcUtils.deleteDirectory(datasetPath1);
@@ -201,7 +203,6 @@ public class NewDatasetServiceImpl implements NewDatasetService {


CompletableFuture.supplyAsync(() -> { CompletableFuture.supplyAsync(() -> {
try { try {
dvcUtils.dvcInit(localPath1);
// 配置远程S3地址 // 配置远程S3地址
dvcUtils.dvcRemoteAdd(localPath1, s3Path1); dvcUtils.dvcRemoteAdd(localPath1, s3Path1);
dvcUtils.dvcConfigS3Credentials(localPath1, endpoint); dvcUtils.dvcConfigS3Credentials(localPath1, endpoint);


Loading…
Cancel
Save