#52050 - Matomo deployment script fixes.

Author: EmlynK

matomo/Matomo.py

@@ -30,10 +30,10 @@ def mysql_backup_db(db_name, build, fail_build=False, mysql_config='/etc/mysql/d
 def database_updates(repo, branch, build, www_root, application_directory, db_name):
   print "Applying database updates."
   with settings(warn_only=True):
-    with cd("%s/%s_%s_%s/%s" % (www_root, repo, branch, application_directory)):
-      if run("su -s /bin/bash www-data -c 'console core:update'").failed:
-        print "Could not run database updates. Reverting database and aborting."
+    with cd("%s/%s_%s_%s/%s" % (www_root, repo, branch, build, application_directory)):
+      if sudo("su -s /bin/bash www-data -c './console core:update'").failed:
         execute(Revert._revert_db, repo, branch, build, db_name)
+        raise SystemExit("###### Could not run database updates. Reverting database and aborting.")
 
 
 # Clear Matomo cache
@@ -42,8 +42,8 @@ def database_updates(repo, branch, build, www_root, application_directory, db_na
 def clear_cache(repo, branch, build, www_root, application_directory):
   print "Clearing cache."
   with settings(warn_only=True):
-    with cd("%s/%s_%s_%s/%s" % (www_root, repo, branch, application_directory)):
-      if run("su -s /bin/bash www-data -c 'console cache:clear'").failed:
+    with cd("%s/%s_%s_%s/%s" % (www_root, repo, branch, build, application_directory)):
+      if sudo("su -s /bin/bash www-data -c './console cache:clear'").failed:
         print "Could not clear the cache. Not failing the build though."
 
 

matomo/Revert.py

@@ -24,4 +24,4 @@ def mysql_revert_db(db_name, build, mysql_config='/etc/mysql/debian.cnf'):
   print "===> Waiting 5 seconds to let MySQL internals catch up"
   time.sleep(5)
   print "===> Restoring the database from backup"
-  sudo("if [ -f /var/www/shared/dbbackups/%s_prior_to_%s.sql.gz ]; then zcat ~jenkins/dbbackups/%s_prior_to_%s.sql.gz | sed -e 's/DEFINER[ ]*=[ ]*[^*]*\*/\*/' | mysql --defaults-file=%s -D %s; fi" % (db_name, build, db_name, build, mysql_config, db_name))
+  sudo("if [ -f /var/www/shared/dbbackups/%s_prior_to_%s.sql.gz ]; then zcat /var/www/shared/dbbackups/%s_prior_to_%s.sql.gz | sed -e 's/DEFINER[ ]*=[ ]*[^*]*\*/\*/' | sed -e 's/^SET @@SESSION.SQL_LOG_BIN/-- &/' | sed -e 's/^SET @@GLOBAL.GTID_PURGED=/-- &/' | mysql --defaults-file=%s -D %s; fi" % (db_name, build, db_name, build, mysql_config, db_name))

matomo/common

@@ -0,0 +1 @@
+../common

matomo/fabfile.py

@@ -95,7 +95,7 @@ def main(repo, repourl, build, branch, buildtype, keepbuilds=10, restartvarnish=
     execute(common.Utils.perform_client_deploy_hook, repo, branch, build, buildtype, config, stage='mid', build_hook_version="1", hosts=env.roledefs['app_all'])
     execute(common.Utils.perform_client_deploy_hook, repo, branch, build, buildtype, config, stage='mid-prim', build_hook_version="1", hosts=env.roledefs['app_primary'])
 
-    execute(Matomo.database_updates, repo, branch, build, www_root, application_directory)
+    execute(Matomo.database_updates, repo, branch, build, www_root, application_directory, db_name)
 
   # Adjust the live symlink now that all sites have been deployed. Bring them online after this has happened.
   if previous_build is not None: