summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2015-08-03 09:50:54 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2015-08-03 09:50:54 +0000
commit2d83084807592176d04d84010943a385d75d1d7d (patch)
tree1b59a1ca189613046d6d1501987ae236fc6748f4
parentdc51460c34b185ec85cb27c69767878eeb02779a (diff)
parentf9412b3842fd5a1d399cdf8b7a94e901b8efe78b (diff)
downloadgitlab-ci-2d83084807592176d04d84010943a385d75d1d7d.tar.gz
Merge branch 'ci-test' into 'master'
Randomize test database /cc @vsizov See merge request !219
-rw-r--r--CHANGELOG1
-rwxr-xr-xscript/prepare_build.sh1
2 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index b545f1e..05c5e2b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,7 @@ v7.14.0 (unreleased)
- Truncate commit messages after subject line in table
- Adjust CI config to support Docker executors
- Added Application Settings
+ - Randomize test database for CI tests
v7.13.1
- Fix: user could steal specific runner
diff --git a/script/prepare_build.sh b/script/prepare_build.sh
index 836e11f..864a683 100755
--- a/script/prepare_build.sh
+++ b/script/prepare_build.sh
@@ -18,4 +18,5 @@ else
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