Skip to content

Test infra updates #483

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pvital merged 3 commits into from
Dec 18, 2023
Merged

Test infra updates #483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
02a019a
chore: Update pubsub service on docker-compose.yml
pvital Dec 13, 2023
f9ad1d5
chore: Set docker-compose images to latest version
pvital Dec 13, 2023
87c25b9
chore(ci+tests): Set PostgreSQL password.
pvital Dec 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ jobs:
- image: cimg/postgres:9.6.24
environment:
POSTGRES_USER: root
POSTGRES_PASSWORD: ''
POSTGRES_PASSWORD: passw0rd
POSTGRES_DB: circle_test
- image: cimg/mariadb:10.11.2
- image: cimg/redis:5.0.14
Expand All @@ -144,7 +144,7 @@ jobs:
- image: cimg/postgres:9.6.24
environment:
POSTGRES_USER: root
POSTGRES_PASSWORD: ''
POSTGRES_PASSWORD: passw0rd
POSTGRES_DB: circle_test
- image: cimg/mariadb:10.11.2
- image: cimg/redis:5.0.14
Expand All @@ -169,7 +169,7 @@ jobs:
- image: cimg/postgres:9.6.24
environment:
POSTGRES_USER: root
POSTGRES_PASSWORD: ''
POSTGRES_PASSWORD: passw0rd
POSTGRES_DB: circle_test
- image: cimg/mariadb:10.11.2
- image: cimg/redis:5.0.14
Expand All @@ -194,7 +194,7 @@ jobs:
- image: cimg/postgres:9.6.24
environment:
POSTGRES_USER: root
POSTGRES_PASSWORD: ''
POSTGRES_PASSWORD: passw0rd
POSTGRES_DB: circle_test
- image: cimg/mariadb:10.11.2
- image: cimg/redis:5.0.14
Expand All @@ -220,7 +220,7 @@ jobs:
- image: cimg/postgres:9.6.24
environment:
POSTGRES_USER: root
POSTGRES_PASSWORD: ''
POSTGRES_PASSWORD: passw0rd
POSTGRES_DB: circle_test
- image: cimg/mariadb:10.11.2
- image: cimg/redis:5.0.14
Expand All @@ -246,7 +246,7 @@ jobs:
- image: cimg/postgres:9.6.24
environment:
POSTGRES_USER: root
POSTGRES_PASSWORD: ''
POSTGRES_PASSWORD: passw0rd
POSTGRES_DB: circle_test
- image: cimg/mariadb:10.11.2
- image: cimg/redis:5.0.14
Expand Down
23 changes: 13 additions & 10 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
version: '3.8'
services:
redis:
image: redis:5.0.14
image: redis
volumes:
- ./tests/conf/redis.conf:/usr/local/etc/redis/redis.conf:Z
command: redis-server /usr/local/etc/redis/redis.conf
ports:
- "0.0.0.0:6379:6379"

cassandra:
image: cassandra:3.11.5
image: cassandra
ports:
- 9042:9042

Expand All @@ -35,31 +35,34 @@ services:
- ./tests/config/database/mysql/conf.d/mysql.cnf:/etc/mysql/conf.d/mysql.cnf:Z

mongodb:
image: 'mongo:4.2.3'
image: mongo
ports:
- '27017:27017'

postgres:
image: postgres:10.5
image: postgres
ports:
- 5432:5432
environment:
POSTGRES_USER: root
POSTGRES_PASSWORD: ''
POSTGRES_PASSWORD: passw0rd
POSTGRES_DB: circle_test

rabbitmq:
image: rabbitmq:3.9.13-alpine
image: rabbitmq
environment:
- RABBITMQ_NODENAME=rabbit@localhost
ports:
- 5671:5671
- 5672:5672

pubsub:
image: singularities/pubsub-emulator
image: egymgmbh/pubsub-emulator
environment:
- PUBSUB_PROJECT_ID=project-test
- PUBSUB_LISTEN_ADDRESS=0.0.0.0:8432
- PUBSUB_EMULATOR_HOST=0.0.0.0:8085
command:
- test-project
- test-topic
- test-subscription
ports:
- "8432:8432"
- "8085:8085"
2 changes: 1 addition & 1 deletion tests/helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
testenv['postgresql_port'] = int(os.environ.get('POSTGRES_PORT', '5432'))
testenv['postgresql_db'] = os.environ.get('POSTGRES_DB', 'circle_test')
testenv['postgresql_user'] = os.environ.get('POSTGRES_USER', 'root')
testenv['postgresql_pw'] = os.environ.get('POSTGRES_PW', '')
testenv['postgresql_pw'] = os.environ.get('POSTGRES_PW', 'passw0rd')

"""
Redis Environment
Expand Down