Skip to content

Commit 8098ff5

Browse files
authored
ci/e2e: move docker files of e2e to test/e2e to make code tree more clean (#103)
Signed-off-by: wangbaiping <[email protected]> Signed-off-by: wangbaiping <[email protected]>
1 parent 9c8c738 commit 8098ff5

File tree

8 files changed

+18
-18
lines changed

8 files changed

+18
-18
lines changed

.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
- uses: actions/checkout@v2
4545
- name: Prepare service container
4646
run: |
47-
docker-compose -f docker-compose.e2e.yml up -d
47+
docker-compose -f test/e2e/docker/docker-compose.e2e.yml up -d
4848
- name: Run e2e
4949
run: |
5050
pip3 install --upgrade pip
@@ -58,7 +58,7 @@ jobs:
5858
- uses: actions/checkout@v2
5959
- name: Prepare service container
6060
run: |
61-
docker-compose -f docker-compose.e2e-python.yml up -d
61+
docker-compose -f test/e2e/docker/docker-compose.e2e-python.yml up -d
6262
- name: Run e2e
6363
run: |
6464
pip3 install --upgrade pip
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

docker-compose.e2e-python.yml renamed to test/e2e/docker/docker-compose.e2e-python.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,26 @@ version: "3.7"
22
services:
33
collector:
44
build:
5-
context: .
6-
dockerfile: ./e2e-docker/Dockerfile.tool
5+
context: ../../..
6+
dockerfile: ./test/e2e/docker/Dockerfile.tool
77
ports:
88
- 19876:19876
99
- 12800:12800
1010

1111
consumer:
1212
build:
13-
context: .
14-
dockerfile: ./e2e-docker/Dockerfile.consumer
15-
ports:
13+
context: ../../..
14+
dockerfile: ./test/e2e/docker/Dockerfile.consumer
15+
ports:
1616
- 8080:8080
1717
command: sh -c "GRPC_VERBOSITY=debug /tmp/bazel-bin/test/e2e/e2e_consumer"
1818
depends_on:
1919
- collector
2020

2121
interm:
2222
build:
23-
context: .
24-
dockerfile: ./e2e-docker/Dockerfile.interm
23+
context: ../../..
24+
dockerfile: ./test/e2e/docker/Dockerfile.interm
2525
ports:
2626
- 8082:8082
2727
command: python3 test/e2e/data/interm.py
@@ -31,8 +31,8 @@ services:
3131

3232
provider:
3333
build:
34-
context: .
35-
dockerfile: ./e2e-docker/Dockerfile.provider
34+
context: ../../..
35+
dockerfile: ./test/e2e/docker/Dockerfile.provider
3636
ports:
3737
- 8081:8081
3838
command: sh -c "GRPC_VERBOSITY=debug /tmp/bazel-bin/test/e2e/e2e_provider"

docker-compose.e2e.yml renamed to test/e2e/docker/docker-compose.e2e.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,26 @@ version: "3.7"
22
services:
33
collector:
44
build:
5-
context: .
6-
dockerfile: ./e2e-docker/Dockerfile.tool
5+
context: ../../..
6+
dockerfile: ./test/e2e/docker/Dockerfile.tool
77
ports:
88
- 19876:19876
99
- 12800:12800
1010

1111
consumer:
1212
build:
13-
context: .
14-
dockerfile: ./e2e-docker/Dockerfile.consumer
15-
expose:
13+
context: ../../..
14+
dockerfile: ./test/e2e/docker/Dockerfile.consumer
15+
expose:
1616
- 8080
1717
command: sh -c "GRPC_VERBOSITY=debug /tmp/bazel-bin/test/e2e/e2e_consumer"
1818
depends_on:
1919
- collector
2020

2121
provider:
2222
build:
23-
context: .
24-
dockerfile: ./e2e-docker/Dockerfile.provider
23+
context: ../../..
24+
dockerfile: ./test/e2e/docker/Dockerfile.provider
2525
ports:
2626
- 8081:8081
2727
command: sh -c "GRPC_VERBOSITY=debug /tmp/bazel-bin/test/e2e/e2e_provider"

0 commit comments

Comments
 (0)