Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/151844
Change subject: civicrm: normalize JOBID to JOB_ID
......................................................................
civicrm: normalize JOBID to JOB_ID
Change-Id: If9ee4aa51d4b50caae9e8b362772c4a578d47dfb
---
M bin/civi-ci-create-dbs.sh
M bin/civi-ci-drop-dbs.sh
2 files changed, 12 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins
refs/changes/44/151844/1
diff --git a/bin/civi-ci-create-dbs.sh b/bin/civi-ci-create-dbs.sh
index 909b35b..92179bd 100755
--- a/bin/civi-ci-create-dbs.sh
+++ b/bin/civi-ci-create-dbs.sh
@@ -10,16 +10,16 @@
fi
# MYSQL database name cant use spaces or dashes:
-JOBID="${JOB_NAME// /_}_${BUILD_NUMBER}"
-JOBID="${JOBID//-/_}"
+JOB_ID="${JOB_NAME// /_}_${BUILD_NUMBER}"
+JOB_ID="${JOB_ID//-/_}"
BUILD_HOST=`hostname`
-USERNAME="civitest_${JOBID}"
-PASSWORD="pw_${JOBID}"
-DRUPAL_SCHEMA="drupal_${JOBID}"
-CIVICRM_SCHEMA="civicrm_${JOBID}"
+USERNAME="civitest_${JOB_ID}"
+PASSWORD="pw_${JOB_ID}"
+DRUPAL_SCHEMA="drupal_${JOB_ID}"
+CIVICRM_SCHEMA="civicrm_${JOB_ID}"
-echo "Creating databases with the suffix -'_${JOBID}'"
+echo "Creating databases with the suffix -'_${JOB_ID}'"
mysql -u root <<EOS
drop database if exists ${DRUPAL_SCHEMA};
diff --git a/bin/civi-ci-drop-dbs.sh b/bin/civi-ci-drop-dbs.sh
index 9c85f47..b2cd421 100755
--- a/bin/civi-ci-drop-dbs.sh
+++ b/bin/civi-ci-drop-dbs.sh
@@ -1,13 +1,13 @@
#!/bin/bash
# MYSQL database name cant use spaces or dashes:
-JOBID="${JOB_NAME// /_}_${BUILD_NUMBER}"
-JOBID="${JOBID//-/_}"
+JOB_ID="${JOB_NAME// /_}_${BUILD_NUMBER}"
+JOB_ID="${JOB_ID//-/_}"
-DRUPAL_SCHEMA="drupal_${JOBID}"
-CIVICRM_SCHEMA="civicrm_${JOBID}"
+DRUPAL_SCHEMA="drupal_${JOB_ID}"
+CIVICRM_SCHEMA="civicrm_${JOB_ID}"
-echo "Dropping databases with the suffix -'_${JOBID}'"
+echo "Dropping databases with the suffix -'_${JOB_ID}'"
mysql -u root <<EOS
drop database if exists ${DRUPAL_SCHEMA};
--
To view, visit https://gerrit.wikimedia.org/r/151844
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If9ee4aa51d4b50caae9e8b362772c4a578d47dfb
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
