diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2017-06-01 12:58:11 +0200 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2017-06-01 12:58:11 +0200 |
| commit | aa0d6b07b6a87459e75c69111643b9d6fe8a97c2 (patch) | |
| tree | de3e618a8d778eaef3e31e17e8a3a6659d0866b8 /spec | |
| parent | 0532883622dde885ec2a120616b31aadaad4c5d2 (diff) | |
| parent | 1a438e9f710edfa50408d93a363a240bdcd532c1 (diff) | |
| download | gitlab-ce-aa0d6b07b6a87459e75c69111643b9d6fe8a97c2.tar.gz | |
Merge branch 'feature/gb/migrate-pipeline-stages' into feature/gb/persist-pipeline-stages
* feature/gb/migrate-pipeline-stages:
Use stage_id column in code that needs to know about it
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/lib/gitlab/import_export/safe_model_attributes.yml | 1 | ||||
| -rw-r--r-- | spec/services/ci/retry_build_service_spec.rb | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/spec/lib/gitlab/import_export/safe_model_attributes.yml b/spec/lib/gitlab/import_export/safe_model_attributes.yml index 96054c996fd..2388aea24d9 100644 --- a/spec/lib/gitlab/import_export/safe_model_attributes.yml +++ b/spec/lib/gitlab/import_export/safe_model_attributes.yml @@ -212,6 +212,7 @@ CommitStatus: - stage - trigger_request_id - stage_idx +- stage_id - tag - ref - user_id diff --git a/spec/services/ci/retry_build_service_spec.rb b/spec/services/ci/retry_build_service_spec.rb index 7254e6b357a..2bd5af25847 100644 --- a/spec/services/ci/retry_build_service_spec.rb +++ b/spec/services/ci/retry_build_service_spec.rb @@ -18,11 +18,12 @@ describe Ci::RetryBuildService, :services do updated_at started_at finished_at queued_at erased_by erased_at auto_canceled_by].freeze + # TODO, move stage_id accessor to CLONE_ACCESSOR in a follow-up MR. IGNORE_ACCESSORS = %i[type lock_version target_url base_tags commit_id deployments erased_by_id last_deployment project_id runner_id tag_taggings taggings tags trigger_request_id - user_id auto_canceled_by_id retried].freeze + user_id auto_canceled_by_id retried stage_id].freeze shared_examples 'build duplication' do let(:build) do |