File tree Expand file tree Collapse file tree 1 file changed +1
-16
lines changed
Expand file tree Collapse file tree 1 file changed +1
-16
lines changed Original file line number Diff line number Diff line change @@ -55,14 +55,8 @@ case $test_mode in
5555 all)
5656 get_packages_file_mirror
5757 package_list=$( grep " ^Package:" Packages |
58- grep -vE ' galera|spider ' |
58+ grep -vE ' galera' |
5959 awk ' {print $2}' | sort -u | xargs)
60- if grep -qi spider Packages; then
61- bb_log_warn " due to MDEV-14622 Spider will be installed separately after the server"
62- spider_package_list=$( grep " ^Package:" Packages |
63- grep ' spider' | awk ' {print $2}' |
64- sort -u | xargs)
65- fi
6660 ;;
6761 deps)
6862 package_list=" mariadb-server mariadb-client mariadb-common mariadb-test mysql-common libmysqlclient18"
109103
110104wait_for_mariadb_upgrade
111105
112- if [[ -n $spider_package_list ]]; then
113- if ! sudo sh -c " DEBIAN_FRONTEND=noninteractive MYSQLD_STARTUP_TIMEOUT=180 \
114- apt-get -o Dpkg::Options::=--force-confnew install --allow-unauthenticated -y $spider_package_list " ; then
115- bb_log_err " Installation of Spider from the previous release failed, see the output above"
116- exit 1
117- fi
118- wait_for_mariadb_upgrade
119- fi
120-
121106# To avoid confusing errors in further logic, do an explicit check
122107# whether the service is up and running
123108if [[ $systemdCapability == " yes" ]]; then
You can’t perform that action at this time.
0 commit comments