Skip to content

Commit

Permalink
For the purpose of downloading Galera library keep sles distro name
Browse files Browse the repository at this point in the history
  • Loading branch information
elenst committed Dec 15, 2021
1 parent 8cdfa41 commit f7624f0
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions buildbot/maria-master.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -1782,13 +1782,14 @@ fi
arch=""" + arch + """
distro=""" + distro + """
galera_distro=$distro
if [[ "$distro" == "sles123" ]] || [[ "$distro" == "sles125" ]] ; then
distro="sles12"
fi
distro=`echo $distro | sed -e 's/rhel7/centos7/'`
distro=`echo $distro | sed -e 's/centos8/rhel8/'`
galera_distro=`echo $galera_distro | sed -e 's/rhel7/centos7/'`
galera_distro=`echo $galera_distro | sed -e 's/centos8/rhel8/'`
repo_dist_arch=$distro-$arch
echo "Architecture and distribution based on VM name: $repo_dist_arch"
Expand Down Expand Up @@ -2119,7 +2120,7 @@ case "%(branch)s" in
esac
cd rpms
if ! wget https://hasky.askmonty.org/builds/mariadb-${GALERA_VERSION}.x/latest/kvm-${galera_location}-${distro}-${arch}-gal/rpms/ --recursive -np -R "index.html*" -nH --cut-dirs=5 --no-check-certificate ; then
if ! wget https://hasky.askmonty.org/builds/mariadb-${GALERA_VERSION}.x/latest/kvm-${galera_location}-${galera_distro}-${arch}-gal/rpms/ --recursive -np -R "index.html*" -nH --cut-dirs=5 --no-check-certificate ; then
echo "ERROR: Could not download the Galera library"
exit 1
fi
Expand Down

0 comments on commit f7624f0

Please sign in to comment.