| @@ -17,6 +17,10 env: | |||||
| 17 | - "TEST_SUITE=functionals DATABASE_ADAPTER=mysql" |
|
17 | - "TEST_SUITE=functionals DATABASE_ADAPTER=mysql" | |
| 18 | - "TEST_SUITE=integration DATABASE_ADAPTER=mysql" |
|
18 | - "TEST_SUITE=integration DATABASE_ADAPTER=mysql" | |
| 19 | - "TEST_SUITE=ui DATABASE_ADAPTER=mysql" |
|
19 | - "TEST_SUITE=ui DATABASE_ADAPTER=mysql" | |
|
|
20 | - "TEST_SUITE=units DATABASE_ADAPTER=mariadb-10.0" | |||
|
|
21 | - "TEST_SUITE=functionals DATABASE_ADAPTER=mariadb-10.0" | |||
|
|
22 | - "TEST_SUITE=integration DATABASE_ADAPTER=mariadb-10.0" | |||
|
|
23 | - "TEST_SUITE=ui DATABASE_ADAPTER=mariadb-10.0" | |||
| 20 | - "TEST_SUITE=units DATABASE_ADAPTER=sqlite3" |
|
24 | - "TEST_SUITE=units DATABASE_ADAPTER=sqlite3" | |
| 21 | - "TEST_SUITE=functionals DATABASE_ADAPTER=sqlite3" |
|
25 | - "TEST_SUITE=functionals DATABASE_ADAPTER=sqlite3" | |
| 22 | - "TEST_SUITE=integration DATABASE_ADAPTER=sqlite3" |
|
26 | - "TEST_SUITE=integration DATABASE_ADAPTER=sqlite3" | |
| @@ -27,9 +31,22 matrix: | |||||
| 27 | # http://www.redmine.org/issues/19091 |
|
31 | # http://www.redmine.org/issues/19091 | |
| 28 | # https://github.com/jruby/jruby/issues/779 |
|
32 | # https://github.com/jruby/jruby/issues/779 | |
| 29 | - rvm: jruby |
|
33 | - rvm: jruby | |
|
|
34 | # http://www.redmine.org/issues/17460 | |||
|
|
35 | # http://www.redmine.org/issues/19344 | |||
|
|
36 | - env: "TEST_SUITE=units DATABASE_ADAPTER=mariadb-10.0" | |||
| 30 | before_install: |
|
37 | before_install: | |
| 31 | - "sudo apt-get update -qq" |
|
38 | - "sudo apt-get update -qq" | |
| 32 | - "sudo apt-get --no-install-recommends install bzr cvs git mercurial subversion" |
|
39 | - "sudo apt-get --no-install-recommends install bzr cvs git mercurial subversion" | |
|
|
40 | - if [[ $DATABASE_ADAPTER =~ mariadb ]] ; | |||
|
|
41 | then | |||
|
|
42 | sudo service mysql stop ; | |||
|
|
43 | sudo apt-get install python-software-properties ; | |||
|
|
44 | sudo apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xcbcb082a1bb943db ; | |||
|
|
45 | sudo add-apt-repository 'deb http://ftp.osuosl.org/pub/mariadb/repo/10.0/ubuntu precise main' ; | |||
|
|
46 | sudo apt-get update ; | |||
|
|
47 | sudo DEBIAN_FRONTEND=noninteractive apt-get -q --yes --force-yes -f --option DPkg::Options::=--force-confnew install mariadb-server ; | |||
|
|
48 | sudo apt-get install libmariadbd-dev ; | |||
|
|
49 | fi | |||
| 33 | script: |
|
50 | script: | |
| 34 | - "SCMS=bazaar,cvs,subversion,git,mercurial,filesystem" |
|
51 | - "SCMS=bazaar,cvs,subversion,git,mercurial,filesystem" | |
| 35 | - "export SCMS" |
|
52 | - "export SCMS" | |
| @@ -56,7 +56,7 file 'config/database.yml' do | |||||
| 56 | test_db_name = "ci_#{branch}_#{ruby}_test" |
|
56 | test_db_name = "ci_#{branch}_#{ruby}_test" | |
| 57 |
|
57 | |||
| 58 | case database |
|
58 | case database | |
| 59 |
when |
|
59 | when /(mysql|mariadb)/ | |
| 60 | dev_conf = {'adapter' => 'mysql2', |
|
60 | dev_conf = {'adapter' => 'mysql2', | |
| 61 | 'database' => dev_db_name, 'host' => 'localhost', |
|
61 | 'database' => dev_db_name, 'host' => 'localhost', | |
| 62 | 'encoding' => 'utf8'} |
|
62 | 'encoding' => 'utf8'} | |
General Comments 0
You need to be logged in to leave comments.
Login now