Skip to content

Commit d0b0eb5

Browse files
authored
chore: migrate tests docker images from circleci to official (open-telemetry#1230)
* chore: migrate tests docker images from circleci to official * fix: add password for pg docker for tests * chore: downgrade mysql docker tag * chore: remove circle prefix from db name * chore: add POSTGRES_PASSWORD env to test for consistency
1 parent f8cabf3 commit d0b0eb5

File tree

4 files changed

+19
-15
lines changed

4 files changed

+19
-15
lines changed

.github/workflows/test-all-versions.yml

+8-6
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ jobs:
4545
--health-start-period 10s
4646
--health-retries 20
4747
mysql:
48-
image: circleci/mysql:5.7
48+
image: mysql:5.7
4949
env:
5050
MYSQL_USER: otel
5151
MYSQL_PASSWORD: secret
52-
MYSQL_DATABASE: circle_database
52+
MYSQL_DATABASE: otel_mysql_database
5353
MYSQL_ROOT_PASSWORD: rootpw
5454
ports:
5555
- 3306:3306
@@ -59,10 +59,11 @@ jobs:
5959
--health-timeout 5s
6060
--health-retries 5
6161
postgres:
62-
image: circleci/postgres:9.6-alpine
62+
image: postgres:15-alpine
6363
env:
6464
POSTGRES_USER: postgres
65-
POSTGRES_DB: circle_database
65+
POSTGRES_DB: otel_pg_database
66+
POSTGRES_PASSWORD: postgres
6667
ports:
6768
- 5432:5432
6869
options: >-
@@ -91,17 +92,18 @@ jobs:
9192
MONGODB_HOST: 127.0.0.1
9293
MONGODB_PORT: 27017
9394
MSSQL_PASSWORD: mssql_passw0rd
94-
MYSQL_DATABASE: circle_database
95+
MYSQL_DATABASE: otel_mysql_database
9596
MYSQL_HOST: localhost
9697
MYSQL_PASSWORD: secret
9798
MYSQL_PORT: 3306
9899
MYSQL_USER: otel
99100
OPENTELEMETRY_REDIS_HOST: localhost
100101
OPENTELEMETRY_REDIS_PORT: 6379
101-
POSTGRES_DB: circle_database
102+
POSTGRES_DB: otel_pg_database
102103
POSTGRES_HOST: localhost
103104
POSTGRES_PORT: 5432
104105
POSTGRES_USER: postgres
106+
POSTGRES_PASSWORD: postgres
105107
RUN_MONGODB_TESTS: 1
106108
RUN_MSSQL_TESTS: 1
107109
RUN_MYSQL_TESTS: 1

.github/workflows/unit-test.yml

+8-6
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ jobs:
4040
--health-start-period 10s
4141
--health-retries 20
4242
mysql:
43-
image: circleci/mysql:5.7
43+
image: mysql:5.7
4444
env:
4545
MYSQL_USER: otel
4646
MYSQL_PASSWORD: secret
47-
MYSQL_DATABASE: circle_database
47+
MYSQL_DATABASE: otel_mysql_database
4848
MYSQL_ROOT_PASSWORD: rootpw
4949
ports:
5050
- 3306:3306
@@ -54,10 +54,11 @@ jobs:
5454
--health-timeout 5s
5555
--health-retries 5
5656
postgres:
57-
image: circleci/postgres:9.6-alpine
57+
image: postgres:15-alpine
5858
env:
5959
POSTGRES_USER: postgres
60-
POSTGRES_DB: circle_database
60+
POSTGRES_DB: otel_pg_database
61+
POSTGRES_PASSWORD: postgres
6162
ports:
6263
- 5432:5432
6364
options: >-
@@ -99,7 +100,7 @@ jobs:
99100
MONGODB_HOST: 127.0.0.1
100101
MONGODB_PORT: 27017
101102
MSSQL_PASSWORD: mssql_passw0rd
102-
MYSQL_DATABASE: circle_database
103+
MYSQL_DATABASE: otel_mysql_database
103104
MYSQL_HOST: localhost
104105
MYSQL_PASSWORD: secret
105106
MYSQL_PORT: 3306
@@ -108,10 +109,11 @@ jobs:
108109
OPENTELEMETRY_MEMCACHED_PORT: 11211
109110
OPENTELEMETRY_REDIS_HOST: localhost
110111
OPENTELEMETRY_REDIS_PORT: 6379
111-
POSTGRES_DB: circle_database
112+
POSTGRES_DB: otel_pg_database
112113
POSTGRES_HOST: localhost
113114
POSTGRES_PORT: 5432
114115
POSTGRES_USER: postgres
116+
POSTGRES_PASSWORD: postgres
115117
NPM_CONFIG_UNSAFE_PERM: true
116118
steps:
117119
- name: Checkout

packages/opentelemetry-test-utils/src/test-utils.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ const dockerRunCmds = {
3838
mssql:
3939
'docker run --rm -d --name otel-mssql -p 1433:1433 -e SA_PASSWORD=mssql_passw0rd -e ACCEPT_EULA=Y mcr.microsoft.com/mssql/server:2017-latest',
4040
mysql:
41-
'docker run --rm -d --name otel-mysql -p 33306:3306 -e MYSQL_ROOT_PASSWORD=rootpw -e MYSQL_DATABASE=test_db -e MYSQL_USER=otel -e MYSQL_PASSWORD=secret circleci/mysql:5.7',
41+
'docker run --rm -d --name otel-mysql -p 33306:3306 -e MYSQL_ROOT_PASSWORD=rootpw -e MYSQL_DATABASE=test_db -e MYSQL_USER=otel -e MYSQL_PASSWORD=secret mysql:5.7',
4242
postgres:
43-
'docker run --rm -d --name otel-postgres -p 54320:5432 -e POSTGRES_PASSWORD=postgres postgres:13-alpine',
43+
'docker run --rm -d --name otel-postgres -p 54320:5432 -e POSTGRES_PASSWORD=postgres postgres:15-alpine',
4444
redis: 'docker run --rm -d --name otel-redis -p 63790:6379 redis:alpine',
4545
};
4646

plugins/node/opentelemetry-instrumentation-mysql2/env

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
export MYSQL_DATABASE=circle_database
1+
export MYSQL_DATABASE=otel_mysql_database
22
export MYSQL_HOST=mysql
33
export MYSQL_PASSWORD=secret
44
export MYSQL_PORT=3306

0 commit comments

Comments
 (0)