From bf59b10a8171efb6b5dac72f987b8a0fd3b31e31 Mon Sep 17 00:00:00 2001 From: Razvan-Liviu Varzaru Date: Mon, 27 Jan 2025 12:20:49 +0200 Subject: [PATCH] MDBF-930 - Remove old bintars Given a new purpose of MDBF-930 because per PLC e-mail it was agreed that the remaining bintar releases of 10.5 will be produced by buildbot.mariadb.net ubuntu trusty and centos-6 were the only builders defined in master-bintars, handling builds only for server version 10.5 We can remove the master and any dependency of it. To do in Ansible (GitLab): - remove qcow files of trusty and centos 6 from apexis-bbw03 / bg-bbw1-x64 - remove firewall entry in hz-bbm3 for master-bintar on port 10007 - remove non-latent buildbot-worker from ro-apexis-bbw03-x64 and bg-bbw1-x64 These workers were only assigned to bintar work, see: https://buildbot.mariadb.org/#/workers/1744 https://buildbot.mariadb.org/#/workers/1753 --- constants.py | 8 - docker-compose/.env | 3 - docker-compose/.env.dev | 3 - docker-compose/docker-compose.yaml | 39 --- docker-compose/generate-config.py | 1 - master-bintars/buildbot.tac | 39 --- master-bintars/master.cfg | 378 ------------------------- master-private.cfg-sample | 2 - script_templates/bintar_compile.sh | 63 ----- script_templates/bintar_mtr.sh | 57 ---- script_templates/bintar_mtr_rocksdb.sh | 10 - validate_master_cfg.sh | 1 - 12 files changed, 604 deletions(-) delete mode 100644 master-bintars/buildbot.tac delete mode 100644 master-bintars/master.cfg delete mode 100644 script_templates/bintar_compile.sh delete mode 100644 script_templates/bintar_mtr.sh delete mode 100644 script_templates/bintar_mtr_rocksdb.sh diff --git a/constants.py b/constants.py index f0afca5e..1d903293 100644 --- a/constants.py +++ b/constants.py @@ -131,14 +131,6 @@ SUPPORTED_PLATFORMS["10.6"] = SUPPORTED_PLATFORMS["10.5"].copy() -# Add only 10.5 supported platforms -SUPPORTED_PLATFORMS["10.5"] += [ - "amd64-kvm-centos-6-bintar", - "amd64-kvm-ubuntu-1604-bintar", - "x86-kvm-centos-6-bintar", - "x86-kvm-ubuntu-1604-bintar", -] - SUPPORTED_PLATFORMS["10.6"] += [ "aarch64-ubuntu-2204", "amd64-ubuntu-2204", diff --git a/docker-compose/.env b/docker-compose/.env index 06d7f7df..3f578056 100644 --- a/docker-compose/.env +++ b/docker-compose/.env @@ -13,7 +13,4 @@ NGINX_CR_HOST_WG_ADDR='100.64.100.20:8080' ENVIRON='PROD' BRANCH='main' MASTER_NONLATENT_DOCKERLIBRARY_WORKER='bb-rhel8-docker' -MASTER_NONLATENT_BINTARS_WORKERS='{ "ro-apexis-bbw03-x64": { "max_builds": 2, "jobs": 12 }, "bg-bbw1-x64": { "max_builds": 1, "jobs": 12 } }' -MASTER_NONLATENT_BINTARS_VM_PORT='10000' -MASTER_NONLATENT_BINTARS_WORKER_PORT='10007' CONTAINER_REGISTRY_URL='quay.io/mariadb-foundation/bb-worker:' diff --git a/docker-compose/.env.dev b/docker-compose/.env.dev index 0870a9d5..02c93b47 100644 --- a/docker-compose/.env.dev +++ b/docker-compose/.env.dev @@ -13,7 +13,4 @@ NGINX_CR_HOST_WG_ADDR='127.0.0.1:8081' ENVIRON='DEV' BRANCH='dev' MASTER_NONLATENT_DOCKERLIBRARY_WORKER='bb-rhel9-docker' -MASTER_NONLATENT_BINTARS_WORKERS='{ "bg-bbw1-x64": { "max_builds": 1, "jobs": 12 } }' -MASTER_NONLATENT_BINTARS_VM_PORT='20000' -MASTER_NONLATENT_BINTARS_WORKER_PORT='10007' CONTAINER_REGISTRY_URL='quay.io/mariadb-foundation/bb-worker:dev_' \ No newline at end of file diff --git a/docker-compose/docker-compose.yaml b/docker-compose/docker-compose.yaml index 8d588273..77b8698f 100644 --- a/docker-compose/docker-compose.yaml +++ b/docker-compose/docker-compose.yaml @@ -568,42 +568,3 @@ services: condition: service_healthy crossbar: condition: service_started - - master-bintars: - image: quay.io/mariadb-foundation/bb-master:dev_master - restart: unless-stopped - container_name: master-bintars - environment: - - ARTIFACTS_URL - - BRANCH - - BUILDMASTER_URL - - BUILDMASTER_WG_IP - - CONTAINER_REGISTRY_URL - - ENVIRON - - GALERA_PACKAGES_DIR - - MASTER_CREDENTIALS_DIR - - MASTER_NONLATENT_BINTARS_VM_PORT - - MASTER_NONLATENT_BINTARS_WORKERS - - MASTER_NONLATENT_BINTARS_WORKER_PORT - - MASTER_NONLATENT_DOCKERLIBRARY_WORKER - - MASTER_PACKAGES_DIR - - MC_HOST_minio=https://access_key:secret_key@minio.mariadb.org - - MQ_ROUTER_URL - - PORT=10008 - - TITLE - - TITLE_URL - stop_grace_period: 5m - hostname: master-bintars - volumes: - - ./logs:/var/log/buildbot - - ./buildbot/:/srv/buildbot/master - entrypoint: - - /bin/bash - - -c - - "/srv/buildbot/master/docker-compose/start.sh master-bintars" - network_mode: host - depends_on: - mariadb: - condition: service_healthy - crossbar: - condition: service_started diff --git a/docker-compose/generate-config.py b/docker-compose/generate-config.py index 7c4c328f..76bf12f0 100755 --- a/docker-compose/generate-config.py +++ b/docker-compose/generate-config.py @@ -22,7 +22,6 @@ "master-galera", "master-protected-branches", "master-docker-nonstandard-2", - "master-bintars", ] VOLUMES = ["./logs:/var/log/buildbot", "./buildbot/:/srv/buildbot/master"] diff --git a/master-bintars/buildbot.tac b/master-bintars/buildbot.tac deleted file mode 100644 index e6a15b2e..00000000 --- a/master-bintars/buildbot.tac +++ /dev/null @@ -1,39 +0,0 @@ -import os - -from twisted.application import service - -from buildbot.master import BuildMaster - -basedir = "." -log_basedir = "/var/log/buildbot/" - -rotateLength = 20000000 -maxRotatedFiles = 30 -configfile = "master.cfg" - -# Default umask for server -umask = None - -# if this is a relocatable tac file, get the directory containing the TAC -if basedir == ".": - import os - - basedir = os.path.abspath(os.path.dirname(__file__)) - -# note: this line is matched against to check that this is a buildmaster -# directory; do not edit it. -application = service.Application('buildmaster') # fmt: skip -from twisted.python.log import FileLogObserver, ILogObserver -from twisted.python.logfile import LogFile - -logfile = LogFile.fromFullPath( - os.path.join(log_basedir, "master-bintars.log"), - rotateLength=rotateLength, - maxRotatedFiles=maxRotatedFiles, -) -application.setComponent(ILogObserver, FileLogObserver(logfile).emit) - -m = BuildMaster(basedir, configfile, umask) -m.setServiceParent(application) -m.log_rotation.rotateLength = rotateLength -m.log_rotation.maxRotatedFiles = maxRotatedFiles diff --git a/master-bintars/master.cfg b/master-bintars/master.cfg deleted file mode 100644 index 141fc45e..00000000 --- a/master-bintars/master.cfg +++ /dev/null @@ -1,378 +0,0 @@ -# -*- python -*- -# ex: set filetype=python: - -from buildbot.plugins import * -from buildbot.process.properties import Property, Properties -from buildbot.steps.shell import ShellCommand, Compile, Test, SetPropertyFromCommand -from buildbot.steps.mtrlogobserver import MTR, MtrLogObserver -from buildbot.steps.source.github import GitHub -from buildbot.process.remotecommand import RemoteCommand -from datetime import timedelta -from twisted.internet import defer - -import docker -import os -import sys -import json - -sys.path.insert(0, "/srv/buildbot/master") -sys.setrecursionlimit(10000) - -from common_factories import * -from constants import * -from locks import * -from schedulers_definition import SCHEDULERS -from utils import * - -FQDN = os.environ["BUILDMASTER_WG_IP"] - -# This is the dictionary that the buildmaster pays attention to. We also use -# a shorter alias to save typing. -c = BuildmasterConfig = {} - -# Load the slave, database passwords and 3rd-party tokens from an external private file, so -# that the rest of the configuration can be public. -config = {"private": {}} -exec(open("../master-private.cfg").read(), config, {}) - -####### BUILDBOT SERVICES - -# 'services' is a list of BuildbotService items like reporter targets. The -# status of each build will be pushed to these targets. buildbot/reporters/*.py -# has a variety to choose from, like IRC bots. - - -c["services"] = [] -context = util.Interpolate("buildbot/%(prop:buildername)s") -gs = reporters.GitHubStatusPush( - token=config["private"]["gh_mdbci"]["access_token"], - context=context, - startDescription="Build started.", - endDescription="Build done.", - verbose=True, - builders=GITHUB_STATUS_BUILDERS, -) -c["services"].append(gs) -c["secretsProviders"] = [ - secrets.SecretInAFile( - dirname=os.environ["MASTER_CREDENTIALS_DIR"] - ) -] - -####### PROJECT IDENTITY - -# the 'title' string will appear at the top of this buildbot installation's -# home pages (linked to the 'titleURL'). -c["title"] = os.environ["TITLE"] -c["titleURL"] = os.environ["TITLE_URL"] - -# the 'buildbotURL' string should point to the location where the buildbot's -# internal web server is visible. This typically uses the port number set in -# the 'www' entry below, but with an externally-visible host name which the -# buildbot cannot figure out without some help. -c["buildbotURL"] = os.environ["BUILDMASTER_URL"] - -# 'protocols' contains information about protocols which master will use for -# communicating with workers. You must define at least 'port' option that workers -# could connect to your master with this protocol. -# 'port' must match the value configured into the workers (with their -# --master option) -port = int(os.environ["MASTER_NONLATENT_BINTARS_WORKER_PORT"]) -c["protocols"] = {"pb": {"port": port}} - -####### DB URL - -c["db"] = { - # This specifies what database buildbot uses to store its state. - "db_url": config["private"]["db_url"] -} - -mtrDbPool = util.EqConnectionPool( - "MySQLdb", - config["private"]["db_host"], - config["private"]["db_user"], - config["private"]["db_password"], - config["private"]["db_mtr_db"], -) - -####### Disable net usage reports from being sent to buildbot.net -c["buildbotNetUsageData"] = None - -####### SCHEDULERS - -# Configure the Schedulers, which decide how to react to incoming changes. -c["schedulers"] = SCHEDULERS - -####### WORKERS - - -def mkWorker(name, **kwargs): - return worker.Worker(name, config["private"]["worker_pass"][name], **kwargs) - - -# The 'workers' list defines the set of recognized workers. Each element is -# a Worker object, specifying a unique worker name and password. The same -# worker name and password must be configured on the worker. - -workers_bintar = json.loads( - os.environ["MASTER_NONLATENT_BINTARS_WORKERS"] -) - -c["workers"] = [] - -for k, v in workers_bintar.items(): - c["workers"].append( - mkWorker( - f"{k}", - max_builds=v["max_builds"], - properties={"jobs": v["jobs"]}, - ) - ) - - -####### FACTORY CODE -def memory_def(): - # TODO Dummy implementation, replace with actual logic to define memory - return "8192" - - -gccWarningPattern = "^(.*?):([0-9]+):(?:[0-9]+:)? [Ww]arning: (.*)$" -kvm_scpopt = "-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o PubkeyAcceptedKeyTypes=ssh-dss -o HostKeyAlgorithms=ssh-dss" - - -def ScpSourceIntoVM(port): - return util.Interpolate( - "= scp -P " - + port - + " " - + kvm_scpopt - + " ./packages/%(prop:mariadb_version)s.tar.gz buildbot@localhost:buildbot/build" - ) - - -def getMTR(**kwargs): - return steps.MTR( - dbpool=mtrDbPool, - warningPattern="MTR's internal check of the test case '.*' failed|Failing test\(s\):.*|\*\*\*Warnings generated in error logs.*|Test warning:.*", - **kwargs, - ) - - -def getBintarFactory( - name, - kvm_image, - cpu, - ramdisk=True, - catg="main", - suffix="", - port="10000", -): - bin_fact = util.BuildFactory() - - args = [ - "--port=" + port, - "--memory=" + memory_def(), - "--user=buildbot", - "--cpu=" + cpu, - "--smp=8", - "--logfile=kernel_" + port + ".log", - ] - if ramdisk: - args.append("--work-image=/dev/shm/vm-tmp-" + port + ".qcow2") - - kvm_image_test = kvm_image.replace("vm-centos5", "vm-centos6") - - arch = "x86_64" if "amd64" in name else "i686" - - # Step 1: Cleaning build directory - bin_fact.addStep( - steps.ShellCommand( - description=["cleaning", "build", "dir"], - command=["sh", "-c", "rm -Rf ../build/*"], - ) - ) - - # Step 2: Downloading source tarball (Adapt this to your source download mechanism) - bin_fact.addStep(getSourceTarball()) - - # Custom Compile Step - # Step 5: Compile (Simplified example, adapt as needed) - bin_fact.addStep( - steps.Compile( - description=["making", "bintar"], - descriptionDone=["make", "bintar"], - timeout=3600, - logfiles={"kernel": "kernel_" + port + ".log"}, - warningPattern=gccWarningPattern, - env={"TERM": "vt102"}, - command=["runvm"] - + args - + [ - "--base-image=/kvm/vms/" + kvm_image + "-build.qcow2", - "vm-tmp-" + port + ".qcow2", - "rm -Rf buildbot && mkdir -p buildbot/build", - ScpSourceIntoVM(port), - util.Interpolate( - "cd buildbot/build && tar -xzf %(prop:mariadb_version)s.tar.gz --strip-components=1 && rm %(prop:mariadb_version)s.tar.gz" - ), - util.Interpolate(read_template("bintar_compile")), - util.Interpolate( - "= scp -P " - + port - + " " - + kvm_scpopt - + " 'buildbot@localhost:buildbot/build/mariadb-*.tar.gz' ." - ), - "= scp -P " - + port - + " " - + kvm_scpopt - + " buildbot@localhost:buildbot/bindistname.txt .", - ], - ) - ) - bin_fact.addStep( - steps.SetPropertyFromCommand( - command=["cat", "bindistname.txt"], - property="bindistname", - ) - ) - bin_fact.addStep( - steps.ShellCommand( - name="save_packages", - timeout=7200, - haltOnFailure=True, - command=util.Interpolate( - "mkdir -p " - + "/packages/" - + "%(prop:tarbuildnum)s" - + "/" - + "%(prop:buildername)s" - + " && sha256sum %(prop:bindistname)s >> sha256sums.txt && cp " - + "%(prop:bindistname)s sha256sums.txt" - + " /packages/" - + "%(prop:tarbuildnum)s" - + "/" - + "%(prop:buildername)s" - + "/" - + " && sync /packages/" - + "%(prop:tarbuildnum)s" - ), - doStepIf=( - lambda step: savePackageIfBranchMatch(step, SAVED_PACKAGE_BRANCHES) - ), - ) - ) - - bin_fact.addStep( - getMTR( - name="mtr", - description=["testing", "bintar"], - descriptionDone=["test", "bintar"], - logfiles={"kernel": "kernel_" + port + ".log"}, - mtr_subdir=".", # Where we scp vardir to - env={"TERM": "vt102"}, - command=["runvm"] - + args - + [ - "--base-image=/kvm/vms/" + kvm_image_test + "-install.qcow2", - "vm-tmp-" + port + ".qcow2", - "rm -Rf buildbot && mkdir buildbot", - util.Interpolate( - "= scp -P " - + port - + " " - + kvm_scpopt - + " %(prop:bindistname)s.tar.gz buildbot@localhost:buildbot/" - ), - util.Interpolate(read_template("bintar_mtr")), - util.Interpolate( - "! sudo chmod -R go+rX /usr/local/%(prop:bindistname)s/mysql-test/var/ || :" - ), - util.Interpolate( - "!= scp -rp -P " - + port - + " " - + kvm_scpopt - + " buildbot@localhost:/usr/local/%(prop:bindistname)s/mysql-test/var/ . || :" - ), - ], - ) - ) - - bin_fact.addStep( - getMTR( - name="mtr-rocksdb", - description=["testing", "rocksdb"], - descriptionDone=["test", "rocksdb"], - logfiles={"kernel": "kernel_" + port + ".log"}, - mtr_subdir=".", # Where we scp vardir to - env={"TERM": "vt102"}, - command=["runvm"] - + args - + [ - "vm-tmp-" + port + ".qcow2", - util.Interpolate(read_template("bintar_mtr_rocksdb")), - util.Interpolate( - "! sudo chmod -R go+rX /usr/local/%(prop:bindistname)s/mysql-test/var/ || :" - ), - util.Interpolate( - "!= scp -rp -P " - + port - + " " - + kvm_scpopt - + " buildbot@localhost:/usr/local/%(prop:bindistname)s/mysql-test/var/ . || :" - ), - ], - ) - ) - - return bin_fact - - -####### BUILDERS LIST - -c["builders"] = [] - -builder_definitions = { - "ubuntu-1604": "trusty", - "centos-6": "centos6", -} - -current_port = int(os.environ["MASTER_NONLATENT_BINTARS_VM_PORT"]) - -for b in builder_definitions: - for arch in ["amd64", "i386"]: - if arch == "i386": - builder_name = "x86" - else: - builder_name = arch - - f = getBintarFactory( - name=builder_name + "-kvm-" + b + "-bintar", - kvm_image="vm-" + builder_definitions[b] + "-" + arch, - cpu="host", - ramdisk=False, - port=str(current_port), - ) - current_port += 1 - - c["builders"].append( - util.BuilderConfig( - name=builder_name + "-kvm-" + b + "-bintar", - workernames=[*workers_bintar], - factory=f, - ) - ) - -c["logEncoding"] = "utf-8" - -c["multiMaster"] = True - -c["mq"] = { # Need to enable multimaster aware mq. Wamp is the only option for now. - "type": "wamp", - "router_url": os.environ["MQ_ROUTER_URL"], - "realm": "realm1", - # valid are: none, critical, error, warn, info, debug, trace - "wamp_debug_level": "info", -} diff --git a/master-private.cfg-sample b/master-private.cfg-sample index b5f8af9e..487287bb 100644 --- a/master-private.cfg-sample +++ b/master-private.cfg-sample @@ -53,11 +53,9 @@ private["worker_pass"]= { "bbw2-windows":"1234", "bb-rhel8-docker":"1234", "bb-rhel9-docker":"1234", - "ro-apexis-bbw03-x64": "1234", "monty-bbw1-x64": "1234", "s390x-rhel8":"1234", "libvirt": "1234", - "bg-bbw1-x64": "1234", # non-latent worker for master-bintars } private["docker_workers"]= { "amd-bbw1-docker":"tcp://IP_address:port", diff --git a/script_templates/bintar_compile.sh b/script_templates/bintar_compile.sh deleted file mode 100644 index ef3c3732..00000000 --- a/script_templates/bintar_compile.sh +++ /dev/null @@ -1,63 +0,0 @@ -#!/usr/bin/env bash - -# This is a template file for a shell script that is used to compile a binary tarball. -# The script CANNOT BE EXECUTED DIRECTLY, it is a template for the buildbot to use. - -set -o errexit -set -o pipefail -set -o posix - -err() { - echo >&2 "ERROR: $*" - exit 1 -} - -#distdirname="%(prop:distdirname)s" -branch="%(prop:branch)s" -cmake="%(prop:additional_args)s" -extra="" - -# TODO handle galera part -#case $distdirname in -# *-10.[23].*) -# # centos5 sort doesn't support -V -# latest=$(wget --no-check-certificate https://hasky.askmonty.org/galera/ -O -|grep -o galera-25'\.[0-9]\.[0-9][0-9]' |sort|tail -1) -# ;; -# *) -# latest=$(wget --no-check-certificate https://hasky.askmonty.org/galera/ -O -|grep -o galera-26'\.[0-9]\+\.[0-9]\+' |sort -V|tail -1) -# ;; -#esac -#if [ -n "$latest" ] ; then -# wget --no-check-certificate https://hasky.askmonty.org/galera/$latest/bintar/$latest""" + suffix + "-" + arch + """.tar.gz -# if [ -r galera-*.tar.gz ] ; then -# tar xf galera-*.tar.gz -# p=$(echo $HOME/galera-*/usr) -# extra="-DEXTRA_FILES=$p/lib/libgalera_smm.so=lib;$p/lib/galera/libgalera_smm.so=lib/galera" -# for f in $p/bin/*; do -# extra="$extra;$f=bin" -# done -# fi -#fi -cd buildbot/build || err "cd buildbot/build" -mkdir mkbin -cd mkbin -echo "$PATH" -echo "$SHELL" - -if [[ -d "$HOME"/local/lib ]]; then - export CMAKE_LIBRARY_PATH="$HOME/local/lib" -fi -if [[ -d "$HOME"/local/share/pkgconfig ]]; then - export PKG_CONFIG_PATH="$HOME/local/share/pkgconfig" -fi -case $branch in - preview-*) - EV=$branch - EV=-DEXTRA_VERSION=-${EV#preview-*.*-} - ;; -esac -export JAVA_HOME=/usr/lib/jvm/java -cmake -DBUILD_CONFIG=mysql_release -DWITH_READLINE=1 "$EV $extra $cmake" .. -make -j"$(nproc)" package VERBOSE=1 -basename mariadb-*.tar.gz .tar.gz >../../bindistname.txt -mv "$(cat ../../bindistname.txt).tar.gz" ../ diff --git a/script_templates/bintar_mtr.sh b/script_templates/bintar_mtr.sh deleted file mode 100644 index 43636c4a..00000000 --- a/script_templates/bintar_mtr.sh +++ /dev/null @@ -1,57 +0,0 @@ -#!/usr/bin/env bash - -set -ex - -err() { - echo >&2 "ERROR: $*" - exit 1 -} - -bindistname="%(prop:bindistname)s" - -df -kT -cd buildbot -sudo rm -Rf /usr/local/"$bindistname" -sudo tar zxf "$bindistname".tar.gz -C /usr/local/ -cd /usr/local/"$bindistname" -sudo /usr/sbin/useradd mysql -sudo sudo chown -R mysql . -sudo chgrp -R mysql . -sudo bin/mysql --version -sudo scripts/mysql_install_db --no-defaults --user=mysql -sudo chown -R root . -sudo chown -R mysql data - -sudo chown -R mysql mysql-test || - sudo chown -R mysql mariadb-test - -echo "Test for MDEV-18563, MDEV-18526" - -set +e -for p in /bin /sbin /usr/bin /usr/sbin /usr/local/bin /usr/local/sbin /usr/local/"$bindistname"/scripts; do - if [[ -x "$p"/mysql_install_db ]]; then - sudo "$p"/mysql_install_db --no-defaults --user=mysql --plugin-maturity=unknown - else - echo "$p/mysql_install_db does not exist" - fi -done -sudo scripts/mysql_install_db --no-defaults --user=mysql --plugin-maturity=unknown - -if ldd lib/plugin/ha_connect.so | grep libodbc.so.1 | grep 'not found'; then - if [ -e /usr/lib64/libodbc.so.2 ]; then - sudo ln -s /usr/lib64/libodbc.so.2 /usr/lib64/libodbc.so.1 - elif [ -e /usr/lib/libodbc.so.2 ]; then - sudo ln -s /usr/lib/libodbc.so.2 /usr/lib/libodbc.so.1 - fi -fi - -cd mysql-test || cd mariadb-test -if test -f suite/plugins/pam/pam_mariadb_mtr.so; then - for p in /lib*/security /lib*/*/security; do - test -f "$p"/pam_unix.so && sudo cp -v suite/plugins/pam/pam_mariadb_mtr.so "$p"/ - done - sudo cp -v suite/plugins/pam/mariadb_mtr /etc/pam.d/ -fi -perl mysql-test-run.pl --verbose-restart --force --parallel=4 \ - --retry=3 --vardir="$(readlink -f /dev/shm/var)" \ - --max-save-core=2 --max-save-datadir=1 diff --git a/script_templates/bintar_mtr_rocksdb.sh b/script_templates/bintar_mtr_rocksdb.sh deleted file mode 100644 index 580b5c36..00000000 --- a/script_templates/bintar_mtr_rocksdb.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -bindistname="%(prop:bindistname)s" - -cd /usr/local/"$bindistname"/mysql-test || - cd /usr/local/"$bindistname"/mariadb-test || - err /usr/local/"$bindistname"/mariadb-test -if ! sudo su -s /bin/sh -c "perl mysql-test-run.pl --mem rocksdb.1st 2>&1" mysql | grep -E 'RocksDB is not compiled|Could not find'; then - sudo su -s /bin/sh -c "perl mysql-test-run.pl --suite=rocksdb* --skip-test=rocksdb_hotbackup* --verbose-restart --force --parallel=4 --retry=3 --mem --max-save-core=2 --max-save-datadir=1" mysql -fi diff --git a/validate_master_cfg.sh b/validate_master_cfg.sh index 067b4040..62cbef55 100755 --- a/validate_master_cfg.sh +++ b/validate_master_cfg.sh @@ -81,7 +81,6 @@ echo -e "done\n" # not checking libvirt config file (//TEMP we need to find a solution # to not check ssh connection) for dir in autogen/* \ - master-bintars \ master-docker-nonstandard \ master-docker-nonstandard-2 \ master-galera \