Skip to content

Commit c037545

Browse files
daniel-hutaosteinliber
authored andcommitted
test: update e2e config according config format refactoring
Signed-off-by: Daniel Hu <tao.hu@merico.dev>
1 parent c61a594 commit c037545

6 files changed

Lines changed: 112 additions & 107 deletions

File tree

test/e2e/yaml/e2e-config.yaml

Lines changed: 69 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,70 @@
1-
varFile: e2e-variables.yaml
2-
toolFile: e2e-tools.yaml
3-
state:
4-
backend: local
1+
config:
2+
state:
3+
backend: local
4+
options:
5+
stateFile: devstream.state
6+
7+
vars:
8+
defaultBranch: main
9+
githubOrganization: devstream-io
10+
repoName: dtm-e2e-go
11+
dockerRegistryUserName: dtme2etest
12+
13+
tools:
14+
- name: repo-scaffolding
15+
instanceID: golang-github
516
options:
6-
stateFile: devstream.state
17+
destinationRepo:
18+
org: [[ githubOrganization ]]
19+
repo: [[ repoName ]]
20+
branch: [[ defaultBranch ]]
21+
repoType: github
22+
vars:
23+
ImageRepo: "[[ dockerRegistryUserName ]]/[[ repoName ]]"
24+
sourceRepo:
25+
org: devstream-io
26+
repo: dtm-scaffolding-golang
27+
repoType: github
28+
- name: githubactions-golang
29+
instanceID: default
30+
dependsOn: ["repo-scaffolding.golang-github"]
31+
options:
32+
org: ${{repo-scaffolding.golang-github.outputs.org}}
33+
repo: ${{repo-scaffolding.golang-github.outputs.repo}}
34+
language:
35+
name: go
36+
version: "1.18"
37+
branch: [[ defaultBranch ]]
38+
build:
39+
enable: True
40+
test:
41+
enable: True
42+
coverage:
43+
enable: True
44+
docker:
45+
enable: True
46+
registry:
47+
type: dockerhub
48+
username: dtme2etest
49+
- name: helm-installer
50+
instanceID: argocd-001
51+
options:
52+
chart:
53+
upgradeCRDs: false
54+
valuesYaml: |
55+
crds:
56+
keep: false
57+
- name: argocdapp
58+
instanceID: default
59+
dependsOn: ["helm-installer.argocd-001", "repo-scaffolding.golang-github"]
60+
options:
61+
app:
62+
name: ${{repo-scaffolding.golang-github.outputs.repo}}
63+
namespace: argocd
64+
destination:
65+
server: https://kubernetes.default.svc
66+
namespace: default
67+
source:
68+
valuefile: values.yaml
69+
path: helm/${{repo-scaffolding.golang-github.outputs.repo}}
70+
repoURL: ${{repo-scaffolding.golang-github.outputs.repoURL}}

test/e2e/yaml/e2e-test-local.yaml

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
1-
---
2-
varFile: ""
3-
toolFile: ""
4-
state:
5-
backend: local
6-
options:
7-
stateFile: devstream.state
8-
---
9-
defaultBranch: main
10-
githubUsername: GITHUBUSERNAME
11-
repoName: dtm-e2e-test-golang
12-
dockerRegistryUserName: DOCKERUSERNAME
13-
argocdNameSpace: argocd-e2e-test
14-
argocdDeployTimeout: 10m
15-
---
1+
config:
2+
state:
3+
backend: local
4+
options:
5+
stateFile: devstream.state
6+
7+
vars:
8+
defaultBranch: main
9+
githubUsername: GITHUBUSERNAME
10+
repoName: dtm-e2e-test-golang
11+
dockerRegistryUserName: DOCKERUSERNAME
12+
argocdNameSpace: argocd-e2e-test
13+
argocdDeployTimeout: 10m
14+
1615
tools:
1716
- name: repo-scaffolding
1817
instanceID: golang-github

test/e2e/yaml/e2e-tools.yaml

Lines changed: 0 additions & 58 deletions
This file was deleted.
Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,30 @@
1-
varFile: e2e-variables.yaml
2-
toolFile: e2e-trello-github-tools.yaml
3-
state:
4-
backend: local
1+
config:
2+
state:
3+
backend: local
4+
options:
5+
stateFile: devstream.state
6+
7+
vars:
8+
githubOrganization: devstream-io
9+
repoName: dtm-e2e-go
10+
kanbanBoardName: dtmKanbanTest
11+
12+
tools:
13+
- name: trello
14+
instanceID: default
15+
dependsOn: [ ]
516
options:
6-
stateFile: devstream.state
17+
org: [[ githubOrganization ]]
18+
repo: [[ repoName ]]
19+
kanbanBoardName: [[ kanbanBoardName ]]
20+
- name: trello-github-integ
21+
instanceID: default
22+
dependsOn: [ "trello.default" ]
23+
options:
24+
org: [[ githubOrganization ]]
25+
repo: [[ repoName ]]
26+
boardId: ${{ trello.default.outputs.boardId }}
27+
todoListId: ${{ trello.default.outputs.todoListId }}
28+
doingListId: ${{ trello.default.outputs.doingListId }}
29+
doneListId: ${{ trello.default.outputs.doneListId }}
30+
branch: main

test/e2e/yaml/e2e-trello-github-tools.yaml

Lines changed: 0 additions & 19 deletions
This file was deleted.

test/e2e/yaml/e2e-variables.yaml

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)