summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2016-09-06 11:36:21 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2016-09-06 11:36:21 +0000
commitdc714b4598f003f7f2cddf4ab5b825874d6e25e9 (patch)
tree262649aadc012a3a1b294b96dc5cf156f27a4e1b
parentb6dc10e4e3ba5ed085300b0ec95bab305c089013 (diff)
parentf6f06eae967cd512c0c573449ce4bd3e177a0f90 (diff)
downloadgitlab-ce-dc714b4598f003f7f2cddf4ab5b825874d6e25e9.tar.gz
Merge branch 'zj-test-migration-paths' into 'master'
Test migration paths ## What does this MR do? It checks out the code base at v8.0.5, seeds the database, and runs all migrations. ## Are there points in the code the reviewer needs to double check? If this might make sense, does this simulate enough what happens in the real world. ## What are the relevant issue numbers? Closes #14549 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4874
-rw-r--r--.gitlab-ci.yml16
-rw-r--r--CHANGELOG1
2 files changed, 16 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index be5614520a5..d0805125a42 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -248,6 +248,21 @@ bundler:audit:
script:
- "bundle exec bundle-audit check --update --ignore OSVDB-115941"
+migration paths:
+ stage: test
+ <<: *use-db
+ only:
+ - master@gitlab-org/gitlab-ce
+ script:
+ - git checkout HEAD .
+ - git fetch --tags
+ - git checkout v8.5.9
+ - 'echo test: unix:/var/opt/gitlab/redis/redis.socket > config/resque.yml'
+ - bundle install --without postgres production --jobs $(nproc) "${FLAGS[@]}" --retry=3
+ - rake db:drop db:create db:schema:load db:seed_fu
+ - git checkout $CI_BUILD_REF
+ - rake db:migrate
+
coverage:
stage: post-test
services: []
@@ -263,7 +278,6 @@ coverage:
- coverage/index.html
- coverage/assets/
-
# Notify slack in the end
notify:slack:
diff --git a/CHANGELOG b/CHANGELOG
index a9783622f35..a5744cadc81 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -24,6 +24,7 @@ v 8.12.0 (unreleased)
- Add white background for no readme container (ClemMakesApps)
- API: Expose issue confidentiality flag. (Robert Schilling)
- Fix markdown anchor icon interaction (ClemMakesApps)
+ - Test migration paths from 8.5 until current release !4874
- Optimistic locking for Issues and Merge Requests (title and description overriding prevention)
- Add `wiki_page_events` to project hook APIs (Ben Boeckel)
- Remove Gitorious import