Merge pull request #1361 from merico-dev/fix-jenkins-error

fix: jenkins scm default option error

Author: daniel-hutao

internal/pkg/plugin/installer/ci/validate.go

@@ -26,6 +26,10 @@ func SetDefault(ciType server.CIServerType) func(option configmanager.RawOptions
 		if err != nil {
 			return nil, err
 		}
+		// set default value of repoInfo
+		if err := opts.ProjectRepo.SetDefault(); err != nil {
+			return nil, err
+		}
 		opts.CIFileConfig = opts.Pipeline.BuildCIFileConfig(ciType, opts.ProjectRepo)
 		return mapz.DecodeStructToMap(opts)
 	}

internal/pkg/plugin/jenkinspipeline/option.go

@@ -73,9 +73,9 @@ func (j *jobOptions) createOrUpdateJob(jenkinsClient jenkins.JenkinsAPI, secretT
 		SecretToken:       secretToken,
 		FolderName:        j.JobName.getJobFolder(),
 		GitlabConnection:  globalConfig.GitlabConnectionID,
-		RepoURL:           string(repoInfo.CloneURL),
+		RepoURL:           string(repoInfo.GetCloneURL()),
 		RepoOwner:         repoInfo.GetRepoOwner(),
-		RepoName:          repoInfo.Repo,
+		RepoName:          repoInfo.GetRepoName(),
 		RepoCredentialsId: globalConfig.CredentialID,
 	}
 	jobScript, err := jenkins.BuildRenderedScript(jobRenderInfo)

internal/pkg/plugin/jenkinspipeline/validate.go

@@ -20,6 +20,11 @@ func setJenkinsDefault(options configmanager.RawOptions) (configmanager.RawOptio
 		return nil, err
 	}
 
+	// set project default value
+	if err := opts.ProjectRepo.SetDefault(); err != nil {
+		return nil, err
+	}
+
 	// if jenkins is offline, just use offline Jenkinsfile
 	if opts.needOfflineConfig() {
 		opts.CIFileConfig = &cifile.CIFileConfig{