mirror of
https://github.com/mariadb-corporation/mariadb-columnstore-engine.git
synced 2025-04-18 21:44:02 +03:00
chore(ci) Centos7 packaging: Very hard bug with not matching
MariaDB-shared-10.1-kvm-rpm-centos74-amd64.rpm
MariaDB-shared-5.3-amd64.rpm
to
FILE(GLOB compat53 RELATIVE ${CMAKE_SOURCE_DIR}
"${CMAKE_SOURCE_DIR}/../MariaDB-shared-5.3.*.rpm")
FILE(GLOB compat101 RELATIVE ${CMAKE_SOURCE_DIR}
"${CMAKE_SOURCE_DIR}/../MariaDB-shared-10.1.*.rpm")
files renamed to
MariaDB-shared-10.1.kvm-rpm-centos74-amd64.rpm'
MariaDB-shared-5.3.amd64.rpm'
(dash changed to dot after numbers)
to match uncontrollable glob in the server code
Added server 10.6.14-9 for upgrade testing
This commit is contained in:
Leonid Fedorov
Leonid Fedorov
parent
95185eff7e
commit
df92d5ee9c
@ -68,31 +68,31 @@ local mtr_full_set = 'basic,bugfixes,devregression,autopilot,extended,multinode,
|
||||
|
||||
local upgrade_test_lists = {
|
||||
"centos7": {
|
||||
"amd64": ["10.6.4-1", "10.6.5-2", "10.6.7-3", "10.6.8-4", "10.6.9-5", "10.6.11-6", "10.6.12-7", "10.6.15-10"]
|
||||
"amd64": ["10.6.4-1", "10.6.5-2", "10.6.7-3", "10.6.8-4", "10.6.9-5", "10.6.11-6", "10.6.12-7", "10.6.14-9", "10.6.15-10"]
|
||||
},
|
||||
"rockylinux8": {
|
||||
"arm64": ["10.6.4-1", "10.6.9-5", "10.6.11-6", "10.6.12-7", "10.6.15-10"],
|
||||
"amd64": ["10.6.4-1", "10.6.5-2", "10.6.7-3", "10.6.8-4", "10.6.9-5", "10.6.11-6", "10.6.12-7", "10.6.15-10"]
|
||||
"amd64": ["10.6.4-1", "10.6.5-2", "10.6.7-3", "10.6.8-4", "10.6.9-5", "10.6.11-6", "10.6.12-7", "10.6.14-9", "10.6.15-10"]
|
||||
},
|
||||
"rockylinux9": {
|
||||
"arm64": ["10.6.9-5", "10.6.11-6", "10.6.12-7", "10.6.15-10"],
|
||||
"amd64": ["10.6.9-5", "10.6.11-6", "10.6.12-7", "10.6.15-10"]
|
||||
"arm64": ["10.6.9-5", "10.6.11-6", "10.6.12-7", "10.6.14-9", "10.6.15-10"],
|
||||
"amd64": ["10.6.9-5", "10.6.11-6", "10.6.12-7", "10.6.14-9", "10.6.15-10"]
|
||||
},
|
||||
"debian11": {
|
||||
"arm64": ["10.6.9-5", "10.6.11-6", "10.6.12-7", "10.6.15-10"],
|
||||
"amd64": ["10.6.5-2", "10.6.7-3", "10.6.9-5", "10.6.11-6", "10.6.12-7", "10.6.15-10"]
|
||||
"arm64": ["10.6.9-5", "10.6.11-6", "10.6.12-7", "10.6.14-9", "10.6.15-10"],
|
||||
"amd64": ["10.6.5-2", "10.6.7-3", "10.6.9-5", "10.6.11-6", "10.6.12-7", "10.6.14-9", "10.6.15-10"]
|
||||
},
|
||||
"debian12": {
|
||||
"arm64": ["10.6.15-10"],
|
||||
"amd64": ["10.6.15-10"]
|
||||
"arm64": [],
|
||||
"amd64": []
|
||||
},
|
||||
"ubuntu20.04": {
|
||||
"arm64": ["10.6.9-5", "10.6.11-6", "10.6.12-7", "10.6.15-10"],
|
||||
"amd64": ["10.6.4-1", "10.6.5-2", "10.6.7-3", "10.6.8-4", "10.6.9-5", "10.6.11-6", "10.6.12-7", "10.6.15-10"]
|
||||
"arm64": ["10.6.9-5", "10.6.11-6", "10.6.12-7", "10.6.14-9", "10.6.15-10"],
|
||||
"amd64": ["10.6.4-1", "10.6.5-2", "10.6.7-3", "10.6.8-4", "10.6.9-5", "10.6.11-6", "10.6.12-7", "10.6.14-9", "10.6.15-10"]
|
||||
},
|
||||
"ubuntu22.04": {
|
||||
"arm64": ["10.6.9-5", "10.6.11-6", "10.6.12-7", "10.6.15-10"],
|
||||
"amd64": ["10.6.9-5", "10.6.11-6", "10.6.12-7", "10.6.15-10"]
|
||||
"arm64": ["10.6.9-5", "10.6.11-6", "10.6.12-7", "10.6.14-9", "10.6.15-10"],
|
||||
"amd64": ["10.6.9-5", "10.6.11-6", "10.6.12-7", "10.6.14-9", "10.6.15-10"]
|
||||
},
|
||||
};
|
||||
|
||||
@ -250,6 +250,7 @@ local Pipeline(branch, platform, event, arch='amd64', server='10.6-enterprise')
|
||||
execInnerDocker('mkdir core', dockerImage),
|
||||
execInnerDocker('chmod 777 core', dockerImage),
|
||||
'docker cp core_dumps/. ' + dockerImage + ':/',
|
||||
'docker cp build/utils.sh ' + dockerImage + ':/',
|
||||
'docker cp setup-repo.sh ' + dockerImage + ':/',
|
||||
if (do_setup) then execInnerDocker('/setup-repo.sh', dockerImage),
|
||||
execInnerDocker(installRpmDeb(pkg_format,
|
||||
@ -345,7 +346,7 @@ local Pipeline(branch, platform, event, arch='amd64', server='10.6-enterprise')
|
||||
then execInnerDocker('bash -c "./upgrade_setup_rpm.sh '+ version + ' ' + result + ' ' + arch + ' ' + repo_pkg_url_no_res + ' $${UPGRADE_TOKEN}"',
|
||||
dockerImage('upgrade') + version),
|
||||
if (std.split(platform, ':')[0] == 'centos')
|
||||
then execInnerDocker('bash -c "./upgrade_setup_cent.sh '+ version + ' ' + result + ' ' + arch + ' ' + repo_pkg_url_no_res + ' $${UPGRADE_TOKEN}"',
|
||||
then execInnerDocker('bash -c "./upgrade_setup_rpm.sh '+ version + ' ' + result + ' ' + arch + ' ' + repo_pkg_url_no_res + ' $${UPGRADE_TOKEN}"',
|
||||
dockerImage('upgrade') + version),
|
||||
],
|
||||
},
|
||||
@ -732,8 +733,8 @@ local Pipeline(branch, platform, event, arch='amd64', server='10.6-enterprise')
|
||||
'git config cmake.update-submodules no',
|
||||
'rm -rf storage/columnstore/columnstore',
|
||||
'cp -r /drone/src /mdb/' + builddir + '/storage/columnstore/columnstore',
|
||||
if (std.split(platform, ':')[0] == 'centos') then 'wget -P /mdb/ https://cspkg.s3.amazonaws.com/MariaDB-Compat/MariaDB-shared-10.1-kvm-rpm-centos74-amd64.rpm',
|
||||
if (std.split(platform, ':')[0] == 'centos') then 'wget -P /mdb/ https://cspkg.s3.amazonaws.com/MariaDB-Compat/MariaDB-shared-5.3-amd64.rpm',
|
||||
if (std.split(platform, ':')[0] == 'centos') then 'wget -P /mdb/ https://cspkg.s3.amazonaws.com/MariaDB-Compat/MariaDB-shared-10.1.kvm-rpm-centos74-amd64.rpm',
|
||||
if (std.split(platform, ':')[0] == 'centos') then 'wget -P /mdb/ https://cspkg.s3.amazonaws.com/MariaDB-Compat/MariaDB-shared-5.3.amd64.rpm',
|
||||
],
|
||||
},
|
||||
{
|
||||
@ -846,8 +847,7 @@ local Pipeline(branch, platform, event, arch='amd64', server='10.6-enterprise')
|
||||
[pipeline.cmapilog] +
|
||||
[pipeline.publish('cmapilog')] +
|
||||
[pipeline.upgrade(mdb_server_versions[i]) for i in indexes(mdb_server_versions)] +
|
||||
[pipeline.upgradelog] +
|
||||
[pipeline.publish('upgradelog')] +
|
||||
(if (std.length(mdb_server_versions) == 0) then [] else [pipeline.upgradelog] + [pipeline.publish('upgradelog')]) +
|
||||
(if (platform == 'rockylinux:8' && arch == 'amd64') then [pipeline.dockerfile] + [pipeline.dockerhub] + [pipeline.multi_node_mtr] else [pipeline.mtr] + [pipeline.publish('mtr')] + [pipeline.mtrlog] + [pipeline.publish('mtrlog')]) +
|
||||
(if (event == 'cron' && platform == 'rockylinux:8' && arch == 'amd64') then [pipeline.publish('mtr latest', 'latest')] else []) +
|
||||
[pipeline.prepare_regression] +
|
||||
|
||||
@ -1,51 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
source ../build/utils.sh
|
||||
|
||||
set -xeuo pipefail
|
||||
|
||||
VERSION="$1"
|
||||
RESULT="$2"
|
||||
ARCH="$3"
|
||||
LINK="$4"
|
||||
UPGRADE_TOKEN="$5"
|
||||
|
||||
yum install -y wget which procps-ng diffutils
|
||||
wget https://dlm.mariadb.com/enterprise-release-helpers/mariadb_es_repo_setup -O mariadb_es_repo_setup
|
||||
chmod +x mariadb_es_repo_setup
|
||||
bash -c "./mariadb_es_repo_setup --token=${UPGRADE_TOKEN} --apply --mariadb-server-version=${VERSION} --skip-maxscale --skip-tools --skip-check-installed"
|
||||
yum -y install MariaDB-server MariaDB-client MariaDB-columnstore-engine MariaDB-columnstore-engine-debuginfo
|
||||
|
||||
systemctl start mariadb
|
||||
systemctl start mariadb-columnstore
|
||||
|
||||
INITIAL_VERSION=$(mariadb -e "select @@version;")
|
||||
|
||||
bash -c "./upgrade_data.sh"
|
||||
bash -c "./upgrade_verify.sh"
|
||||
|
||||
cd /etc/yum.repos.d/
|
||||
touch repo.repo
|
||||
cat <<EOF > repo.repo
|
||||
[repo]
|
||||
name = repo
|
||||
baseurl = ${LINK}${RESULT}/
|
||||
enabled = 1
|
||||
gpgcheck = 0
|
||||
module_hotfixes=1
|
||||
EOF
|
||||
|
||||
cd /
|
||||
|
||||
yum -y update MariaDB-server MariaDB-client MariaDB-columnstore-engine MariaDB-columnstore-engine-debuginfo
|
||||
UPGRADED_VERSION=$(mariadb -e "select @@version;")
|
||||
|
||||
if [[ "$INITIAL_VERSION" == "$UPGRADED_VERSION" ]]; then
|
||||
error "The upgrade didn't happen!"
|
||||
exit 1
|
||||
else
|
||||
message_splitted "The upgrade from "$INITIAL_VERSION" to "$UPGRADED_VERSION" succeded!"
|
||||
bash -c "./upgrade_verify.sh"
|
||||
fi
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
source ../build/utils.sh
|
||||
source ./utils.sh
|
||||
|
||||
set -xeuo pipefail
|
||||
|
||||
@ -47,7 +47,8 @@ bash -c "./setup-repo.sh"
|
||||
# Z : start a shell to examine the situation
|
||||
# The default action is to keep your current version.
|
||||
|
||||
# rm to escape halt on interactive question
|
||||
# the -o options are used to make choise of keep your currently-installed version without interactive prompt
|
||||
|
||||
apt-get --yes --with-new-pkgs -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" upgrade
|
||||
|
||||
UPGRADED_VERSION=$(mariadb -e "select @@version;")
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
source ../build/utils.sh
|
||||
source ./utils.sh
|
||||
|
||||
set -xeuo pipefail
|
||||
|
||||
@ -11,13 +11,12 @@ LINK="$4"
|
||||
UPGRADE_TOKEN="$5"
|
||||
|
||||
yum clean all
|
||||
#rm -rf /var/cache/dnf/*
|
||||
yum install -y wget which procps-ng diffutils rsyslog
|
||||
wget https://dlm.mariadb.com/enterprise-release-helpers/mariadb_es_repo_setup -O mariadb_es_repo_setup
|
||||
chmod +x mariadb_es_repo_setup
|
||||
bash -c "./mariadb_es_repo_setup --token=${UPGRADE_TOKEN} --apply --mariadb-server-version=${VERSION} --skip-maxscale --skip-tools --skip-check-installed"
|
||||
dnf repo-pkgs mariadb-es-main list
|
||||
dnf -y install MariaDB-server MariaDB-client MariaDB-columnstore-engine MariaDB-columnstore-engine-debuginfo
|
||||
yum repo-pkgs mariadb-es-main list
|
||||
yum -y install MariaDB-server MariaDB-client MariaDB-columnstore-engine MariaDB-columnstore-engine-debuginfo
|
||||
|
||||
systemctl start mariadb
|
||||
systemctl start mariadb-columnstore
|
||||
@ -29,8 +28,8 @@ bash -c "./upgrade_verify.sh"
|
||||
|
||||
bash -c "./setup-repo.sh"
|
||||
|
||||
dnf repo-pkgs repo list
|
||||
dnf -y update MariaDB-server MariaDB-client MariaDB-columnstore-engine MariaDB-columnstore-engine-debuginfo
|
||||
yum repo-pkgs repo list
|
||||
yum -y update MariaDB-server MariaDB-client MariaDB-columnstore-engine MariaDB-columnstore-engine-debuginfo
|
||||
|
||||
UPGRADED_VERSION=$(mariadb -e "select @@version;")
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user