diff options
author | Kamil Trzciński <ayufan@ayufan.eu> | 2015-09-16 11:57:40 +0000 |
---|---|---|
committer | Kamil Trzciński <ayufan@ayufan.eu> | 2015-09-16 11:57:40 +0000 |
commit | cccd269da3f5d82c5d14289980d9b52c9cad08db (patch) | |
tree | 2947658dfff44a3873f7d350f0353dbdb7b9b541 /scripts | |
parent | 7d59ba00b9aa1a8be28f1b7ccaa1c628be90aabb (diff) | |
parent | ac8d2eb065e9522679d4eae4649c6815daa5460c (diff) | |
download | gitlab-ce-cccd269da3f5d82c5d14289980d9b52c9cad08db.tar.gz |
Merge branch 'ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g' into 'master'
Merge CI into CE
First step of #2164.
- [x] Merge latest CE master
- [x] Make application start
- [x] Re-use gitlab sessions (remove CI oauth part)
- [x] Get rid of gitlab_ci.yml config
- [x] Make tests start
- [x] Make most CI features works
- [x] Make tests green
- [x] Write migration documentation
- [x] Add CI builds to CE backup
See merge request !1204
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/ci/prepare_build.sh | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/scripts/ci/prepare_build.sh b/scripts/ci/prepare_build.sh new file mode 100755 index 00000000000..864a683a1bd --- /dev/null +++ b/scripts/ci/prepare_build.sh @@ -0,0 +1,22 @@ +#!/bin/bash +if [ -f /.dockerinit ]; then + export FLAGS=(--deployment --path /cache) + + apt-get update -qq + apt-get install -y -qq nodejs + + wget -q http://ftp.de.debian.org/debian/pool/main/p/phantomjs/phantomjs_1.9.0-1+b1_amd64.deb + dpkg -i phantomjs_1.9.0-1+b1_amd64.deb + + cp config/database.yml.mysql config/database.yml + sed -i "s/username:.*/username: root/g" config/database.yml + sed -i "s/password:.*/password:/g" config/database.yml + sed -i "s/# socket:.*/host: mysql/g" config/database.yml +else + export PATH=$HOME/bin:/usr/local/bin:/usr/bin:/bin + + cp config/database.yml.mysql config/database.yml + sed -i "s/username\:.*$/username\: runner/" config/database.yml + sed -i "s/password\:.*$/password\: 'password'/" config/database.yml + sed -i "s/gitlab_ci_test/gitlab_ci_test_$((RANDOM/5000))/" config/database.yml +fi |