From ab0fe22c76d0d337929979dee7b11fb794db4b69 Mon Sep 17 00:00:00 2001 From: mariadb-RomanNavrotskiy <62115046+mariadb-RomanNavrotskiy@users.noreply.github.com> Date: Mon, 26 Jul 2021 09:56:13 +0200 Subject: [PATCH] ci: new branch mappings (#2054) * ci: new branch mappings * bump deb dependency to 10.7 --- .drone.jsonnet | 24 ++++++++++++++---------- debian/autobake-deb.sh | 2 +- debian/control | 2 +- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 0b9a02485..9b0e3ec83 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -1,24 +1,27 @@ local events = ['pull_request', 'cron']; local platforms = { - develop: ['opensuse/leap:15', 'centos:7', 'centos:8', 'debian:9', 'debian:10', 'ubuntu:18.04', 'ubuntu:20.04'], - 'develop-5': ['opensuse/leap:15', 'centos:7', 'centos:8', 'debian:9', 'debian:10', 'ubuntu:18.04', 'ubuntu:20.04'], + develop: ['opensuse/leap:15', 'centos:7', 'centos:8', 'debian:10', 'ubuntu:18.04', 'ubuntu:20.04'], + 'develop-6': ['opensuse/leap:15', 'centos:7', 'centos:8', 'debian:10', 'ubuntu:18.04', 'ubuntu:20.04'], + 'develop-5': ['opensuse/leap:15', 'centos:7', 'centos:8', 'debian:10', 'ubuntu:18.04', 'ubuntu:20.04'], }; local platforms_arm = { develop: ['centos:8'], + 'develop-6': ['centos:8'], }; local any_branch = '**'; -local platforms_custom = ['opensuse/leap:15', 'centos:7', 'centos:8', 'debian:9', 'debian:10', 'ubuntu:18.04', 'ubuntu:20.04']; +local platforms_custom = ['opensuse/leap:15', 'centos:7', 'centos:8', 'debian:10', 'ubuntu:18.04', 'ubuntu:20.04']; local platforms_arm_custom = ['centos:8']; local platforms_mtr = ['centos:7', 'centos:8', 'ubuntu:20.04']; local server_ref_map = { - develop: '10.6', + develop: '10.7', + 'develop-6': '10.6', 'develop-5': '10.5', - '**': '10.6', + '**': '10.7', }; local builddir = 'verylongdirnameforverystrangecpackbehavior'; @@ -28,7 +31,7 @@ local cmakeflags = '-DCMAKE_BUILD_TYPE=RelWithDebInfo -DPLUGIN_COLUMNSTORE=YES - '-DWITH_EMBEDDED_SERVER=OFF -DWITH_WSREP=OFF ' + '-DBUILD_CONFIG=mysql_release'; -local rpm_build_deps = 'install -y systemd-devel git make gcc gcc-c++ libaio-devel openssl-devel boost-devel bison snappy-devel flex libcurl-devel libxml2-devel ncurses-devel automake libtool policycoreutils-devel rpm-build lsof iproute pam-devel perl-DBI cracklib-devel expect createrepo'; +local rpm_build_deps = 'install -y lz4 systemd-devel git make gcc gcc-c++ libaio-devel openssl-devel boost-devel bison snappy-devel flex libcurl-devel libxml2-devel ncurses-devel automake libtool policycoreutils-devel rpm-build lsof iproute pam-devel perl-DBI cracklib-devel expect createrepo'; local deb_build_deps = 'apt update && apt install --yes --no-install-recommends build-essential devscripts ccache equivs eatmydata dh-systemd ' + '&& mk-build-deps debian/control -t "apt-get -y -o Debug::pkgProblemResolver=yes --no-install-recommends" -r -i'; @@ -36,10 +39,9 @@ local deb_build_deps = 'apt update && apt install --yes --no-install-recommends local platformMap(platform) = local platform_map = { - 'opensuse/leap:15': 'zypper ' + rpm_build_deps + ' cmake libboost_system-devel libboost_filesystem-devel libboost_thread-devel libboost_regex-devel libboost_date_time-devel libboost_chrono-devel libboost_atomic-devel gcc-fortran liblz4-devel && cmake ' + cmakeflags + ' -DRPM=sles15 && make -j$(nproc) package', + 'opensuse/leap:15': 'zypper ' + rpm_build_deps + ' liblz4-devel cmake libboost_system-devel libboost_filesystem-devel libboost_thread-devel libboost_regex-devel libboost_date_time-devel libboost_chrono-devel libboost_atomic-devel gcc-fortran && cmake ' + cmakeflags + ' -DRPM=sles15 && make -j$(nproc) package', 'centos:7': 'yum install -y epel-release && yum install -y cmake3 && ln -s /usr/bin/cmake3 /usr/bin/cmake && yum ' + rpm_build_deps + ' lz4-devel && cmake ' + cmakeflags + ' -DRPM=centos7 && make -j$(nproc) package', 'centos:8': "yum install -y libgcc libarchive && sed -i 's/enabled=0/enabled=1/' /etc/yum.repos.d/*PowerTools.repo && yum " + rpm_build_deps + ' lz4-devel cmake && cmake ' + cmakeflags + ' -DRPM=centos8 && make -j$(nproc) package', - 'debian:9': deb_build_deps + " && CMAKEFLAGS='" + cmakeflags + " -DDEB=stretch' debian/autobake-deb.sh", 'debian:10': deb_build_deps + " && CMAKEFLAGS='" + cmakeflags + " -DDEB=buster' debian/autobake-deb.sh", 'ubuntu:18.04': deb_build_deps + " && CMAKEFLAGS='" + cmakeflags + " -DDEB=bionic' debian/autobake-deb.sh", 'ubuntu:20.04': deb_build_deps + " && CMAKEFLAGS='" + cmakeflags + " -DDEB=focal' debian/autobake-deb.sh", @@ -54,9 +56,11 @@ local Pipeline(branch, platform, event, arch='amd64') = { local socket_path = if (pkg_format == 'rpm') then '/var/lib/mysql/mysql.sock' else '/run/mysqld/mysqld.sock', local config_path_prefix = if (pkg_format == 'rpm') then '/etc/my.cnf.d/' else '/etc/mysql/mariadb.conf.d/50-', local img = if (std.split(platform, ':')[0] == 'centos') then platform else 'romcheck/' + std.strReplace(platform, '/', '-'), - local regression_ref = if (std.split(branch, '-')[0] == 'develop') then branch else 'develop-5', + local regression_ref = if (std.split(branch, '-')[0] == 'develop') then branch else 'develop-6', local branchp = if (branch == '**') then '' else branch, + local server_remote = if (std.split(branch, '-')[0] == 'columnstore') then 'https://github.com/mariadb-corporation/MariaDBEnterprise' else 'https://github.com/MariaDB/server', + local pipeline = self, publish(step_prefix='pkg', eventp=event + '/${DRONE_BUILD_NUMBER}'):: { @@ -298,7 +302,7 @@ local Pipeline(branch, platform, event, arch='amd64') = { volumes: [pipeline._volumes.mdb], environment: { SERVER_REF: '${SERVER_REF:-' + server_ref_map[branch] + '}', - SERVER_REMOTE: '${SERVER_REMOTE:-https://github.com/MariaDB/server}', + SERVER_REMOTE: '${SERVER_REMOTE:-' + server_remote + '}', SERVER_SHA: '${SERVER_SHA:-' + server_ref_map[branch] + '}', }, commands: [ diff --git a/debian/autobake-deb.sh b/debian/autobake-deb.sh index 642d39280..75df5e2bb 100755 --- a/debian/autobake-deb.sh +++ b/debian/autobake-deb.sh @@ -51,7 +51,7 @@ then sed "/Package: mariadb-plugin-rocksdb/,/^$/d" -i debian/control sed "/Package: mariadb-plugin-spider/,/^$/d" -i debian/control sed "/Package: mariadb-plugin-oqgraph/,/^$/d" -i debian/control - sed "/ha_sphinx.so/d" -i debian/mariadb-server-10.6.install + sed "/ha_sphinx.so/d" -i debian/mariadb-server-10.*.install sed "/Package: libmariadbd19/,/^$/d" -i debian/control sed "/Package: libmariadbd-dev/,/^$/d" -i debian/control fi diff --git a/debian/control b/debian/control index 07c1a1939..9df70ecb8 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Depends: binutils, libjemalloc1 | libjemalloc2, libsnappy1 | libsnappy1v5, liblz4-1, - mariadb-server-10.6 (= ${server:Version}), + mariadb-server-10.7 (= ${server:Version}), net-tools, python3, ${misc:Depends},