Add aarch64-debian-10-bintar

MariaDB · Jul 11, 2023 · e326e9f · e326e9f
1 parent 0956fb7
commit e326e9f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/constants.py b/constants.py
@@ -64,6 +64,7 @@
 supportedPlatforms["10.4"] = [
  'aarch64-centos-stream8',
  'aarch64-debian-10',
+ 'aarch64-debian-10-bintar',
  'aarch64-rhel-8',
  'aarch64-ubuntu-2004',
  'aarch64-ubuntu-2004-debug',

diff --git a/master-docker-nonstandard/master.cfg b/master-docker-nonstandard/master.cfg
@@ -222,7 +222,8 @@ addWorker('hz-bbw', 6, '-valgrind-ubuntu-2204', "quay.io/mariadb-foundation/bb-w
 
 addWorker('hz-bbw', 5, '-msan-clang-debian-11', "quay.io/mariadb-foundation/bb-worker:debian11-msan", jobs=30, save_packages=False)
 
-addWorker('aarch64-bbw', 6, '-ubuntu-2004-debug', "quay.io/mariadb-foundation/bb-worker:ubuntu20.04", jobs=30, save_packages=True)
+addWorker('aarch64-bbw', 6, '-ubuntu-2004-debug', "quay.io/mariadb-foundation/bb-worker:ubuntu20.04", jobs=10, save_packages=True)
+addWorker('aarch64-bbw', 6, '-debian-10-bintar', "quay.io/mariadb-foundation/bb-worker:debian10-bintar", jobs=10, save_packages=True)
 
 addWorker('hz-bbw', 5, '-centos-7-bintar', "quay.io/mariadb-foundation/bb-worker:centos7-bintar", jobs=10, save_packages=True)
 
@@ -530,14 +531,15 @@ f_bintar.addStep(steps.ShellCommand(command=util.Interpolate("tar -xvzf /mnt/pac
 f_bintar.addStep(steps.ShellCommand(name="create html log file", command=['bash', '-c', util.Interpolate(getHTMLLogString(), jobs=util.Property('jobs', default='$(getconf _NPROCESSORS_ONLN)'))]))
 # build steps
 f_bintar.addStep(steps.Compile(command=["sh", "-c", util.Interpolate(
- 'cmake . -DWITH_READLINE=1 -DBUILD_CONFIG=mysql_release -DCMAKE_C_FLAGS="-static-libgcc -static-libstdc++ -DGNUTLS_NO_SIGNAL=0" -DCMAKE_CXX_FLAGS="-static-libgcc -static-libstdc++ -DGNUTLS_NO_SIGNAL=0" -DWITH_SSL=bundled -DPLATFORM=linux-systemd && make -j%(kw:jobs)s package',
+ 'cmake . -DWITH_READLINE=1 -DBUILD_CONFIG=mysql_release -DCMAKE_C_FLAGS="-static-libgcc -static-libstdc++ %(kw:gnutls_no_signal)s" -DCMAKE_CXX_FLAGS="-static-libgcc -static-libstdc++ %(kw:gnutls_no_signal)s" -DWITH_SSL=bundled -DPLATFORM=linux-systemd && make -j%(kw:jobs)s package',
  perf_schema=util.Property('perf_schema', default='YES'),
  build_type=util.Property('build_type', default='RelWithDebInfo'),
  jobs=util.Property('jobs', default='$(getconf _NPROCESSORS_ONLN)'),
  c_compiler=util.Property('c_compiler', default='gcc'),
  cxx_compiler=util.Property('cxx_compiler', default='g++'),
  additional_args=util.Property('additional_args', default=''),
- create_package=util.Property('create_package', default='package')
+ create_package=util.Property('create_package', default='package'),
+ gnutls_no_signal=util.Property('gnutls_no_signal', default=' ')
  )],
  env={
  'CCACHE_DIR':'/mnt/ccache',
@@ -709,6 +711,17 @@ c['builders'].append(
  nextBuild=nextBuild,
  canStartBuild=canStartBuild,
  locks=getLocks,
+ properties={'gnutls_no_signal': '-DGNUTLS_NO_SIGNAL=0'},
+ factory=f_bintar))
+
+c['builders'].append(
+ util.BuilderConfig(name="aarch64-debian-10-bintar",
+ workernames=workers["aarch64-bbw-docker-debian-10-bintar"],
+ tags=["Debian", "quick", "bintar"],
+ collapseRequests=True,
+ nextBuild=nextBuild,
+ canStartBuild=canStartBuild,
+ locks=getLocks,
  factory=f_bintar))
 
 c['builders'].append(