Skip to content

Commit

Permalink
fix: replaced mysql57 hosts with mysql80 (#33147)
Browse files Browse the repository at this point in the history
  • Loading branch information
zubairshakoorarbisoft authored Oct 4, 2023
1 parent e7f6d1c commit 70f6f5a
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docker-compose.yml.mysqldbdump
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: '3'
services:
mysql:
image: mysql:5.7
container_name: edx.devstack.mysql57
container_name: edx.devstack.mysql80
ports:
- '3306:3306'
environment:
Expand Down
4 changes: 2 additions & 2 deletions cms/envs/bok_choy_docker.auth.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@
"DATABASES": {
"default": {
"ENGINE": "django.db.backends.mysql",
"HOST": "edx.devstack.mysql57",
"HOST": "edx.devstack.mysql80",
"NAME": "edxtest",
"PASSWORD": "",
"PORT": "3306",
"USER": "root"
},
"student_module_history": {
"ENGINE": "django.db.backends.mysql",
"HOST": "edx.devstack.mysql57",
"HOST": "edx.devstack.mysql80",
"NAME": "student_module_history_test",
"PASSWORD": "",
"PORT": "3306",
Expand Down
4 changes: 2 additions & 2 deletions cms/envs/bok_choy_docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,9 @@ CONTENTSTORE:
host: [edx.devstack.mongo]
port: 27017
DATABASES:
default: {ENGINE: django.db.backends.mysql, HOST: edx.devstack.mysql57, NAME: edxtest,
default: {ENGINE: django.db.backends.mysql, HOST: edx.devstack.mysql80, NAME: edxtest,
PASSWORD: '', PORT: '3306', USER: root}
student_module_history: {ENGINE: django.db.backends.mysql, HOST: edx.devstack.mysql57,
student_module_history: {ENGINE: django.db.backends.mysql, HOST: edx.devstack.mysql80,
NAME: student_module_history_test, PASSWORD: '', PORT: '3306', USER: root}
DEFAULT_FEEDBACK_EMAIL: [email protected]
DEFAULT_FROM_EMAIL: [email protected]
Expand Down
6 changes: 3 additions & 3 deletions cms/envs/devstack-experimental.yml
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ DATABASES:
ATOMIC_REQUESTS: true
CONN_MAX_AGE: 0
ENGINE: django.db.backends.mysql
HOST: edx.devstack.mysql57
HOST: edx.devstack.mysql80
NAME: edxapp
OPTIONS:
isolation_level: read committed
Expand All @@ -218,7 +218,7 @@ DATABASES:
read_replica:
CONN_MAX_AGE: 0
ENGINE: django.db.backends.mysql
HOST: edx.devstack.mysql57
HOST: edx.devstack.mysql80
NAME: edxapp
OPTIONS:
isolation_level: read committed
Expand All @@ -228,7 +228,7 @@ DATABASES:
student_module_history:
CONN_MAX_AGE: 0
ENGINE: django.db.backends.mysql
HOST: edx.devstack.mysql57
HOST: edx.devstack.mysql80
NAME: edxapp_csmh
OPTIONS:
isolation_level: read committed
Expand Down
4 changes: 2 additions & 2 deletions lms/envs/bok_choy_docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,9 @@ CONTENTSTORE:
host: [edx.devstack.mongo]
port: 27017
DATABASES:
default: {ENGINE: django.db.backends.mysql, HOST: edx.devstack.mysql57, NAME: edxtest,
default: {ENGINE: django.db.backends.mysql, HOST: edx.devstack.mysql80, NAME: edxtest,
PASSWORD: '', PORT: '3306', USER: root}
student_module_history: {ENGINE: django.db.backends.mysql, HOST: edx.devstack.mysql57,
student_module_history: {ENGINE: django.db.backends.mysql, HOST: edx.devstack.mysql80,
NAME: student_module_history_test, PASSWORD: '', PORT: '3306', USER: root}
DEFAULT_FEEDBACK_EMAIL: [email protected]
DEFAULT_FROM_EMAIL: [email protected]
Expand Down
6 changes: 3 additions & 3 deletions lms/envs/devstack-experimental.yml
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ DATABASES:
ATOMIC_REQUESTS: true
CONN_MAX_AGE: 0
ENGINE: django.db.backends.mysql
HOST: edx.devstack.mysql57
HOST: edx.devstack.mysql80
NAME: edxapp
OPTIONS:
isolation_level: read committed
Expand All @@ -238,7 +238,7 @@ DATABASES:
read_replica:
CONN_MAX_AGE: 0
ENGINE: django.db.backends.mysql
HOST: edx.devstack.mysql57
HOST: edx.devstack.mysql80
NAME: edxapp
OPTIONS:
isolation_level: read committed
Expand All @@ -248,7 +248,7 @@ DATABASES:
student_module_history:
CONN_MAX_AGE: 0
ENGINE: django.db.backends.mysql
HOST: edx.devstack.mysql57
HOST: edx.devstack.mysql80
NAME: edxapp_csmh
OPTIONS:
isolation_level: read committed
Expand Down
2 changes: 1 addition & 1 deletion scripts/reset-test-db.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ if [[ -z "$BOK_CHOY_HOSTNAME" ]]; then
MYSQL_HOST=""
SETTINGS="bok_choy"
else
MYSQL_HOST="--host=edx.devstack.mysql57"
MYSQL_HOST="--host=edx.devstack.mysql80"
SETTINGS="bok_choy_docker"
fi

Expand Down

0 comments on commit 70f6f5a

Please sign in to comment.