Skip to content

Commit 329a1f0

Browse files
committed
ci/test: Remove dependence on CircleCI default DB naming
Signed-off-by: Ferenc Géczi <[email protected]>
1 parent 44e5c77 commit 329a1f0

File tree

3 files changed

+11
-10
lines changed

3 files changed

+11
-10
lines changed

.circleci/config.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -119,10 +119,11 @@ jobs:
119119
environment:
120120
POSTGRES_USER: root
121121
POSTGRES_PASSWORD: passw0rd
122-
POSTGRES_DB: circle_test
122+
POSTGRES_DB: instana_test_db
123123
- image: cimg/mariadb:10.11.2
124124
environment:
125125
MYSQL_ROOT_PASSWORD: passw0rd
126+
MYSQL_DATABASE: instana_test_db
126127
- image: cimg/redis:5.0.14
127128
- image: rabbitmq:3.9.13
128129
- image: mongo:4.2.3
@@ -147,7 +148,7 @@ jobs:
147148
environment:
148149
POSTGRES_USER: root
149150
POSTGRES_PASSWORD: passw0rd
150-
POSTGRES_DB: circle_test
151+
POSTGRES_DB: instana_test_db
151152
- image: cimg/mariadb:10.11.2
152153
- image: cimg/redis:5.0.14
153154
- image: rabbitmq:3.9.13
@@ -172,7 +173,7 @@ jobs:
172173
environment:
173174
POSTGRES_USER: root
174175
POSTGRES_PASSWORD: passw0rd
175-
POSTGRES_DB: circle_test
176+
POSTGRES_DB: instana_test_db
176177
- image: cimg/mariadb:10.11.2
177178
- image: cimg/redis:5.0.14
178179
- image: rabbitmq:3.9.13
@@ -197,7 +198,7 @@ jobs:
197198
environment:
198199
POSTGRES_USER: root
199200
POSTGRES_PASSWORD: passw0rd
200-
POSTGRES_DB: circle_test
201+
POSTGRES_DB: instana_test_db
201202
- image: cimg/mariadb:10.11.2
202203
- image: cimg/redis:5.0.14
203204
- image: rabbitmq:3.9.13
@@ -223,7 +224,7 @@ jobs:
223224
environment:
224225
POSTGRES_USER: root
225226
POSTGRES_PASSWORD: passw0rd
226-
POSTGRES_DB: circle_test
227+
POSTGRES_DB: instana_test_db
227228
- image: cimg/mariadb:10.11.2
228229
- image: cimg/redis:5.0.14
229230
- image: rabbitmq:3.9.13
@@ -249,7 +250,7 @@ jobs:
249250
environment:
250251
POSTGRES_USER: root
251252
POSTGRES_PASSWORD: passw0rd
252-
POSTGRES_DB: circle_test
253+
POSTGRES_DB: instana_test_db
253254
- image: cimg/mariadb:10.11.2
254255
- image: cimg/redis:5.0.14
255256
- image: rabbitmq:3.9.13

docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ services:
2525
ports:
2626
- 3306:3306
2727
environment:
28-
MYSQL_DATABASE: 'circle_test'
28+
MYSQL_DATABASE: 'instana_test_db'
2929
MYSQL_USER: 'root'
3030
MYSQL_ROOT_PASSWORD: passw0rd
3131
MYSQL_ROOT_HOST: '%'
@@ -44,7 +44,7 @@ services:
4444
environment:
4545
POSTGRES_USER: root
4646
POSTGRES_PASSWORD: passw0rd
47-
POSTGRES_DB: circle_test
47+
POSTGRES_DB: instana_test_db
4848

4949
rabbitmq:
5050
image: docker.io/library/rabbitmq

tests/helpers.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
testenv['mysql_host'] = '127.0.0.1'
3030

3131
testenv['mysql_port'] = int(os.environ.get('MYSQL_PORT', '3306'))
32-
testenv['mysql_db'] = os.environ.get('MYSQL_DB', 'circle_test')
32+
testenv['mysql_db'] = os.environ.get('MYSQL_DATABASE', 'instana_test_db')
3333
testenv['mysql_user'] = os.environ.get('MYSQL_USER', 'root')
3434
testenv['mysql_pw'] = os.environ.get('MYSQL_ROOT_PASSWORD', 'passw0rd')
3535

@@ -38,7 +38,7 @@
3838
"""
3939
testenv['postgresql_host'] = os.environ.get('POSTGRES_HOST', '127.0.0.1')
4040
testenv['postgresql_port'] = int(os.environ.get('POSTGRES_PORT', '5432'))
41-
testenv['postgresql_db'] = os.environ.get('POSTGRES_DB', 'circle_test')
41+
testenv['postgresql_db'] = os.environ.get('POSTGRES_DB', 'instana_test_db')
4242
testenv['postgresql_user'] = os.environ.get('POSTGRES_USER', 'root')
4343
testenv['postgresql_pw'] = os.environ.get('POSTGRES_PW', 'passw0rd')
4444

0 commit comments

Comments
 (0)