Ejegg has submitted this change and it was merged.
Change subject: Correct mysql client machine name
......................................................................
Correct mysql client machine name
Bug: T86374
Change-Id: I4f326d1d931ae1de3b5356384cc8c7a90e59d5cf
---
M bin/ci-create-dbs.sh
M bin/ci-drop-dbs.sh
M bin/ci-populate-dbs.sh
M bin/ci-settings.sh
4 files changed, 5 insertions(+), 5 deletions(-)
Approvals:
Ejegg: Looks good to me, approved
diff --git a/bin/ci-create-dbs.sh b/bin/ci-create-dbs.sh
index 0f6555e..924ee43 100755
--- a/bin/ci-create-dbs.sh
+++ b/bin/ci-create-dbs.sh
@@ -9,6 +9,6 @@
mysql -u root <<EOS
drop database if exists ${CIVICRM_SCHEMA_PREFIX}${i};
create database ${CIVICRM_SCHEMA_PREFIX}${i};
- grant all on ${CIVICRM_SCHEMA_PREFIX}${i}.* to
'${CIVICRM_MYSQL_USERNAME}'@'${BUILD_HOST}' identified by
'${CIVICRM_MYSQL_PASSWORD}';
+ grant all on ${CIVICRM_SCHEMA_PREFIX}${i}.* to
'${CIVICRM_MYSQL_USERNAME}'@'${CIVICRM_MYSQL_CLIENT}' identified by
'${CIVICRM_MYSQL_PASSWORD}';
EOS
done
diff --git a/bin/ci-drop-dbs.sh b/bin/ci-drop-dbs.sh
index be72fb7..ad1966b 100755
--- a/bin/ci-drop-dbs.sh
+++ b/bin/ci-drop-dbs.sh
@@ -12,6 +12,6 @@
done
mysql -u root <<EOS
-REVOKE ALL PRIVILEGES, GRANT OPTION FROM
'${CIVICRM_MYSQL_USERNAME}'@'${BUILD_HOST}';
-DROP USER '${CIVICRM_MYSQL_USERNAME}'@'${BUILD_HOST}';
+REVOKE ALL PRIVILEGES, GRANT OPTION FROM
'${CIVICRM_MYSQL_USERNAME}'@'${CIVICRM_MYSQL_CLIENT}';
+DROP USER '${CIVICRM_MYSQL_USERNAME}'@'${CIVICRM_MYSQL_CLIENT}';
EOS
diff --git a/bin/ci-populate-dbs.sh b/bin/ci-populate-dbs.sh
index 316df56..22f36d6 100755
--- a/bin/ci-populate-dbs.sh
+++ b/bin/ci-populate-dbs.sh
@@ -5,7 +5,7 @@
echo "Populating databases with the prefix '${CIVICRM_SCHEMA_PREFIX}'"
-export
PRECREATED_DSN_PATTERN="mysql://${CIVICRM_MYSQL_USERNAME}:${CIVICRM_MYSQL_PASSWORD}@${BUILD_HOST}/${CIVICRM_SCHEMA_PREFIX}{{db_seq}}"
+export
PRECREATED_DSN_PATTERN="mysql://${CIVICRM_MYSQL_USERNAME}:${CIVICRM_MYSQL_PASSWORD}@${CIVICRM_MYSQL_CLIENT}/${CIVICRM_SCHEMA_PREFIX}{{db_seq}}"
#FIXME: --web-root="$WORKSPACE/src/crm"
diff --git a/bin/ci-settings.sh b/bin/ci-settings.sh
index 3c48bd2..5824124 100644
--- a/bin/ci-settings.sh
+++ b/bin/ci-settings.sh
@@ -15,7 +15,7 @@
CIVICRM_SCHEMA_PREFIX="civicrm_${JOB_ID}_"
-BUILD_HOST=`hostname`
+CIVICRM_MYSQL_CLIENT="localhost"
# MySQL username is limited to 16 chars, use build number as an identifier:
CIVICRM_MYSQL_USERNAME="civitest_${BUILD_NUMBER}"
--
To view, visit https://gerrit.wikimedia.org/r/195002
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4f326d1d931ae1de3b5356384cc8c7a90e59d5cf
Gerrit-PatchSet: 4
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Awight <awi...@wikimedia.org>
Gerrit-Reviewer: AndyRussG <andrew.green...@gmail.com>
Gerrit-Reviewer: Awight <awi...@wikimedia.org>
Gerrit-Reviewer: Ejegg <eeggles...@wikimedia.org>
Gerrit-Reviewer: Katie Horn <kh...@wikimedia.org>
Gerrit-Reviewer: Ssmith <ssm...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
