Skip to content

Commit 4b5e015

Browse files
committed
refactor: replace all config in staging
Signed-off-by: Meng JiaFeng <[email protected]>
1 parent 2893353 commit 4b5e015

File tree

38 files changed

+15
-15
lines changed

38 files changed

+15
-15
lines changed

internal/pkg/configmanager/configmanager_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ pipelineTemplates:
144144
},
145145
},
146146
"branch": "main",
147-
"configLocation": "https://raw.githubusercontent.com/devstream-io/ci-template/main/github-actions/workflows/main.yml",
147+
"configLocation": "https://raw.githubusercontent.com/devstream-io/dtm-pipeline-templates/main/github-actions/workflows/main.yml",
148148
},
149149
"scm": RawOptions{
150150
"apiURL": "gitlab.com/some/path/to/your/api",

internal/pkg/configmanager/pipelineDefault.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ type pipelineOption struct {
2323
var (
2424
// github actions pipeline options
2525
githubGeneral = pipelineOption{
26-
defaultConfigLocation: "https://raw.githubusercontent.com/devstream-io/ci-template/main/github-actions/workflows/main.yml",
26+
defaultConfigLocation: "https://raw.githubusercontent.com/devstream-io/dtm-pipeline-templates/main/github-actions/workflows/main.yml",
2727
optionGeneratorFunc: pipelineGeneralGenerator,
2828
}
2929
gitlabGeneral = pipelineOption{
30-
defaultConfigLocation: "https://raw.githubusercontent.com/devstream-io/ci-template/main/gitlab-ci/.gitlab-ci.yml",
30+
defaultConfigLocation: "https://raw.githubusercontent.com/devstream-io/dtm-pipeline-templates/main/gitlab-ci/.gitlab-ci.yml",
3131
optionGeneratorFunc: pipelineGeneralGenerator,
3232
}
3333
jenkinsGeneral = pipelineOption{
34-
defaultConfigLocation: "https://raw.githubusercontent.com/devstream-io/ci-template/main/jenkins-pipeline/general/Jenkinsfile",
34+
defaultConfigLocation: "https://raw.githubusercontent.com/devstream-io/dtm-pipeline-templates/main/jenkins-pipeline/general/Jenkinsfile",
3535
optionGeneratorFunc: jenkinsGenerator,
3636
}
3737
argocdApp = pipelineOption{

internal/pkg/configmanager/pipelinetemplate_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ var _ = Describe("PipelineTemplate struct", func() {
231231
Options: RawOptions{
232232
"pipeline": RawOptions{
233233
"test": "testV",
234-
"configLocation": "https://raw.githubusercontent.com/devstream-io/ci-template/main/github-actions/workflows/main.yml",
234+
"configLocation": "https://raw.githubusercontent.com/devstream-io/dtm-pipeline-templates/main/github-actions/workflows/main.yml",
235235
},
236236
"scm": RawOptions{
237237
"url": git.ScmURL(cloneURL),

internal/pkg/plugin/argocdapp/argocdapp.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func pushArgocdConfigFiles(rawOptions configmanager.RawOptions) error {
3838
}
3939

4040
// 3. get argocd configFiles from remote
41-
const configLocation = downloader.ResourceLocation("https://github.com/devstream-io/ci-template.git//argocdapp/helm")
41+
const configLocation = downloader.ResourceLocation("https://github.com/devstream-io/dtm-pipeline-templates.git//argocdapp/helm")
4242
gitFiles, err := opts.getArgocdDefaultConfigFiles(configLocation)
4343
if err != nil {
4444
return err

internal/pkg/plugin/gitlabci/generic/generic.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ func repoScaffoldShareLib(repoInfo *git.RepoInfo) error {
5454
repoScaffoldOptions := configmanager.RawOptions{
5555
"sourceRepo": map[string]interface{}{
5656
"owner": "devstream-io",
57-
"repo": "gitlab-ci-library",
57+
"repo": "dtm-gitlab-share-library",
5858
"repoType": "github",
5959
},
6060
"destinationRepo": map[string]interface{}{

pkg/util/jenkins/tpl/repo-casc.tpl.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ unclassified:
3939
scm:
4040
git:
4141
id: "56904e9b-d14b-4932-b3b3-21bc11c2cb86"
42-
remote: "https://github.com/devstream-io/jenkins-share-library.git"
42+
remote: "https://github.com/devstream-io/dtm-jenkins-share-library.git"
4343
traits:
4444
- "gitBranchDiscovery"
4545
[[- end ]]

staging/gitlab-share-library/README.md renamed to staging/dtm-gitlab-share-library/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# gitlab-share-library
1+
# dtm-gitlab-share-library
22

33
This repo contains share library used by DevStream plugin "gitlab-ci" (thereafter: the plugin). It currently has the following functions:
44
- send notification to dingtalk when pipeline result is success or failed.
@@ -13,5 +13,5 @@ This repo contains share library used by DevStream plugin "gitlab-ci" (thereafte
1313

1414
## Where does this repo come from?
1515

16-
`gitlab-share-library` is synced from https://github.com/devstream-io/devstream/blob/main/staging/gitlab-share-library.
16+
`dtm-gitlab-share-library` is synced from https://github.com/devstream-io/devstream/blob/main/staging/dtm-gitlab-share-library.
1717
Code changes are made in that location, merged into `devstream-io/devstream` and later synced here.
File renamed without changes.
File renamed without changes.

staging/jenkins-share-library/README.md renamed to staging/dtm-jenkins-share-library/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# jenkins-share-library
1+
# dtm-jenkins-share-library
22

33
This repo contains share library used by DevStream plugin "jenkins-pipeline" (thereafter: the plugin). It currently has the following functions:
44
- send notification to dingtalk when pipeline result is success or failed.
@@ -52,5 +52,5 @@ runPipeline([
5252

5353
## Where does this repo come from?
5454

55-
`jenkins-share-library` is synced from https://github.com/devstream-io/devstream/blob/main/staging/jenkins-share-library.
55+
`dtm-jenkins-share-library` is synced from https://github.com/devstream-io/devstream/blob/main/staging/dtm-jenkins-share-library.
5656
Code changes are made in that location, merged into `devstream-io/devstream` and later synced here.

0 commit comments

Comments
 (0)