##// END OF EJS Templates
jro_apps » redmine
RSS
Merged r14416 and r14530 from trunk to 2.6-stable...
Toshi MARUYAMA -
r14150:fb49c28d1cab
parent child
Show More
Side by Side Unified
Context file:
r14150:fb49c28d1cab Loading diff...:
Show file before | Show file after | Hide comments
@@ -15,6 +15,24 env:
15 - "SUITE=units DB=postgresql"
15 - "SUITE=units DB=postgresql"
16 - "SUITE=functionals DB=postgresql"
16 - "SUITE=functionals DB=postgresql"
17 - "SUITE=integration DB=postgresql"
17 - "SUITE=integration DB=postgresql"
18 - "SUITE=units DB=postgresql-8.4"
19 - "SUITE=functionals DB=postgresql-8.4"
20 - "SUITE=integration DB=postgresql-8.4"
21 - "SUITE=units DB=postgresql-9.1"
22 - "SUITE=functionals DB=postgresql-9.1"
23 - "SUITE=integration DB=postgresql-9.1"
24 - "SUITE=units DB=postgresql-9.2"
25 - "SUITE=functionals DB=postgresql-9.2"
26 - "SUITE=integration DB=postgresql-9.2"
27 - "SUITE=units DB=postgresql-9.3"
28 - "SUITE=functionals DB=postgresql-9.3"
29 - "SUITE=integration DB=postgresql-9.3"
30 - "SUITE=units DB=postgresql-9.4"
31 - "SUITE=functionals DB=postgresql-9.4"
32 - "SUITE=integration DB=postgresql-9.4"
33 - "SUITE=units DB=postgresql-9.5"
34 - "SUITE=functionals DB=postgresql-9.5"
35 - "SUITE=integration DB=postgresql-9.5"
18 - "SUITE=units DB=mysql"
36 - "SUITE=units DB=mysql"
19 - "SUITE=functionals DB=mysql"
37 - "SUITE=functionals DB=mysql"
20 - "SUITE=integration DB=mysql"
38 - "SUITE=integration DB=mysql"
@@ -37,6 +55,28 before_install:
37 fi
55 fi
38 - "sudo apt-get update -qq"
56 - "sudo apt-get update -qq"
39 - "sudo apt-get --no-install-recommends install bzr cvs git mercurial subversion"
57 - "sudo apt-get --no-install-recommends install bzr cvs git mercurial subversion"
58 - if [[ $DB =~ postgresql ]] ;
59 then
60 if [[ $DB =~ postgresql- ]] ;
61 then
62 PG_VER=`echo $DB | sed -e 's/postgresql-//'` ;
63 sudo service postgresql stop ;
64 sudo apt-get -y -qq --purge remove postgresql libpq-dev libpq5 postgresql-client-common postgresql-common ;
65 sudo rm -rf /var/lib/postgresql ;
66 sudo sh -c "echo deb http://apt.postgresql.org/pub/repos/apt/ precise-pgdg main ${PG_VER} >> /etc/apt/sources.list.d/pgdg.list" ;
67 wget --quiet -O - http://apt.postgresql.org/pub/repos/apt/ACCC4CF8.asc | sudo apt-key add - ;
68 sudo apt-get update -qq ;
69 sudo apt-get -y -o Dpkg::Options::=--force-confdef -o Dpkg::Options::="--force-confnew" install postgresql-${PG_VER} postgresql-contrib-${PG_VER} postgresql-server-dev-${PG_VER} ;
70 echo "local all all trust" | sudo tee /etc/postgresql/${PG_VER}/main/pg_hba.conf ;
71 echo "host all all 127.0.0.1/32 trust" | sudo tee -a /etc/postgresql/${PG_VER}/main/pg_hba.conf ;
72 echo "host all all ::1/128 trust" | sudo tee -a /etc/postgresql/${PG_VER}/main/pg_hba.conf ;
73 sudo service postgresql restart ;
74 fi ;
75 psql --version ;
76 psql -c "SHOW SERVER_VERSION" -U postgres ;
77 psql -c "SHOW SERVER_ENCODING" -U postgres ;
78 psql -c "SHOW DateStyle" -U postgres ;
79 fi
40 script:
80 script:
41 - export DATABASE_ADAPTER=${DB}
81 - export DATABASE_ADAPTER=${DB}
42 - "SCMS=bazaar,cvs,subversion,git,mercurial,filesystem"
82 - "SCMS=bazaar,cvs,subversion,git,mercurial,filesystem"
Show file before | Show file after | Hide comments
@@ -62,7 +62,7 file 'config/database.yml' do
62 dev_conf['password'] = 'jenkins'
62 dev_conf['password'] = 'jenkins'
63 end
63 end
64 test_conf = dev_conf.merge('database' => test_db_name)
64 test_conf = dev_conf.merge('database' => test_db_name)
65 when 'postgresql'
65 when /postgresql/
66 dev_conf = {'adapter' => 'postgresql', 'database' => dev_db_name,
66 dev_conf = {'adapter' => 'postgresql', 'database' => dev_db_name,
67 'host' => 'localhost'}
67 'host' => 'localhost'}
68 if ENV['RUN_ON_NOT_OFFICIAL']
68 if ENV['RUN_ON_NOT_OFFICIAL']
General Comments 0
You need to be logged in to leave comments. Login now