From 6668e9a591f1a54e642e0eb3cc13d8f878938667 Mon Sep 17 00:00:00 2001 From: Eric Schoonover Date: Mon, 15 Jan 2018 01:24:43 -0800 Subject: [PATCH 1/3] HA mailbox config.build --- .gitignore | 1 - config.build.in | 9 ++++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 7959c487bc..ca8afab8c5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,5 @@ .build.last_no_ts .build.number -config.build RE/BUILD RE/MAJOR RE/MICRO diff --git a/config.build.in b/config.build.in index e8dc11b8a1..240a33a356 100644 --- a/config.build.in +++ b/config.build.in @@ -8,8 +8,15 @@ BUILD_RELEASE_CANDIDATE = GA BUILD_TYPE = FOSS BUILD_THIRDPARTY_SERVER = zdev-vm008.eng.zimbra.com +GIT_DEFAULT_BRANCH = develop +ANT_OPTIONS = -DskipTests=1 +INTERACTIVE = 0 +DISABLE_BUNDLE = 1 + # Example of GIT_OVERRIDES (hash) # %GIT_OVERRIDES = myremote.url-prefix=ssh://git@stash.corp.synacor.com:7999/~user/zm-mailbox.git -# %GIT_OVERRIDES = zm-mailbox.branch=dev +%GIT_OVERRIDES = zm-db-conf.branch=feature/ha-redolog +%GIT_OVERRIDES = zm-mailbox.branch=feature/ha +%GIT_OVERRIDES = zm-zcs-lib.branch=feature/solr # %GIT_OVERRIDES = zm-mailbox.remote=myremote # %GIT_OVERRIDES = zm-mailbox.tag=judaspriest-872 # .tag always overrides .branch From a48d0744471932f6cc52fbec71c2e58de1ff4437 Mon Sep 17 00:00:00 2001 From: Eric Schoonover Date: Mon, 15 Jan 2018 01:25:08 -0800 Subject: [PATCH 2/3] HA mailbox DB migration for redolog --- rpmconf/Upgrade/zmupgrade.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rpmconf/Upgrade/zmupgrade.pm b/rpmconf/Upgrade/zmupgrade.pm index 8d69864351..c11f5fcb38 100755 --- a/rpmconf/Upgrade/zmupgrade.pm +++ b/rpmconf/Upgrade/zmupgrade.pm @@ -41,7 +41,7 @@ chomp $rundir; my $scriptDir = "/opt/zimbra/libexec/scripts"; my $lowVersion = 52; -my $hiVersion = 110; # this should be set to the DB version expected by current server code +my $hiVersion = 111; # this should be set to the DB version expected by current server code my $needSlapIndexing = 0; my $mysqlcnfUpdated = 0; @@ -86,6 +86,7 @@ my %updateScripts = ( '107' => "migrate20170301-ZimbraChat.pl", #8.7.6 '108' => "migrate20180301-ZimbraChat.pl", #8.8.8 '109' => "migrate20170829-SearchHistory.pl", + '110' => "migrate20180110-DistributedRedolog.pl", ); my %updateFuncs = ( From 90fb6b221fdb144918883b38f37f3fdc22426ba0 Mon Sep 17 00:00:00 2001 From: Gordon Tillman Date: Sat, 28 Apr 2018 20:05:11 -0500 Subject: [PATCH 3/3] Update zimbra-core to include SearchHistory, DistributeRedoLog --- instructions/bundling-scripts/zimbra-core.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/instructions/bundling-scripts/zimbra-core.sh b/instructions/bundling-scripts/zimbra-core.sh index f3bffc1d9b..76d084c656 100755 --- a/instructions/bundling-scripts/zimbra-core.sh +++ b/instructions/bundling-scripts/zimbra-core.sh @@ -484,6 +484,8 @@ main() Copy ${repoDir}/zm-db-conf/src/db/migration/migrate20150702-ZmgDevices.pl ${repoDir}/zm-build/${currentPackage}/opt/zimbra/libexec/scripts/migrate20150702-ZmgDevices.pl Copy ${repoDir}/zm-db-conf/src/db/migration/migrate20170301-ZimbraChat.pl ${repoDir}/zm-build/${currentPackage}/opt/zimbra/libexec/scripts/migrate20170301-ZimbraChat.pl Copy ${repoDir}/zm-db-conf/src/db/migration/migrate20180301-ZimbraChat.pl ${repoDir}/zm-build/${currentPackage}/opt/zimbra/libexec/scripts/migrate20180301-ZimbraChat.pl + Copy ${repoDir}/zm-db-conf/src/db/migration/migrate20170829-SearchHistory.pl ${repoDir}/zm-build/${currentPackage}/opt/zimbra/libexec/scripts/migrate20170829-SearchHistory.pl + Copy ${repoDir}/zm-db-conf/src/db/migration/migrate20180110-DistributedRedolog.pl ${repoDir}/zm-build/${currentPackage}/opt/zimbra/libexec/scripts/migrate20180110-DistributedRedolog.pl Copy ${repoDir}/zm-db-conf/src/db/migration/migrateAmavisLdap20050810.pl ${repoDir}/zm-build/${currentPackage}/opt/zimbra/libexec/scripts/migrateAmavisLdap20050810.pl Copy ${repoDir}/zm-db-conf/src/db/migration/migrateClearSpamFlag.pl ${repoDir}/zm-build/${currentPackage}/opt/zimbra/libexec/scripts/migrateClearSpamFlag.pl Copy ${repoDir}/zm-db-conf/src/db/migration/migrateLargeMetadata.pl ${repoDir}/zm-build/${currentPackage}/opt/zimbra/libexec/scripts/migrateLargeMetadata.pl