Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
bb.org: Change warningPattern for Windows builders
  • Loading branch information
@vladbogo
vladbogo committed Jan 10, 2022
1 parent cd7f8e0 commit ff4b8e7
Showing 1 changed file with 8 additions and 5 deletions.
13 changes: 8 additions & 5 deletions buildbot.mariadb.org/master-nonlatent/master.cfg
View file
Expand Up @@ -19,6 +19,9 @@ from utils import *
from locks import *
from common_factories import *

####### VARIABLES
vsWarningPattern= "^(?:\s*>[0-9]+)?\s*([^)]*?)\\(([0-9]+)\\)\s*:\s*warning\s*[-_a-zA-Z0-9]+\s*:\s*(.*)$"

# This is the dictionary that the buildmaster pays attention to. We also use
# a shorter alias to save typing.
c = BuildmasterConfig = {}
Expand Down Expand Up @@ -153,8 +156,8 @@ f_windows.addStep(steps.ShellCommand(
haltOnFailure=True,
command=["dojob", '"', "powershell", "-command", "Start-BitsTransfer", "-Source", util.Interpolate("https://ci.mariadb.org/%(prop:tarbuildnum)s/%(prop:mariadb_version)s.tar.gz"), "-Destination", util.Interpolate("%(prop:tarbuildnum)s_%(prop:mariadb_version)s.tar.gz"), '"']))
f_windows.addStep(steps.ShellCommand(name="unpack tarball", env={'TMP': util.Interpolate("D:\\Buildbot\\%(prop:buildername)s\\build\\tmpdir"), 'TEMP': util.Interpolate("D:\\Buildbot\\%(prop:buildername)s\\build\\tmpdir")}, command=["dojob", '"', util.Interpolate("tar -xvzf %(prop:tarbuildnum)s_%(prop:mariadb_version)s.tar.gz --strip-components=1"), '"']))
f_windows.addStep(steps.Compile(name="cmake", env={'TMP': util.Interpolate("D:\\Buildbot\\%(prop:buildername)s\\build\\tmpdir"), 'TEMP': util.Interpolate("D:\\Buildbot\\%(prop:buildername)s\\build\\tmpdir")}, command=["dojob", '"', util.Interpolate("C:\VCTools\Common7\Tools\VsDevCmd.bat -arch=%(kw:arch)s && cmake . -A %(kw:arch_cmake)s -DPLUGIN_ROCKSDB=NO -DMYSQL_MAINTAINER_MODE=ERR -Wno-dev", arch=util.Property('arch', default='x64'), arch_cmake=util.Property('arch_cmake', default='x64')), '"']))
f_windows.addStep(steps.Compile(name="compile", env={'TMP': util.Interpolate("D:\\Buildbot\\%(prop:buildername)s\\build\\tmpdir"), 'TEMP': util.Interpolate("D:\\Buildbot\\%(prop:buildername)s\\build\\tmpdir")}, command=["dojob", '"', util.Interpolate("C:\VCTools\Common7\Tools\VsDevCmd.bat -arch=%(kw:arch)s && cmake --build . --verbose --config Debug -- -m", arch=util.Property('arch', default='x64')), '"'], timeout=7200))
f_windows.addStep(steps.Compile(name="cmake", env={'TMP': util.Interpolate("D:\\Buildbot\\%(prop:buildername)s\\build\\tmpdir"), 'TEMP': util.Interpolate("D:\\Buildbot\\%(prop:buildername)s\\build\\tmpdir")}, command=["dojob", '"', util.Interpolate("C:\VCTools\Common7\Tools\VsDevCmd.bat -arch=%(kw:arch)s && cmake . -A %(kw:arch_cmake)s -DPLUGIN_ROCKSDB=NO -DMYSQL_MAINTAINER_MODE=ERR -Wno-dev", arch=util.Property('arch', default='x64'), arch_cmake=util.Property('arch_cmake', default='x64')), '"'], warningPattern=vsWarningPattern))
f_windows.addStep(steps.Compile(name="compile", env={'TMP': util.Interpolate("D:\\Buildbot\\%(prop:buildername)s\\build\\tmpdir"), 'TEMP': util.Interpolate("D:\\Buildbot\\%(prop:buildername)s\\build\\tmpdir")}, command=["dojob", '"', util.Interpolate("C:\VCTools\Common7\Tools\VsDevCmd.bat -arch=%(kw:arch)s && cmake --build . --verbose --config Debug -- -m", arch=util.Property('arch', default='x64')), '"'], timeout=7200, warningPattern=vsWarningPattern))
f_windows.addStep(steps.MTR(addLogs=True, name="test nm", env={'TMP': util.Interpolate("D:\\Buildbot\\%(prop:buildername)s\\build\\tmpdir"), 'TEMP': util.Interpolate("D:\\Buildbot\\%(prop:buildername)s\\build\\tmpdir")}, command=["dojob", '"', util.Interpolate("C:\VCTools\Common7\Tools\VsDevCmd.bat -arch=%(kw:arch)s && cd mysql-test && ..\\mysql-test\\collections\\buildbot_suites.bat && cd ..", mtr_additional_args=util.Property('mtr_additional_args', default=''), jobs=util.Property('jobs', default=4), arch=util.Property('arch', default='x64')), '"'], timeout=7200, haltOnFailure="true", parallel=mtrJobsMultiplier, dbpool=mtrDbPool, autoCreateTables=True))
f_windows.addStep(steps.MTR(addLogs=True, name="extra", env={'TMP': util.Interpolate("D:\\Buildbot\\%(prop:buildername)s\\build\\tmpdir"), 'TEMP': util.Interpolate("D:\\Buildbot\\%(prop:buildername)s\\build\\tmpdir")}, command=["dojob", '"', util.Interpolate("C:\VCTools\Common7\Tools\VsDevCmd.bat -arch=%(kw:arch)s && cd mysql-test && perl mysql-test-run.pl --verbose-restart --force --testcase-timeout=45 --suite-timeout=600 --retry=3 --suites=connect --parallel=%(kw:jobs)s %(kw:mtr_additional_args)s", mtr_additional_args=util.Property('mtr_additional_args', default=''), jobs=util.Property('jobs', default=4), arch=util.Property('arch', default='x64')), '"'], timeout=7200, haltOnFailure="true", parallel=mtrJobsMultiplier, dbpool=mtrDbPool, autoCreateTables=True))
f_windows.addStep(steps.ShellCommand(name="cleanup", command=["dojob", '"', "powershell", "-command", "Remove-Item", '"$pwd\*"', "-Recurse", "-Force", '"'], alwaysRun=True))
Expand All @@ -172,9 +175,9 @@ f_windows_msi.addStep(steps.ShellCommand(
haltOnFailure=True,
command=["dojob", '"', "powershell", "-command", "Start-BitsTransfer", "-Source", util.Interpolate("https://ci.mariadb.org/%(prop:tarbuildnum)s/%(prop:mariadb_version)s.tar.gz"), "-Destination", util.Interpolate("%(prop:tarbuildnum)s_%(prop:mariadb_version)s.tar.gz"), '"']))
f_windows_msi.addStep(steps.ShellCommand(name="unpack tarball", command=["dojob", '"', util.Interpolate("tar -xvzf %(prop:tarbuildnum)s_%(prop:mariadb_version)s.tar.gz --strip-components=1"), '"']))
f_windows_msi.addStep(steps.Compile(name="cmake", env={'TMP': util.Interpolate("D:\\Buildbot\\%(prop:buildername)s\\build\\tmpdir"), 'TEMP': util.Interpolate("D:\\Buildbot\\%(prop:buildername)s\\build\\tmpdir")}, command=["dojob", '"', util.Interpolate('C:\VCTools\Common7\Tools\VsDevCmd.bat -arch=%(kw:arch)s && cmake . -G "Visual Studio 16 2019" -A %(kw:arch_cmake)s -DBUILD_CONFIG=mysql_release -DWITH_THIRD_PARTY=HeidiSQL -DWITH_EMBEDDED_SERVER=0 -DSIGNCODE=ON -DWITH_UNIT_TESTS=0 -DMYSQL_MAINTAINER_MODE=ERR', arch=util.Property('arch', default='x64'), arch_cmake=util.Property('arch_cmake', default='x64')), '"']))
f_windows_msi.addStep(steps.Compile(name="compile", env={'TMP': util.Interpolate("D:\\Buildbot\\%(prop:buildername)s\\build\\tmpdir"), 'TEMP': util.Interpolate("D:\\Buildbot\\%(prop:buildername)s\\build\\tmpdir")}, command=["dojob", '"', util.Interpolate("C:\VCTools\Common7\Tools\VsDevCmd.bat -arch=%(kw:arch)s && cmake --build . --verbose --config RelWithDebInfo -- -m", arch=util.Property('arch', default='x64')), '"'], timeout=3600))
f_windows_msi.addStep(steps.Compile(name="package", env={'TMP': util.Interpolate("D:\\Buildbot\\%(prop:buildername)s\\build\\tmpdir"), 'TEMP': util.Interpolate("D:\\Buildbot\\%(prop:buildername)s\\build\\tmpdir")}, command=["dojob", '"', util.Interpolate("C:\VCTools\Common7\Tools\VsDevCmd.bat -arch=%(kw:arch)s && cmake --build . --config RelWithDebInfo --target win_package && cmake --build . --config RelWithDebInfo --target MSI", arch=util.Property('arch', default='x64')), '"'], timeout=3600))
f_windows_msi.addStep(steps.Compile(name="cmake", env={'TMP': util.Interpolate("D:\\Buildbot\\%(prop:buildername)s\\build\\tmpdir"), 'TEMP': util.Interpolate("D:\\Buildbot\\%(prop:buildername)s\\build\\tmpdir")}, command=["dojob", '"', util.Interpolate('C:\VCTools\Common7\Tools\VsDevCmd.bat -arch=%(kw:arch)s && cmake . -G "Visual Studio 16 2019" -A %(kw:arch_cmake)s -DBUILD_CONFIG=mysql_release -DWITH_THIRD_PARTY=HeidiSQL -DWITH_EMBEDDED_SERVER=0 -DSIGNCODE=ON -DWITH_UNIT_TESTS=0 -DMYSQL_MAINTAINER_MODE=ERR', arch=util.Property('arch', default='x64'), arch_cmake=util.Property('arch_cmake', default='x64')), '"'], warningPattern=vsWarningPattern))
f_windows_msi.addStep(steps.Compile(name="compile", env={'TMP': util.Interpolate("D:\\Buildbot\\%(prop:buildername)s\\build\\tmpdir"), 'TEMP': util.Interpolate("D:\\Buildbot\\%(prop:buildername)s\\build\\tmpdir")}, command=["dojob", '"', util.Interpolate("C:\VCTools\Common7\Tools\VsDevCmd.bat -arch=%(kw:arch)s && cmake --build . --verbose --config RelWithDebInfo -- -m", arch=util.Property('arch', default='x64')), '"'], timeout=3600, warningPattern=vsWarningPattern))
f_windows_msi.addStep(steps.Compile(name="package", env={'TMP': util.Interpolate("D:\\Buildbot\\%(prop:buildername)s\\build\\tmpdir"), 'TEMP': util.Interpolate("D:\\Buildbot\\%(prop:buildername)s\\build\\tmpdir")}, command=["dojob", '"', util.Interpolate("C:\VCTools\Common7\Tools\VsDevCmd.bat -arch=%(kw:arch)s && cmake --build . --config RelWithDebInfo --target win_package && cmake --build . --config RelWithDebInfo --target MSI", arch=util.Property('arch', default='x64')), '"'], timeout=3600, warningPattern=vsWarningPattern))
f_windows_msi.addStep(steps.MTR(addLogs=True, name="test nm", env={'TMP': util.Interpolate("D:\\Buildbot\\%(prop:buildername)s\\build\\tmpdir"), 'TEMP': util.Interpolate("D:\\Buildbot\\%(prop:buildername)s\\build\\tmpdir")}, command=["dojob", '"', util.Interpolate("C:\VCTools\Common7\Tools\VsDevCmd.bat -arch=%(kw:arch)s && cd mysql-test && ..\\mysql-test\\collections\\buildbot_suites.bat && cd ..", mtr_additional_args=util.Property('mtr_additional_args', default=''), jobs=util.Property('jobs', default=4), arch=util.Property('arch', default='x64')), '"'], timeout=7200, haltOnFailure="true", parallel=mtrJobsMultiplier, dbpool=mtrDbPool, autoCreateTables=True))
f_windows_msi.addStep(steps.MTR(addLogs=True, name="extra", env={'TMP': util.Interpolate("D:\\Buildbot\\%(prop:buildername)s\\build\\tmpdir"), 'TEMP': util.Interpolate("D:\\Buildbot\\%(prop:buildername)s\\build\\tmpdir")}, command=["dojob", '"', util.Interpolate("C:\VCTools\Common7\Tools\VsDevCmd.bat -arch=%(kw:arch)s && cd mysql-test && perl mysql-test-run.pl --verbose-restart --force --testcase-timeout=45 --suite-timeout=600 --retry=3 --suites=connect --parallel=%(kw:jobs)s %(kw:mtr_additional_args)s", mtr_additional_args=util.Property('mtr_additional_args', default=''), jobs=util.Property('jobs', default=4), arch=util.Property('arch', default='x64')), '"'], timeout=7200, haltOnFailure="true", parallel=mtrJobsMultiplier, dbpool=mtrDbPool, autoCreateTables=True))
# create package and upload to master
Expand Down

0 comments on commit ff4b8e7

Please sign in to comment.