Merge pull request #2085 from travis-ci/kw-new_mariadb

New MariaDB repository

Author: smokodon

lib/travis/build/addons/mariadb.rb

@@ -9,7 +9,8 @@ class Mariadb < Base
 
         MARIADB_GPG_KEY_OLD = '0xcbcb082a1bb943db'
         MARIADB_GPG_KEY_NEW = '0xf1656f24c74cd1d8'
-        MARIADB_MIRROR  = 'nyc2.mirrors.digitalocean.com'
+        # Archive mirror contains more versions than the main mirror, so we use it by default
+        MARIADB_MIRROR  = 'archive.mariadb.org'
 
         def after_prepare
           sh.fold 'mariadb' do
@@ -21,7 +22,7 @@ def after_prepare
             sh.else do
               sh.cmd "apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 #{MARIADB_GPG_KEY_NEW}", sudo: true
             end
-            sh.cmd 'add-apt-repository --yes "deb http://%p/mariadb/repo/%p/ubuntu $TRAVIS_DIST main"' % [MARIADB_MIRROR, mariadb_version], sudo: true
+            sh.cmd 'add-apt-repository --yes "deb http://%p/mariadb-%p/repo/ubuntu/ "$TRAVIS_DIST" main"' % [MARIADB_MIRROR, mariadb_version], sudo: true
             sh.cmd 'travis_apt_get_update', retry: true, echo: true
             sh.cmd "PACKAGES='mariadb-server-#{mariadb_version}'", echo: true
             sh.cmd "if [[ $(lsb_release -cs) = 'precise' ]]; then PACKAGES=\"${PACKAGES} libmariadbclient-dev\"; fi", echo: true

spec/build/addons/mariadb_spec.rb

@@ -21,7 +21,7 @@
 
   it { should include_sexp [:cmd, "service mysql stop", sudo: true] }
   it { should include_sexp [:cmd, "apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 #{Travis::Build::Addons::Mariadb::MARIADB_GPG_KEY_OLD}", sudo: true] }
-  it { should include_sexp [:cmd, 'add-apt-repository --yes "deb http://%p/mariadb/repo/%p/ubuntu $TRAVIS_DIST main"' % [Travis::Build::Addons::Mariadb::MARIADB_MIRROR, config], sudo: true] }
+  it { should include_sexp [:cmd, 'add-apt-repository --yes "deb http://%p/mariadb-%p/repo/ubuntu/ "$TRAVIS_DIST" main"' % [Travis::Build::Addons::Mariadb::MARIADB_MIRROR, config], sudo: true] } 
   it { should include_sexp [:cmd, 'travis_apt_get_update', retry: true, echo: true] }
   it { should include_sexp [:cmd, "PACKAGES='mariadb-server-10.0'", echo: true] }
   it { should include_sexp [:cmd, "rm -rf /var/lib/mysql", sudo: true] }