Skip to content

Commit 5833f38

Browse files
committed
Change taurus and draco boot tests to dynamic mode
1 parent 00fdcb8 commit 5833f38

4 files changed

Lines changed: 46 additions & 19 deletions

File tree

.gitlab/ci/container-boot.gitlab-ci.yml

Lines changed: 25 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,16 @@ container:boot:sagittarius:grpc:
5454
- support/grpc_check_health --host docker:50051 --service liveness --retries 20
5555
- support/grpc_check_health --host docker:50051 --service readiness --retries 20
5656

57+
.container:boot:sagittarius-grpc-preparation:
58+
- bundle install
59+
- docker compose up postgres -d
60+
- docker compose up sagittarius-grpc -d
61+
- docker ps --all
62+
- docker compose logs sagittarius-grpc -f &
63+
- support/grpc_check_health --host docker:50051 --service readiness --retries 20
64+
- >
65+
docker compose exec sagittarius-grpc bin/rails runner 'Runtime.create!(name: "Boot Test Runtime", token: "runtime_token")'
66+
5767
container:boot:aquila:
5868
extends:
5969
- .container:boot
@@ -64,15 +74,8 @@ container:boot:aquila:
6474
variables:
6575
SAGITTARIUS_VARIANT: ce
6676
script:
67-
- bundle install
68-
- docker compose up postgres -d
77+
- !reference [.container:boot:sagittarius-grpc-preparation]
6978
- docker compose up nats -d
70-
- docker compose up sagittarius-grpc -d
71-
- docker ps --all
72-
- docker compose logs sagittarius-grpc -f &
73-
- support/grpc_check_health --host docker:50051 --service readiness --retries 20
74-
- >
75-
docker compose exec sagittarius-grpc bin/rails runner 'Runtime.create!(name: "Boot Test Runtime", token: "runtime_token")'
7679
- docker compose up aquila -d
7780
- docker compose logs aquila -f &
7881
- support/grpc_check_health --host docker:8081 --service liveness --retries 20
@@ -83,10 +86,15 @@ container:boot:taurus:
8386
- .container:boot
8487
needs:
8588
- generate-environment
89+
- manifest:aquila
90+
- manifest:sagittarius
8691
- manifest:taurus
92+
variables:
93+
SAGITTARIUS_VARIANT: ce
8794
script:
88-
- bundle install
95+
- !reference [.container:boot:sagittarius-grpc-preparation]
8996
- docker compose up nats -d
97+
- docker compose up aquila -d
9098
- docker compose up taurus -d
9199
- docker compose logs taurus -f &
92100
- support/grpc_check_health --host docker:8082 --service liveness --retries 20
@@ -97,7 +105,12 @@ container:boot:draco:
97105
- .container:boot
98106
needs:
99107
- generate-environment
108+
- manifest:aquila
109+
- manifest:sagittarius
110+
- manifest:taurus
100111
- manifest:draco
112+
variables:
113+
SAGITTARIUS_VARIANT: ce
101114
parallel:
102115
matrix:
103116
- DRACO_VARIANT:
@@ -107,8 +120,10 @@ container:boot:draco:
107120
- amd64
108121
- arm64
109122
script:
110-
- bundle install
123+
- !reference [.container:boot:sagittarius-grpc-preparation]
111124
- docker compose up nats -d
125+
- docker compose up aquila -d
126+
- docker compose up taurus -d
112127
- docker compose up draco -d
113128
- docker compose logs draco -f &
114129
- support/grpc_check_health --host docker:8083 --service liveness --retries 20

support/config/aquila.actions.json

Lines changed: 0 additions & 8 deletions
This file was deleted.
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"runtimes": [
3+
{
4+
"identifier": "taurus",
5+
"token": "taurus"
6+
},
7+
{
8+
"identifier": "draco",
9+
"token": "draco"
10+
}
11+
]
12+
}

support/docker-compose.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ services:
6262
SAGITTARIUS_URL: http://sagittarius-grpc:50051
6363
RUNTIME_TOKEN: runtime_token
6464
volumes:
65-
- ./config/aquila.actions.json:/action.configuration.json
65+
- ./config/aquila.service.configuration.json:/service.configuration.json
6666
ports:
6767
- "8081:8081"
6868

@@ -71,6 +71,10 @@ services:
7171
networks:
7272
- boot
7373
environment:
74+
MODE: dynamic
75+
AQUILA_URL: 'http://aquila:8081'
76+
AQUILA_TOKEN: taurus
77+
DEFINITION_PATH: '/definitions'
7478
NATS_URL: nats://nats:4222
7579
WITH_HEALTH_SERVICE: "true"
7680
GRPC_HOST: 0.0.0.0
@@ -83,6 +87,10 @@ services:
8387
networks:
8488
- boot
8589
environment:
90+
MODE: dynamic
91+
AQUILA_URL: 'http://aquila:8081'
92+
AQUILA_TOKEN: draco
93+
DEFINITION_PATH: '/definitions'
8694
NATS_URL: nats://nats:4222
8795
WITH_HEALTH_SERVICE: "true"
8896
GRPC_HOST: 0.0.0.0

0 commit comments

Comments
 (0)