From 3248ca0467a4bd816f281db1b30ca83df2865edd Mon Sep 17 00:00:00 2001
From: Shinya Maeda <shinya@gitlab.com>
Date: Tue, 24 Apr 2018 17:08:43 +0900
Subject: Add per-project pipeline id

---
 app/models/ci/pipeline.rb                                 |  3 +++
 app/models/internal_id.rb                                 |  2 +-
 .../20180424160449_add_pipeline_iid_to_ci_pipelines.rb    | 15 +++++++++++++++
 db/schema.rb                                              |  1 +
 4 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 db/migrate/20180424160449_add_pipeline_iid_to_ci_pipelines.rb

diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb
index e1b9bc76475..65b282ecec4 100644
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -7,12 +7,15 @@ module Ci
     include Presentable
     include Gitlab::OptimisticLocking
     include Gitlab::Utils::StrongMemoize
+    include AtomicInternalId
 
     belongs_to :project, inverse_of: :pipelines
     belongs_to :user
     belongs_to :auto_canceled_by, class_name: 'Ci::Pipeline'
     belongs_to :pipeline_schedule, class_name: 'Ci::PipelineSchedule'
 
+    has_internal_id :iid, scope: :project, init: ->(s) { s&.project&.pipelines.maximum(:iid) }
+
     has_many :stages
     has_many :statuses, class_name: 'CommitStatus', foreign_key: :commit_id, inverse_of: :pipeline
     has_many :builds, foreign_key: :commit_id, inverse_of: :pipeline
diff --git a/app/models/internal_id.rb b/app/models/internal_id.rb
index 189942c5ad8..dbd82dda06e 100644
--- a/app/models/internal_id.rb
+++ b/app/models/internal_id.rb
@@ -14,7 +14,7 @@ class InternalId < ActiveRecord::Base
   belongs_to :project
   belongs_to :namespace
 
-  enum usage: { issues: 0, merge_requests: 1, deployments: 2, milestones: 3, epics: 4 }
+  enum usage: { issues: 0, merge_requests: 1, deployments: 2, milestones: 3, epics: 4, ci_pipelines: 5 }
 
   validates :usage, presence: true
 
diff --git a/db/migrate/20180424160449_add_pipeline_iid_to_ci_pipelines.rb b/db/migrate/20180424160449_add_pipeline_iid_to_ci_pipelines.rb
new file mode 100644
index 00000000000..d732116e9ce
--- /dev/null
+++ b/db/migrate/20180424160449_add_pipeline_iid_to_ci_pipelines.rb
@@ -0,0 +1,15 @@
+class AddPipelineIidToCiPipelines < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  def up
+    add_column :ci_pipelines, :iid, :integer
+  end
+
+  def down
+    remove_column :ci_pipelines, :iid, :integer
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 10cd1bff125..d4bc075eb2e 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -434,6 +434,7 @@ ActiveRecord::Schema.define(version: 20180425131009) do
     t.integer "config_source"
     t.boolean "protected"
     t.integer "failure_reason"
+    t.integer "iid"
   end
 
   add_index "ci_pipelines", ["auto_canceled_by_id"], name: "index_ci_pipelines_on_auto_canceled_by_id", using: :btree
-- 
cgit v1.2.1


From 332d3d0ef5215c2a363c99c90fb7d31af90a0a5a Mon Sep 17 00:00:00 2001
From: Shinya Maeda <shinya@gitlab.com>
Date: Wed, 25 Apr 2018 21:03:35 +0900
Subject: Change column name to iid_per_project. Add index to project_id and
 iid

---
 .../20180424160449_add_pipeline_iid_to_ci_pipelines.rb    |  4 ++--
 ...0180425205249_add_index_constraints_to_pipeline_iid.rb | 15 +++++++++++++++
 db/schema.rb                                              |  5 +++--
 3 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 db/migrate/20180425205249_add_index_constraints_to_pipeline_iid.rb

diff --git a/db/migrate/20180424160449_add_pipeline_iid_to_ci_pipelines.rb b/db/migrate/20180424160449_add_pipeline_iid_to_ci_pipelines.rb
index d732116e9ce..128377e1c9d 100644
--- a/db/migrate/20180424160449_add_pipeline_iid_to_ci_pipelines.rb
+++ b/db/migrate/20180424160449_add_pipeline_iid_to_ci_pipelines.rb
@@ -6,10 +6,10 @@ class AddPipelineIidToCiPipelines < ActiveRecord::Migration
   disable_ddl_transaction!
 
   def up
-    add_column :ci_pipelines, :iid, :integer
+    add_column :ci_pipelines, :iid_per_project, :integer
   end
 
   def down
-    remove_column :ci_pipelines, :iid, :integer
+    remove_column :ci_pipelines, :iid_per_project, :integer
   end
 end
diff --git a/db/migrate/20180425205249_add_index_constraints_to_pipeline_iid.rb b/db/migrate/20180425205249_add_index_constraints_to_pipeline_iid.rb
new file mode 100644
index 00000000000..7daa7197b7c
--- /dev/null
+++ b/db/migrate/20180425205249_add_index_constraints_to_pipeline_iid.rb
@@ -0,0 +1,15 @@
+class AddIndexConstraintsToPipelineIid < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  def up
+    add_concurrent_index :ci_pipelines, [:project_id, :iid_per_project], unique: true, where: 'iid_per_project IS NOT NULL'
+  end
+
+  def down
+    remove_concurrent_index :ci_pipelines, [:project_id, :iid_per_project]
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index d4bc075eb2e..af838e109b2 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20180425131009) do
+ActiveRecord::Schema.define(version: 20180425205249) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -434,11 +434,12 @@ ActiveRecord::Schema.define(version: 20180425131009) do
     t.integer "config_source"
     t.boolean "protected"
     t.integer "failure_reason"
-    t.integer "iid"
+    t.integer "iid_per_project"
   end
 
   add_index "ci_pipelines", ["auto_canceled_by_id"], name: "index_ci_pipelines_on_auto_canceled_by_id", using: :btree
   add_index "ci_pipelines", ["pipeline_schedule_id"], name: "index_ci_pipelines_on_pipeline_schedule_id", using: :btree
+  add_index "ci_pipelines", ["project_id", "iid_per_project"], name: "index_ci_pipelines_on_project_id_and_iid_per_project", unique: true, where: "(iid_per_project IS NOT NULL)", using: :btree
   add_index "ci_pipelines", ["project_id", "ref", "status", "id"], name: "index_ci_pipelines_on_project_id_and_ref_and_status_and_id", using: :btree
   add_index "ci_pipelines", ["project_id", "sha"], name: "index_ci_pipelines_on_project_id_and_sha", using: :btree
   add_index "ci_pipelines", ["project_id"], name: "index_ci_pipelines_on_project_id", using: :btree
-- 
cgit v1.2.1


From 8192cd70ed109e9c0b7f4670234af11f206694d4 Mon Sep 17 00:00:00 2001
From: Shinya Maeda <shinya@gitlab.com>
Date: Wed, 25 Apr 2018 21:42:46 +0900
Subject: Expose CI_PIPELINE_IID_PER_PROJECT variable

---
 app/models/ci/pipeline.rb  | 3 ++-
 doc/ci/variables/README.md | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb
index 65b282ecec4..3cdb86e7b55 100644
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -14,7 +14,7 @@ module Ci
     belongs_to :auto_canceled_by, class_name: 'Ci::Pipeline'
     belongs_to :pipeline_schedule, class_name: 'Ci::PipelineSchedule'
 
-    has_internal_id :iid, scope: :project, init: ->(s) { s&.project&.pipelines.maximum(:iid) }
+    has_internal_id :iid_per_project, scope: :project, init: ->(s) { s&.project&.pipelines.count }
 
     has_many :stages
     has_many :statuses, class_name: 'CommitStatus', foreign_key: :commit_id, inverse_of: :pipeline
@@ -492,6 +492,7 @@ module Ci
     def predefined_variables
       Gitlab::Ci::Variables::Collection.new
         .append(key: 'CI_PIPELINE_ID', value: id.to_s)
+        .append(key: 'CI_PIPELINE_IID_PER_PROJECT', value: iid_per_project.to_s)
         .append(key: 'CI_CONFIG_PATH', value: ci_yaml_file_path)
         .append(key: 'CI_PIPELINE_SOURCE', value: source.to_s)
     end
diff --git a/doc/ci/variables/README.md b/doc/ci/variables/README.md
index 38a988f4507..8eb0fc5ea49 100644
--- a/doc/ci/variables/README.md
+++ b/doc/ci/variables/README.md
@@ -60,6 +60,7 @@ future GitLab releases.**
 | **CI_RUNNER_REVISION**          | all    | 10.6   | GitLab Runner revision that is executing the current job |
 | **CI_RUNNER_EXECUTABLE_ARCH**   | all    | 10.6   | The OS/architecture of the GitLab Runner executable (note that this is not necessarily the same as the environment of the executor) |
 | **CI_PIPELINE_ID**              | 8.10   | 0.5    | The unique id of the current pipeline that GitLab CI uses internally |
+| **CI_PIPELINE_IID_PER_PROJECT** | 10.8   | all    | The unique id of the current pipeline that GitLab CI uses internally (Incremented per project) |
 | **CI_PIPELINE_TRIGGERED**       | all    | all    | The flag to indicate that job was [triggered] |
 | **CI_PIPELINE_SOURCE**          | 10.0   | all    | Indicates how the pipeline was triggered. Possible options are: `push`, `web`, `trigger`, `schedule`, `api`, and `pipeline`. For pipelines created before GitLab 9.5, this will show as `unknown` |
 | **CI_PROJECT_DIR**              | all    | all    | The full path where the repository is cloned and where the job is run |
-- 
cgit v1.2.1


From 8327ad8d8edffe17870571aff1dd68a6c0bce9e7 Mon Sep 17 00:00:00 2001
From: Shinya Maeda <shinya@gitlab.com>
Date: Wed, 25 Apr 2018 21:44:05 +0900
Subject: Add changelog

---
 changelogs/unreleased/per-project-pipeline-iid.yml | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 changelogs/unreleased/per-project-pipeline-iid.yml

diff --git a/changelogs/unreleased/per-project-pipeline-iid.yml b/changelogs/unreleased/per-project-pipeline-iid.yml
new file mode 100644
index 00000000000..78a513a9986
--- /dev/null
+++ b/changelogs/unreleased/per-project-pipeline-iid.yml
@@ -0,0 +1,5 @@
+---
+title: Add per-project pipeline id
+merge_request: 18558
+author:
+type: added
-- 
cgit v1.2.1


From 787eddd55d3699c73a69c99eb66e6a4b3b63b330 Mon Sep 17 00:00:00 2001
From: Shinya Maeda <shinya@gitlab.com>
Date: Wed, 25 Apr 2018 22:00:11 +0900
Subject: Revert column name change

---
 app/models/ci/pipeline.rb                                          | 4 ++--
 db/migrate/20180424160449_add_pipeline_iid_to_ci_pipelines.rb      | 4 ++--
 db/migrate/20180425205249_add_index_constraints_to_pipeline_iid.rb | 4 ++--
 db/schema.rb                                                       | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb
index 3cdb86e7b55..efab6f4283a 100644
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -14,7 +14,7 @@ module Ci
     belongs_to :auto_canceled_by, class_name: 'Ci::Pipeline'
     belongs_to :pipeline_schedule, class_name: 'Ci::PipelineSchedule'
 
-    has_internal_id :iid_per_project, scope: :project, init: ->(s) { s&.project&.pipelines.count }
+    has_internal_id :iid, scope: :project, init: ->(s) { s&.project&.pipelines.count }
 
     has_many :stages
     has_many :statuses, class_name: 'CommitStatus', foreign_key: :commit_id, inverse_of: :pipeline
@@ -492,7 +492,7 @@ module Ci
     def predefined_variables
       Gitlab::Ci::Variables::Collection.new
         .append(key: 'CI_PIPELINE_ID', value: id.to_s)
-        .append(key: 'CI_PIPELINE_IID_PER_PROJECT', value: iid_per_project.to_s)
+        .append(key: 'CI_PIPELINE_IID_PER_PROJECT', value: iid.to_s)
         .append(key: 'CI_CONFIG_PATH', value: ci_yaml_file_path)
         .append(key: 'CI_PIPELINE_SOURCE', value: source.to_s)
     end
diff --git a/db/migrate/20180424160449_add_pipeline_iid_to_ci_pipelines.rb b/db/migrate/20180424160449_add_pipeline_iid_to_ci_pipelines.rb
index 128377e1c9d..d732116e9ce 100644
--- a/db/migrate/20180424160449_add_pipeline_iid_to_ci_pipelines.rb
+++ b/db/migrate/20180424160449_add_pipeline_iid_to_ci_pipelines.rb
@@ -6,10 +6,10 @@ class AddPipelineIidToCiPipelines < ActiveRecord::Migration
   disable_ddl_transaction!
 
   def up
-    add_column :ci_pipelines, :iid_per_project, :integer
+    add_column :ci_pipelines, :iid, :integer
   end
 
   def down
-    remove_column :ci_pipelines, :iid_per_project, :integer
+    remove_column :ci_pipelines, :iid, :integer
   end
 end
diff --git a/db/migrate/20180425205249_add_index_constraints_to_pipeline_iid.rb b/db/migrate/20180425205249_add_index_constraints_to_pipeline_iid.rb
index 7daa7197b7c..3fa59b44d5d 100644
--- a/db/migrate/20180425205249_add_index_constraints_to_pipeline_iid.rb
+++ b/db/migrate/20180425205249_add_index_constraints_to_pipeline_iid.rb
@@ -6,10 +6,10 @@ class AddIndexConstraintsToPipelineIid < ActiveRecord::Migration
   disable_ddl_transaction!
 
   def up
-    add_concurrent_index :ci_pipelines, [:project_id, :iid_per_project], unique: true, where: 'iid_per_project IS NOT NULL'
+    add_concurrent_index :ci_pipelines, [:project_id, :iid], unique: true, where: 'iid IS NOT NULL'
   end
 
   def down
-    remove_concurrent_index :ci_pipelines, [:project_id, :iid_per_project]
+    remove_concurrent_index :ci_pipelines, [:project_id, :iid]
   end
 end
diff --git a/db/schema.rb b/db/schema.rb
index af838e109b2..50abe1a8838 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -434,12 +434,12 @@ ActiveRecord::Schema.define(version: 20180425205249) do
     t.integer "config_source"
     t.boolean "protected"
     t.integer "failure_reason"
-    t.integer "iid_per_project"
+    t.integer "iid"
   end
 
   add_index "ci_pipelines", ["auto_canceled_by_id"], name: "index_ci_pipelines_on_auto_canceled_by_id", using: :btree
   add_index "ci_pipelines", ["pipeline_schedule_id"], name: "index_ci_pipelines_on_pipeline_schedule_id", using: :btree
-  add_index "ci_pipelines", ["project_id", "iid_per_project"], name: "index_ci_pipelines_on_project_id_and_iid_per_project", unique: true, where: "(iid_per_project IS NOT NULL)", using: :btree
+  add_index "ci_pipelines", ["project_id", "iid"], name: "index_ci_pipelines_on_project_id_and_iid", unique: true, where: "(iid IS NOT NULL)", using: :btree
   add_index "ci_pipelines", ["project_id", "ref", "status", "id"], name: "index_ci_pipelines_on_project_id_and_ref_and_status_and_id", using: :btree
   add_index "ci_pipelines", ["project_id", "sha"], name: "index_ci_pipelines_on_project_id_and_sha", using: :btree
   add_index "ci_pipelines", ["project_id"], name: "index_ci_pipelines_on_project_id", using: :btree
-- 
cgit v1.2.1


From 35cf604b72ec6cabffc46cc7c2da76fb303525cb Mon Sep 17 00:00:00 2001
From: Shinya Maeda <shinya@gitlab.com>
Date: Mon, 30 Apr 2018 22:25:56 +0900
Subject: Add to_param override to lookup :id path

---
 spec/models/ci/pipeline_spec.rb | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/spec/models/ci/pipeline_spec.rb b/spec/models/ci/pipeline_spec.rb
index dd94515b0a4..51cdf185c9f 100644
--- a/spec/models/ci/pipeline_spec.rb
+++ b/spec/models/ci/pipeline_spec.rb
@@ -35,6 +35,15 @@ describe Ci::Pipeline, :mailer do
     end
   end
 
+  describe 'modules' do
+    it_behaves_like 'AtomicInternalId' do
+      let(:internal_id_attribute) { :iid }
+      let(:instance) { build(:ci_pipeline) }
+      let(:scope_attrs) { { project: instance.project } }
+      let(:usage) { :ci_pipelines }
+    end
+  end
+
   describe '#source' do
     context 'when creating new pipeline' do
       let(:pipeline) do
@@ -173,7 +182,7 @@ describe Ci::Pipeline, :mailer do
     it 'includes all predefined variables in a valid order' do
       keys = subject.map { |variable| variable[:key] }
 
-      expect(keys).to eq %w[CI_PIPELINE_ID CI_CONFIG_PATH CI_PIPELINE_SOURCE]
+      expect(keys).to eq %w[CI_PIPELINE_ID CI_PIPELINE_IID CI_CONFIG_PATH CI_PIPELINE_SOURCE]
     end
   end
 
-- 
cgit v1.2.1


From 58f229af992a9481c9eee3165dc5d14eb1dc7d00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Trzci=C5=84ski?= <ayufan@ayufan.eu>
Date: Thu, 3 May 2018 10:48:23 +0200
Subject: Make Atomic Internal ID work for pipelines

---
 app/models/ci/pipeline.rb                 |  4 +++-
 app/models/concerns/atomic_internal_id.rb | 18 +++++++++++-------
 lib/gitlab/ci/pipeline/chain/create.rb    |  3 +++
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb
index efab6f4283a..0622b9c6918 100644
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -14,7 +14,9 @@ module Ci
     belongs_to :auto_canceled_by, class_name: 'Ci::Pipeline'
     belongs_to :pipeline_schedule, class_name: 'Ci::PipelineSchedule'
 
-    has_internal_id :iid, scope: :project, init: ->(s) { s&.project&.pipelines.count }
+    has_internal_id :iid, scope: :project, presence: false, to_param: false, init: -> do |s|
+      s&.project&.pipelines&.maximum(:iid) || s&.project&.pipelines.count
+    end
 
     has_many :stages
     has_many :statuses, class_name: 'CommitStatus', foreign_key: :commit_id, inverse_of: :pipeline
diff --git a/app/models/concerns/atomic_internal_id.rb b/app/models/concerns/atomic_internal_id.rb
index 22f516a172f..709589a9128 100644
--- a/app/models/concerns/atomic_internal_id.rb
+++ b/app/models/concerns/atomic_internal_id.rb
@@ -25,9 +25,13 @@ module AtomicInternalId
   extend ActiveSupport::Concern
 
   module ClassMethods
-    def has_internal_id(column, scope:, init:) # rubocop:disable Naming/PredicateName
-      before_validation(on: :create) do
+    def has_internal_id(column, scope:, init:, presence: true, to_param: true) # rubocop:disable Naming/PredicateName
+      before_validation :"ensure_#{column}!", on: :create
+      validates column, presence: presence, numericality: true
+
+      define_method("ensure_#{column}!") do
         scope_value = association(scope).reader
+
         if read_attribute(column).blank? && scope_value
           scope_attrs = { scope_value.class.table_name.singularize.to_sym => scope_value }
           usage = self.class.table_name.to_sym
@@ -35,13 +39,13 @@ module AtomicInternalId
           new_iid = InternalId.generate_next(self, scope_attrs, usage, init)
           write_attribute(column, new_iid)
         end
+
+        read_attribute(column)
       end
 
-      validates column, presence: true, numericality: true
+      define_method("to_param") do
+        read_attribute(column)
+      end if to_param
     end
   end
-
-  def to_param
-    iid.to_s
-  end
 end
diff --git a/lib/gitlab/ci/pipeline/chain/create.rb b/lib/gitlab/ci/pipeline/chain/create.rb
index f4c8d5342c1..5967a7a6a58 100644
--- a/lib/gitlab/ci/pipeline/chain/create.rb
+++ b/lib/gitlab/ci/pipeline/chain/create.rb
@@ -6,6 +6,9 @@ module Gitlab
           include Chain::Helpers
 
           def perform!
+            # TODO: allocate next IID outside of transaction
+            pipeline.ensure_iid!
+
             ::Ci::Pipeline.transaction do
               pipeline.save!
 
-- 
cgit v1.2.1


From 07d1d8bd6730015e65bd5123f305bf35b4839237 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Trzci=C5=84ski?= <ayufan@ayufan.eu>
Date: Thu, 3 May 2018 10:50:57 +0200
Subject: Use **CI_PIPELINE_IID**

---
 app/models/ci/pipeline.rb  | 2 +-
 doc/ci/variables/README.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb
index 0622b9c6918..84c5dae24bb 100644
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -494,7 +494,7 @@ module Ci
     def predefined_variables
       Gitlab::Ci::Variables::Collection.new
         .append(key: 'CI_PIPELINE_ID', value: id.to_s)
-        .append(key: 'CI_PIPELINE_IID_PER_PROJECT', value: iid.to_s)
+        .append(key: 'CI_PIPELINE_IID', value: iid.to_s)
         .append(key: 'CI_CONFIG_PATH', value: ci_yaml_file_path)
         .append(key: 'CI_PIPELINE_SOURCE', value: source.to_s)
     end
diff --git a/doc/ci/variables/README.md b/doc/ci/variables/README.md
index 8eb0fc5ea49..2282cc24beb 100644
--- a/doc/ci/variables/README.md
+++ b/doc/ci/variables/README.md
@@ -60,7 +60,7 @@ future GitLab releases.**
 | **CI_RUNNER_REVISION**          | all    | 10.6   | GitLab Runner revision that is executing the current job |
 | **CI_RUNNER_EXECUTABLE_ARCH**   | all    | 10.6   | The OS/architecture of the GitLab Runner executable (note that this is not necessarily the same as the environment of the executor) |
 | **CI_PIPELINE_ID**              | 8.10   | 0.5    | The unique id of the current pipeline that GitLab CI uses internally |
-| **CI_PIPELINE_IID_PER_PROJECT** | 10.8   | all    | The unique id of the current pipeline that GitLab CI uses internally (Incremented per project) |
+| **CI_PIPELINE_IID** | 10.8   | all    | The unique id of the current pipeline scoped to project |
 | **CI_PIPELINE_TRIGGERED**       | all    | all    | The flag to indicate that job was [triggered] |
 | **CI_PIPELINE_SOURCE**          | 10.0   | all    | Indicates how the pipeline was triggered. Possible options are: `push`, `web`, `trigger`, `schedule`, `api`, and `pipeline`. For pipelines created before GitLab 9.5, this will show as `unknown` |
 | **CI_PROJECT_DIR**              | all    | all    | The full path where the repository is cloned and where the job is run |
-- 
cgit v1.2.1


From 0af2ab18fa7914380150c0403289a9d99ea45ded Mon Sep 17 00:00:00 2001
From: Shinya Maeda <shinya@gitlab.com>
Date: Tue, 8 May 2018 14:57:41 +0900
Subject: Decouple to_params from AtomicInternalId concern

---
 app/models/ci/pipeline.rb                 | 2 +-
 app/models/concerns/atomic_internal_id.rb | 6 +-----
 app/models/concerns/iid_routes.rb         | 9 +++++++++
 app/models/deployment.rb                  | 1 +
 app/models/issue.rb                       | 1 +
 app/models/merge_request.rb               | 1 +
 app/models/milestone.rb                   | 1 +
 7 files changed, 15 insertions(+), 6 deletions(-)
 create mode 100644 app/models/concerns/iid_routes.rb

diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb
index 6bd2c42bbd3..d542868f01f 100644
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -14,7 +14,7 @@ module Ci
     belongs_to :auto_canceled_by, class_name: 'Ci::Pipeline'
     belongs_to :pipeline_schedule, class_name: 'Ci::PipelineSchedule'
 
-    has_internal_id :iid, scope: :project, presence: false, to_param: false, init: -> do |s|
+    has_internal_id :iid, scope: :project, presence: false, init: -> do |s|
       s&.project&.pipelines&.maximum(:iid) || s&.project&.pipelines.count
     end
 
diff --git a/app/models/concerns/atomic_internal_id.rb b/app/models/concerns/atomic_internal_id.rb
index 709589a9128..3d867df544f 100644
--- a/app/models/concerns/atomic_internal_id.rb
+++ b/app/models/concerns/atomic_internal_id.rb
@@ -25,7 +25,7 @@ module AtomicInternalId
   extend ActiveSupport::Concern
 
   module ClassMethods
-    def has_internal_id(column, scope:, init:, presence: true, to_param: true) # rubocop:disable Naming/PredicateName
+    def has_internal_id(column, scope:, init:, presence: true) # rubocop:disable Naming/PredicateName
       before_validation :"ensure_#{column}!", on: :create
       validates column, presence: presence, numericality: true
 
@@ -42,10 +42,6 @@ module AtomicInternalId
 
         read_attribute(column)
       end
-
-      define_method("to_param") do
-        read_attribute(column)
-      end if to_param
     end
   end
 end
diff --git a/app/models/concerns/iid_routes.rb b/app/models/concerns/iid_routes.rb
new file mode 100644
index 00000000000..50957e0230d
--- /dev/null
+++ b/app/models/concerns/iid_routes.rb
@@ -0,0 +1,9 @@
+module IIDRoutes
+  ##
+  # This automagically enforces all related routes to use `iid` instead of `id`
+  # If you want to use `iid` for some routes and `id` for other routes, this module should not to be included,
+  # instead you should define `iid` or `id` explictly at each route generators. e.g. pipeline_path(project.id, pipeline.iid)
+  def to_param
+    iid.to_s
+  end
+end
diff --git a/app/models/deployment.rb b/app/models/deployment.rb
index 254764eefde..dac97676348 100644
--- a/app/models/deployment.rb
+++ b/app/models/deployment.rb
@@ -1,5 +1,6 @@
 class Deployment < ActiveRecord::Base
   include AtomicInternalId
+  include IIDRoutes
 
   belongs_to :project, required: true
   belongs_to :environment, required: true
diff --git a/app/models/issue.rb b/app/models/issue.rb
index 0332bfa9371..6d33a67845f 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -2,6 +2,7 @@ require 'carrierwave/orm/activerecord'
 
 class Issue < ActiveRecord::Base
   include AtomicInternalId
+  include IIDRoutes
   include Issuable
   include Noteable
   include Referable
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 628c61d5d69..a14681897fd 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -1,5 +1,6 @@
 class MergeRequest < ActiveRecord::Base
   include AtomicInternalId
+  include IIDRoutes
   include Issuable
   include Noteable
   include Referable
diff --git a/app/models/milestone.rb b/app/models/milestone.rb
index d14e3a4ded5..f143b8452a2 100644
--- a/app/models/milestone.rb
+++ b/app/models/milestone.rb
@@ -9,6 +9,7 @@ class Milestone < ActiveRecord::Base
 
   include CacheMarkdownField
   include AtomicInternalId
+  include IIDRoutes
   include Sortable
   include Referable
   include StripAttribute
-- 
cgit v1.2.1


From 04dc80dbb5cb991172ebeb69b9a20c7b6eef4dbf Mon Sep 17 00:00:00 2001
From: Shinya Maeda <shinya@gitlab.com>
Date: Tue, 8 May 2018 16:01:18 +0900
Subject: Fix spec

---
 app/models/ci/pipeline.rb                                   |  2 +-
 doc/ci/variables/README.md                                  |  2 +-
 spec/models/ci/pipeline_spec.rb                             |  1 +
 .../shared_examples/models/atomic_internal_id_spec.rb       | 13 +++++++++++--
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb
index d542868f01f..e9a56525fde 100644
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -14,7 +14,7 @@ module Ci
     belongs_to :auto_canceled_by, class_name: 'Ci::Pipeline'
     belongs_to :pipeline_schedule, class_name: 'Ci::PipelineSchedule'
 
-    has_internal_id :iid, scope: :project, presence: false, init: -> do |s|
+    has_internal_id :iid, scope: :project, presence: false, init: ->(s) do
       s&.project&.pipelines&.maximum(:iid) || s&.project&.pipelines.count
     end
 
diff --git a/doc/ci/variables/README.md b/doc/ci/variables/README.md
index 7fa293665e0..4a83d4fbe33 100644
--- a/doc/ci/variables/README.md
+++ b/doc/ci/variables/README.md
@@ -63,7 +63,7 @@ future GitLab releases.**
 | **CI_RUNNER_REVISION**          | all    | 10.6   | GitLab Runner revision that is executing the current job |
 | **CI_RUNNER_EXECUTABLE_ARCH**   | all    | 10.6   | The OS/architecture of the GitLab Runner executable (note that this is not necessarily the same as the environment of the executor) |
 | **CI_PIPELINE_ID**              | 8.10   | 0.5    | The unique id of the current pipeline that GitLab CI uses internally |
-| **CI_PIPELINE_IID** | 10.8   | all    | The unique id of the current pipeline scoped to project |
+| **CI_PIPELINE_IID**             | 11.0   | all    | The unique id of the current pipeline scoped to project |
 | **CI_PIPELINE_TRIGGERED**       | all    | all    | The flag to indicate that job was [triggered] |
 | **CI_PIPELINE_SOURCE**          | 10.0   | all    | Indicates how the pipeline was triggered. Possible options are: `push`, `web`, `trigger`, `schedule`, `api`, and `pipeline`. For pipelines created before GitLab 9.5, this will show as `unknown` |
 | **CI_PROJECT_DIR**              | all    | all    | The full path where the repository is cloned and where the job is run |
diff --git a/spec/models/ci/pipeline_spec.rb b/spec/models/ci/pipeline_spec.rb
index 60ba9e62be7..d3e0389cc72 100644
--- a/spec/models/ci/pipeline_spec.rb
+++ b/spec/models/ci/pipeline_spec.rb
@@ -41,6 +41,7 @@ describe Ci::Pipeline, :mailer do
       let(:instance) { build(:ci_pipeline) }
       let(:scope_attrs) { { project: instance.project } }
       let(:usage) { :ci_pipelines }
+      let(:validate_presence) { false }
     end
   end
 
diff --git a/spec/support/shared_examples/models/atomic_internal_id_spec.rb b/spec/support/shared_examples/models/atomic_internal_id_spec.rb
index 6a6e13418a9..1bccb578d79 100644
--- a/spec/support/shared_examples/models/atomic_internal_id_spec.rb
+++ b/spec/support/shared_examples/models/atomic_internal_id_spec.rb
@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-shared_examples_for 'AtomicInternalId' do
+shared_examples_for 'AtomicInternalId' do 
+  let(:validate_presence) { true }
+
   describe '.has_internal_id' do
     describe 'Module inclusion' do
       subject { described_class }
@@ -15,7 +17,14 @@ shared_examples_for 'AtomicInternalId' do
         allow(InternalId).to receive(:generate_next).and_return(nil)
       end
 
-      it { is_expected.to validate_presence_of(internal_id_attribute) }
+      it 'checks presence' do
+        if validate_presence
+          is_expected.to validate_presence_of(internal_id_attribute)
+        else
+          is_expected.not_to validate_presence_of(internal_id_attribute)
+        end
+      end
+
       it { is_expected.to validate_numericality_of(internal_id_attribute) }
     end
 
-- 
cgit v1.2.1


From 30a6fb64dbce39cc0298e805935bb242c2d7b715 Mon Sep 17 00:00:00 2001
From: Shinya Maeda <shinya@gitlab.com>
Date: Thu, 10 May 2018 15:56:47 +0900
Subject: Fix atomic internal id spec to allow generate pipeline

---
 .../shared_examples/models/atomic_internal_id_spec.rb | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/spec/support/shared_examples/models/atomic_internal_id_spec.rb b/spec/support/shared_examples/models/atomic_internal_id_spec.rb
index 1bccb578d79..cd6465675b5 100644
--- a/spec/support/shared_examples/models/atomic_internal_id_spec.rb
+++ b/spec/support/shared_examples/models/atomic_internal_id_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-shared_examples_for 'AtomicInternalId' do 
+shared_examples_for 'AtomicInternalId' do
   let(:validate_presence) { true }
 
   describe '.has_internal_id' do
@@ -11,21 +11,16 @@ shared_examples_for 'AtomicInternalId' do
     end
 
     describe 'Validation' do
-      subject { instance }
-
       before do
-        allow(InternalId).to receive(:generate_next).and_return(nil)
+        allow_any_instance_of(described_class).to receive(:ensure_iid!) {}
       end
 
-      it 'checks presence' do
-        if validate_presence
-          is_expected.to validate_presence_of(internal_id_attribute)
-        else
-          is_expected.not_to validate_presence_of(internal_id_attribute)
-        end
-      end
+      it 'validates presence' do
+        instance.valid?
 
-      it { is_expected.to validate_numericality_of(internal_id_attribute) }
+        expect(instance.errors[:iid]).to include("can't be blank") if validate_presence
+        expect(instance.errors[:iid]).to include("is not a number") # numericality
+      end
     end
 
     describe 'Creating an instance' do
-- 
cgit v1.2.1


From 6a108b8fbd5f1b5c2d8e6b51bb34cda06fe0e5ee Mon Sep 17 00:00:00 2001
From: Shinya Maeda <shinya@gitlab.com>
Date: Thu, 10 May 2018 16:22:43 +0900
Subject: Fix ensure_iid! method override problem

---
 app/models/concerns/atomic_internal_id.rb | 4 ++--
 lib/gitlab/ci/pipeline/chain/create.rb    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/models/concerns/atomic_internal_id.rb b/app/models/concerns/atomic_internal_id.rb
index 3d867df544f..876dd0ee1f2 100644
--- a/app/models/concerns/atomic_internal_id.rb
+++ b/app/models/concerns/atomic_internal_id.rb
@@ -26,10 +26,10 @@ module AtomicInternalId
 
   module ClassMethods
     def has_internal_id(column, scope:, init:, presence: true) # rubocop:disable Naming/PredicateName
-      before_validation :"ensure_#{column}!", on: :create
+      before_validation :"ensure_#{scope}_#{column}!", on: :create
       validates column, presence: presence, numericality: true
 
-      define_method("ensure_#{column}!") do
+      define_method("ensure_#{scope}_#{column}!") do
         scope_value = association(scope).reader
 
         if read_attribute(column).blank? && scope_value
diff --git a/lib/gitlab/ci/pipeline/chain/create.rb b/lib/gitlab/ci/pipeline/chain/create.rb
index 5967a7a6a58..918a0d151fc 100644
--- a/lib/gitlab/ci/pipeline/chain/create.rb
+++ b/lib/gitlab/ci/pipeline/chain/create.rb
@@ -6,8 +6,8 @@ module Gitlab
           include Chain::Helpers
 
           def perform!
-            # TODO: allocate next IID outside of transaction
-            pipeline.ensure_iid!
+            # Allocate next IID outside of transaction
+            pipeline.ensure_project_iid!
 
             ::Ci::Pipeline.transaction do
               pipeline.save!
-- 
cgit v1.2.1


From 910a7d02a812b1203e320d843a77cad2c7069b63 Mon Sep 17 00:00:00 2001
From: Shinya Maeda <shinya@gitlab.com>
Date: Fri, 11 May 2018 15:34:36 +0900
Subject: Remove numericality as it's redandant with integer column and
 validates nil IID

---
 app/models/concerns/atomic_internal_id.rb                      | 2 +-
 spec/lib/gitlab/import_export/safe_model_attributes.yml        | 1 +
 spec/models/ci/build_spec.rb                                   | 1 +
 spec/support/shared_examples/models/atomic_internal_id_spec.rb | 3 +--
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/models/concerns/atomic_internal_id.rb b/app/models/concerns/atomic_internal_id.rb
index 876dd0ee1f2..164c704260e 100644
--- a/app/models/concerns/atomic_internal_id.rb
+++ b/app/models/concerns/atomic_internal_id.rb
@@ -27,7 +27,7 @@ module AtomicInternalId
   module ClassMethods
     def has_internal_id(column, scope:, init:, presence: true) # rubocop:disable Naming/PredicateName
       before_validation :"ensure_#{scope}_#{column}!", on: :create
-      validates column, presence: presence, numericality: true
+      validates column, presence: presence
 
       define_method("ensure_#{scope}_#{column}!") do
         scope_value = association(scope).reader
diff --git a/spec/lib/gitlab/import_export/safe_model_attributes.yml b/spec/lib/gitlab/import_export/safe_model_attributes.yml
index 62da967cf96..2619c6a10d8 100644
--- a/spec/lib/gitlab/import_export/safe_model_attributes.yml
+++ b/spec/lib/gitlab/import_export/safe_model_attributes.yml
@@ -228,6 +228,7 @@ Ci::Pipeline:
 - config_source
 - failure_reason
 - protected
+- iid
 Ci::Stage:
 - id
 - name
diff --git a/spec/models/ci/build_spec.rb b/spec/models/ci/build_spec.rb
index dc810489011..490b1f0b54e 100644
--- a/spec/models/ci/build_spec.rb
+++ b/spec/models/ci/build_spec.rb
@@ -1517,6 +1517,7 @@ describe Ci::Build do
         { key: 'CI_PROJECT_URL', value: project.web_url, public: true },
         { key: 'CI_PROJECT_VISIBILITY', value: 'private', public: true },
         { key: 'CI_PIPELINE_ID', value: pipeline.id.to_s, public: true },
+        { key: 'CI_PIPELINE_IID', value: pipeline.iid.to_s, public: true },
         { key: 'CI_CONFIG_PATH', value: pipeline.ci_yaml_file_path, public: true },
         { key: 'CI_PIPELINE_SOURCE', value: pipeline.source, public: true },
         { key: 'CI_COMMIT_MESSAGE', value: pipeline.git_commit_message, public: true },
diff --git a/spec/support/shared_examples/models/atomic_internal_id_spec.rb b/spec/support/shared_examples/models/atomic_internal_id_spec.rb
index cd6465675b5..ac1cfa47def 100644
--- a/spec/support/shared_examples/models/atomic_internal_id_spec.rb
+++ b/spec/support/shared_examples/models/atomic_internal_id_spec.rb
@@ -12,14 +12,13 @@ shared_examples_for 'AtomicInternalId' do
 
     describe 'Validation' do
       before do
-        allow_any_instance_of(described_class).to receive(:ensure_iid!) {}
+        allow_any_instance_of(described_class).to receive(:"ensure_#{scope_attrs.keys.first}_#{internal_id_attribute}!") {}
       end
 
       it 'validates presence' do
         instance.valid?
 
         expect(instance.errors[:iid]).to include("can't be blank") if validate_presence
-        expect(instance.errors[:iid]).to include("is not a number") # numericality
       end
     end
 
-- 
cgit v1.2.1


From 46fa3089c84642170d86799c4f60fe87507e575d Mon Sep 17 00:00:00 2001
From: Shinya Maeda <shinya@gitlab.com>
Date: Fri, 11 May 2018 16:49:18 +0900
Subject: Rescue RecordNotUnique when pipeline is created with non-unique iid

---
 lib/gitlab/ci/pipeline/chain/create.rb             |  2 +-
 spec/lib/gitlab/ci/pipeline/chain/create_spec.rb   | 37 ++++++++++++++++------
 spec/models/ci/pipeline_spec.rb                    |  2 +-
 .../models/atomic_internal_id_spec.rb              |  8 +++--
 4 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/lib/gitlab/ci/pipeline/chain/create.rb b/lib/gitlab/ci/pipeline/chain/create.rb
index 918a0d151fc..e62056766bd 100644
--- a/lib/gitlab/ci/pipeline/chain/create.rb
+++ b/lib/gitlab/ci/pipeline/chain/create.rb
@@ -23,7 +23,7 @@ module Gitlab
                 end
               end
             end
-          rescue ActiveRecord::RecordInvalid => e
+          rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotUnique => e
             error("Failed to persist the pipeline: #{e}")
           end
 
diff --git a/spec/lib/gitlab/ci/pipeline/chain/create_spec.rb b/spec/lib/gitlab/ci/pipeline/chain/create_spec.rb
index 0edc3f315bb..b8ab0135092 100644
--- a/spec/lib/gitlab/ci/pipeline/chain/create_spec.rb
+++ b/spec/lib/gitlab/ci/pipeline/chain/create_spec.rb
@@ -37,21 +37,38 @@ describe Gitlab::Ci::Pipeline::Chain::Create do
   end
 
   context 'when pipeline has validation errors' do
-    let(:pipeline) do
-      build(:ci_pipeline, project: project, ref: nil)
+    shared_examples_for 'expectations' do
+      it 'breaks the chain' do
+        expect(step.break?).to be true
+      end
+  
+      it 'appends validation error' do
+        expect(pipeline.errors.to_a)
+          .to include /Failed to persist the pipeline/
+      end
     end
+    
+    context 'when ref is nil' do
+      let(:pipeline) do
+        build(:ci_pipeline, project: project, ref: nil)
+      end
 
-    before do
-      step.perform!
-    end
+      before do
+        step.perform!
+      end
 
-    it 'breaks the chain' do
-      expect(step.break?).to be true
+      it_behaves_like 'expectations'
     end
 
-    it 'appends validation error' do
-      expect(pipeline.errors.to_a)
-        .to include /Failed to persist the pipeline/
+    context 'when pipeline has a duplicate iid' do
+      before do
+        allow_any_instance_of(Ci::Pipeline).to receive(:ensure_project_iid!) { |p| p.send(:write_attribute, :iid, 1) }
+        create(:ci_pipeline, project: project)
+  
+        step.perform!
+      end
+
+      it_behaves_like 'expectations'
     end
   end
 end
diff --git a/spec/models/ci/pipeline_spec.rb b/spec/models/ci/pipeline_spec.rb
index d3e0389cc72..c10d0eb55da 100644
--- a/spec/models/ci/pipeline_spec.rb
+++ b/spec/models/ci/pipeline_spec.rb
@@ -41,7 +41,7 @@ describe Ci::Pipeline, :mailer do
       let(:instance) { build(:ci_pipeline) }
       let(:scope_attrs) { { project: instance.project } }
       let(:usage) { :ci_pipelines }
-      let(:validate_presence) { false }
+      let(:allow_nil) { true }
     end
   end
 
diff --git a/spec/support/shared_examples/models/atomic_internal_id_spec.rb b/spec/support/shared_examples/models/atomic_internal_id_spec.rb
index ac1cfa47def..dce2622172b 100644
--- a/spec/support/shared_examples/models/atomic_internal_id_spec.rb
+++ b/spec/support/shared_examples/models/atomic_internal_id_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 shared_examples_for 'AtomicInternalId' do
-  let(:validate_presence) { true }
+  let(:allow_nil) { false }
 
   describe '.has_internal_id' do
     describe 'Module inclusion' do
@@ -18,7 +18,11 @@ shared_examples_for 'AtomicInternalId' do
       it 'validates presence' do
         instance.valid?
 
-        expect(instance.errors[:iid]).to include("can't be blank") if validate_presence
+        if allow_nil
+          expect(instance.errors[:iid]).to be_empty
+        else
+          expect(instance.errors[:iid]).to include("can't be blank")
+        end
       end
     end
 
-- 
cgit v1.2.1


From a74184eb5e692ef77fe3be28b1f4a40549c8fcff Mon Sep 17 00:00:00 2001
From: Shinya Maeda <shinya@gitlab.com>
Date: Fri, 11 May 2018 16:52:48 +0900
Subject: Fix static analysys

---
 app/models/ci/pipeline.rb                        | 2 +-
 app/models/concerns/iid_routes.rb                | 2 +-
 app/models/deployment.rb                         | 2 +-
 app/models/issue.rb                              | 2 +-
 app/models/merge_request.rb                      | 2 +-
 app/models/milestone.rb                          | 2 +-
 spec/lib/gitlab/ci/pipeline/chain/create_spec.rb | 6 +++---
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb
index e9a56525fde..accd0f11a9b 100644
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -15,7 +15,7 @@ module Ci
     belongs_to :pipeline_schedule, class_name: 'Ci::PipelineSchedule'
 
     has_internal_id :iid, scope: :project, presence: false, init: ->(s) do
-      s&.project&.pipelines&.maximum(:iid) || s&.project&.pipelines.count
+      s&.project&.pipelines&.maximum(:iid) || s&.project&.pipelines&.count
     end
 
     has_many :stages
diff --git a/app/models/concerns/iid_routes.rb b/app/models/concerns/iid_routes.rb
index 50957e0230d..246748cf52c 100644
--- a/app/models/concerns/iid_routes.rb
+++ b/app/models/concerns/iid_routes.rb
@@ -1,4 +1,4 @@
-module IIDRoutes
+module IidRoutes
   ##
   # This automagically enforces all related routes to use `iid` instead of `id`
   # If you want to use `iid` for some routes and `id` for other routes, this module should not to be included,
diff --git a/app/models/deployment.rb b/app/models/deployment.rb
index dac97676348..ac86e9e8de0 100644
--- a/app/models/deployment.rb
+++ b/app/models/deployment.rb
@@ -1,6 +1,6 @@
 class Deployment < ActiveRecord::Base
   include AtomicInternalId
-  include IIDRoutes
+  include IidRoutes
 
   belongs_to :project, required: true
   belongs_to :environment, required: true
diff --git a/app/models/issue.rb b/app/models/issue.rb
index 6d33a67845f..d0e8fe908e4 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -2,7 +2,7 @@ require 'carrierwave/orm/activerecord'
 
 class Issue < ActiveRecord::Base
   include AtomicInternalId
-  include IIDRoutes
+  include IidRoutes
   include Issuable
   include Noteable
   include Referable
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index a14681897fd..f42d432cc66 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -1,6 +1,6 @@
 class MergeRequest < ActiveRecord::Base
   include AtomicInternalId
-  include IIDRoutes
+  include IidRoutes
   include Issuable
   include Noteable
   include Referable
diff --git a/app/models/milestone.rb b/app/models/milestone.rb
index f143b8452a2..d05dcfd083a 100644
--- a/app/models/milestone.rb
+++ b/app/models/milestone.rb
@@ -9,7 +9,7 @@ class Milestone < ActiveRecord::Base
 
   include CacheMarkdownField
   include AtomicInternalId
-  include IIDRoutes
+  include IidRoutes
   include Sortable
   include Referable
   include StripAttribute
diff --git a/spec/lib/gitlab/ci/pipeline/chain/create_spec.rb b/spec/lib/gitlab/ci/pipeline/chain/create_spec.rb
index b8ab0135092..9c0bedfb6b7 100644
--- a/spec/lib/gitlab/ci/pipeline/chain/create_spec.rb
+++ b/spec/lib/gitlab/ci/pipeline/chain/create_spec.rb
@@ -41,13 +41,13 @@ describe Gitlab::Ci::Pipeline::Chain::Create do
       it 'breaks the chain' do
         expect(step.break?).to be true
       end
-  
+
       it 'appends validation error' do
         expect(pipeline.errors.to_a)
           .to include /Failed to persist the pipeline/
       end
     end
-    
+
     context 'when ref is nil' do
       let(:pipeline) do
         build(:ci_pipeline, project: project, ref: nil)
@@ -64,7 +64,7 @@ describe Gitlab::Ci::Pipeline::Chain::Create do
       before do
         allow_any_instance_of(Ci::Pipeline).to receive(:ensure_project_iid!) { |p| p.send(:write_attribute, :iid, 1) }
         create(:ci_pipeline, project: project)
-  
+
         step.perform!
       end
 
-- 
cgit v1.2.1


From 82a49d0fea1ace87b5619fbc4ed728f43fdef7bd Mon Sep 17 00:00:00 2001
From: Shinya Maeda <shinya@gitlab.com>
Date: Mon, 14 May 2018 17:41:56 +0900
Subject: Clarify scope for AtomicInternalId shared spec

---
 spec/models/ci/pipeline_spec.rb                                | 1 +
 spec/models/deployment_spec.rb                                 | 1 +
 spec/models/issue_spec.rb                                      | 1 +
 spec/models/merge_request_spec.rb                              | 1 +
 spec/models/milestone_spec.rb                                  | 2 ++
 spec/support/shared_examples/models/atomic_internal_id_spec.rb | 6 +++---
 6 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/spec/models/ci/pipeline_spec.rb b/spec/models/ci/pipeline_spec.rb
index c10d0eb55da..e0fe62b39e6 100644
--- a/spec/models/ci/pipeline_spec.rb
+++ b/spec/models/ci/pipeline_spec.rb
@@ -39,6 +39,7 @@ describe Ci::Pipeline, :mailer do
     it_behaves_like 'AtomicInternalId' do
       let(:internal_id_attribute) { :iid }
       let(:instance) { build(:ci_pipeline) }
+      let(:scope) { :project }
       let(:scope_attrs) { { project: instance.project } }
       let(:usage) { :ci_pipelines }
       let(:allow_nil) { true }
diff --git a/spec/models/deployment_spec.rb b/spec/models/deployment_spec.rb
index aee70bcfb29..e01906f4b6c 100644
--- a/spec/models/deployment_spec.rb
+++ b/spec/models/deployment_spec.rb
@@ -20,6 +20,7 @@ describe Deployment do
     it_behaves_like 'AtomicInternalId' do
       let(:internal_id_attribute) { :iid }
       let(:instance) { build(:deployment) }
+      let(:scope) { :project }
       let(:scope_attrs) { { project: instance.project } }
       let(:usage) { :deployments }
     end
diff --git a/spec/models/issue_spec.rb b/spec/models/issue_spec.rb
index 128acf83686..e818fbeb9cf 100644
--- a/spec/models/issue_spec.rb
+++ b/spec/models/issue_spec.rb
@@ -17,6 +17,7 @@ describe Issue do
     it_behaves_like 'AtomicInternalId' do
       let(:internal_id_attribute) { :iid }
       let(:instance) { build(:issue) }
+      let(:scope) { :project }
       let(:scope_attrs) { { project: instance.project } }
       let(:usage) { :issues }
     end
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index 04379e7d2c3..c2ab1259ebf 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -25,6 +25,7 @@ describe MergeRequest do
     it_behaves_like 'AtomicInternalId' do
       let(:internal_id_attribute) { :iid }
       let(:instance) { build(:merge_request) }
+      let(:scope) { :target_project }
       let(:scope_attrs) { { project: instance.target_project } }
       let(:usage) { :merge_requests }
     end
diff --git a/spec/models/milestone_spec.rb b/spec/models/milestone_spec.rb
index 4bb9717d33e..204d6b47832 100644
--- a/spec/models/milestone_spec.rb
+++ b/spec/models/milestone_spec.rb
@@ -6,6 +6,7 @@ describe Milestone do
       it_behaves_like 'AtomicInternalId' do
         let(:internal_id_attribute) { :iid }
         let(:instance) { build(:milestone, project: build(:project), group: nil) }
+        let(:scope) { :project }
         let(:scope_attrs) { { project: instance.project } }
         let(:usage) { :milestones }
       end
@@ -15,6 +16,7 @@ describe Milestone do
       it_behaves_like 'AtomicInternalId' do
         let(:internal_id_attribute) { :iid }
         let(:instance) { build(:milestone, project: nil, group: build(:group)) }
+        let(:scope) { :group }
         let(:scope_attrs) { { namespace: instance.group } }
         let(:usage) { :milestones }
       end
diff --git a/spec/support/shared_examples/models/atomic_internal_id_spec.rb b/spec/support/shared_examples/models/atomic_internal_id_spec.rb
index dce2622172b..a05279364f2 100644
--- a/spec/support/shared_examples/models/atomic_internal_id_spec.rb
+++ b/spec/support/shared_examples/models/atomic_internal_id_spec.rb
@@ -12,16 +12,16 @@ shared_examples_for 'AtomicInternalId' do
 
     describe 'Validation' do
       before do
-        allow_any_instance_of(described_class).to receive(:"ensure_#{scope_attrs.keys.first}_#{internal_id_attribute}!") {}
+        allow_any_instance_of(described_class).to receive(:"ensure_#{scope}_#{internal_id_attribute}!") {}
       end
 
       it 'validates presence' do
         instance.valid?
 
         if allow_nil
-          expect(instance.errors[:iid]).to be_empty
+          expect(instance.errors[internal_id_attribute]).to be_empty
         else
-          expect(instance.errors[:iid]).to include("can't be blank")
+          expect(instance.errors[internal_id_attribute]).to include("can't be blank")
         end
       end
     end
-- 
cgit v1.2.1


From 8e92e25b62ca108de775362e6d2981e54535f094 Mon Sep 17 00:00:00 2001
From: Shinya Maeda <shinya@gitlab.com>
Date: Tue, 22 May 2018 15:21:45 +0900
Subject: Remvoe disable_ddl_transaction! and redandant RecordNotUnique
 exception rescue

---
 ...80424160449_add_pipeline_iid_to_ci_pipelines.rb |  2 --
 lib/gitlab/ci/pipeline/chain/create.rb             |  2 +-
 spec/lib/gitlab/ci/pipeline/chain/create_spec.rb   | 27 +++++-----------------
 3 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/db/migrate/20180424160449_add_pipeline_iid_to_ci_pipelines.rb b/db/migrate/20180424160449_add_pipeline_iid_to_ci_pipelines.rb
index d732116e9ce..e8f0c91d612 100644
--- a/db/migrate/20180424160449_add_pipeline_iid_to_ci_pipelines.rb
+++ b/db/migrate/20180424160449_add_pipeline_iid_to_ci_pipelines.rb
@@ -3,8 +3,6 @@ class AddPipelineIidToCiPipelines < ActiveRecord::Migration
 
   DOWNTIME = false
 
-  disable_ddl_transaction!
-
   def up
     add_column :ci_pipelines, :iid, :integer
   end
diff --git a/lib/gitlab/ci/pipeline/chain/create.rb b/lib/gitlab/ci/pipeline/chain/create.rb
index e62056766bd..918a0d151fc 100644
--- a/lib/gitlab/ci/pipeline/chain/create.rb
+++ b/lib/gitlab/ci/pipeline/chain/create.rb
@@ -23,7 +23,7 @@ module Gitlab
                 end
               end
             end
-          rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotUnique => e
+          rescue ActiveRecord::RecordInvalid => e
             error("Failed to persist the pipeline: #{e}")
           end
 
diff --git a/spec/lib/gitlab/ci/pipeline/chain/create_spec.rb b/spec/lib/gitlab/ci/pipeline/chain/create_spec.rb
index 9c0bedfb6b7..de69a65aee4 100644
--- a/spec/lib/gitlab/ci/pipeline/chain/create_spec.rb
+++ b/spec/lib/gitlab/ci/pipeline/chain/create_spec.rb
@@ -37,17 +37,6 @@ describe Gitlab::Ci::Pipeline::Chain::Create do
   end
 
   context 'when pipeline has validation errors' do
-    shared_examples_for 'expectations' do
-      it 'breaks the chain' do
-        expect(step.break?).to be true
-      end
-
-      it 'appends validation error' do
-        expect(pipeline.errors.to_a)
-          .to include /Failed to persist the pipeline/
-      end
-    end
-
     context 'when ref is nil' do
       let(:pipeline) do
         build(:ci_pipeline, project: project, ref: nil)
@@ -57,18 +46,14 @@ describe Gitlab::Ci::Pipeline::Chain::Create do
         step.perform!
       end
 
-      it_behaves_like 'expectations'
-    end
-
-    context 'when pipeline has a duplicate iid' do
-      before do
-        allow_any_instance_of(Ci::Pipeline).to receive(:ensure_project_iid!) { |p| p.send(:write_attribute, :iid, 1) }
-        create(:ci_pipeline, project: project)
-
-        step.perform!
+      it 'breaks the chain' do
+        expect(step.break?).to be true
       end
 
-      it_behaves_like 'expectations'
+      it 'appends validation error' do
+        expect(pipeline.errors.to_a)
+          .to include /Failed to persist the pipeline/
+      end
     end
   end
 end
-- 
cgit v1.2.1


From 59e1e9710898c4547c79a3d5eef39a3f88d3bd7a Mon Sep 17 00:00:00 2001
From: Shinya Maeda <shinya@gitlab.com>
Date: Wed, 30 May 2018 15:17:09 +0900
Subject: Add build_relations method in  Chain::Populate

---
 lib/gitlab/ci/pipeline/chain/create.rb   |  3 ---
 lib/gitlab/ci/pipeline/chain/populate.rb | 17 +++++++++++++----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/lib/gitlab/ci/pipeline/chain/create.rb b/lib/gitlab/ci/pipeline/chain/create.rb
index 918a0d151fc..f4c8d5342c1 100644
--- a/lib/gitlab/ci/pipeline/chain/create.rb
+++ b/lib/gitlab/ci/pipeline/chain/create.rb
@@ -6,9 +6,6 @@ module Gitlab
           include Chain::Helpers
 
           def perform!
-            # Allocate next IID outside of transaction
-            pipeline.ensure_project_iid!
-
             ::Ci::Pipeline.transaction do
               pipeline.save!
 
diff --git a/lib/gitlab/ci/pipeline/chain/populate.rb b/lib/gitlab/ci/pipeline/chain/populate.rb
index 69b8a8fc68f..7a2a1c6a80b 100644
--- a/lib/gitlab/ci/pipeline/chain/populate.rb
+++ b/lib/gitlab/ci/pipeline/chain/populate.rb
@@ -8,10 +8,7 @@ module Gitlab
           PopulateError = Class.new(StandardError)
 
           def perform!
-            ##
-            # Populate pipeline with block argument of CreatePipelineService#execute.
-            #
-            @command.seeds_block&.call(pipeline)
+            build_relations
 
             ##
             # Populate pipeline with all stages, and stages with builds.
@@ -34,6 +31,18 @@ module Gitlab
           def break?
             pipeline.errors.any?
           end
+
+          private
+
+          def build_relations
+            ##
+            # Populate pipeline with block argument of CreatePipelineService#execute.
+            #
+            @command.seeds_block&.call(pipeline)
+
+            # Allocate next IID. This operation must be outside of transactions of pipeline creations.
+            pipeline.ensure_project_iid!
+          end
         end
       end
     end
-- 
cgit v1.2.1


From 0e22b50df8b269ccae32ab68b9ba26e7eea861b0 Mon Sep 17 00:00:00 2001
From: Shinya Maeda <shinya@gitlab.com>
Date: Wed, 30 May 2018 16:42:55 +0900
Subject: Add spec for variables expression

---
 spec/lib/gitlab/ci/pipeline/chain/create_spec.rb   | 32 ++++++++++------------
 spec/lib/gitlab/ci/pipeline/chain/populate_spec.rb | 24 ++++++++++++++++
 spec/models/ci/pipeline_spec.rb                    | 14 ++++++++++
 3 files changed, 53 insertions(+), 17 deletions(-)

diff --git a/spec/lib/gitlab/ci/pipeline/chain/create_spec.rb b/spec/lib/gitlab/ci/pipeline/chain/create_spec.rb
index de69a65aee4..0edc3f315bb 100644
--- a/spec/lib/gitlab/ci/pipeline/chain/create_spec.rb
+++ b/spec/lib/gitlab/ci/pipeline/chain/create_spec.rb
@@ -37,23 +37,21 @@ describe Gitlab::Ci::Pipeline::Chain::Create do
   end
 
   context 'when pipeline has validation errors' do
-    context 'when ref is nil' do
-      let(:pipeline) do
-        build(:ci_pipeline, project: project, ref: nil)
-      end
-
-      before do
-        step.perform!
-      end
-
-      it 'breaks the chain' do
-        expect(step.break?).to be true
-      end
-
-      it 'appends validation error' do
-        expect(pipeline.errors.to_a)
-          .to include /Failed to persist the pipeline/
-      end
+    let(:pipeline) do
+      build(:ci_pipeline, project: project, ref: nil)
+    end
+
+    before do
+      step.perform!
+    end
+
+    it 'breaks the chain' do
+      expect(step.break?).to be true
+    end
+
+    it 'appends validation error' do
+      expect(pipeline.errors.to_a)
+        .to include /Failed to persist the pipeline/
     end
   end
 end
diff --git a/spec/lib/gitlab/ci/pipeline/chain/populate_spec.rb b/spec/lib/gitlab/ci/pipeline/chain/populate_spec.rb
index 4d7d6951a51..bcfa9f0c282 100644
--- a/spec/lib/gitlab/ci/pipeline/chain/populate_spec.rb
+++ b/spec/lib/gitlab/ci/pipeline/chain/populate_spec.rb
@@ -42,6 +42,10 @@ describe Gitlab::Ci::Pipeline::Chain::Populate do
     it 'correctly assigns user' do
       expect(pipeline.builds).to all(have_attributes(user: user))
     end
+
+    it 'has pipeline iid' do
+      expect(pipeline.iid).to be > 0
+    end
   end
 
   context 'when pipeline is empty' do
@@ -68,6 +72,10 @@ describe Gitlab::Ci::Pipeline::Chain::Populate do
       expect(pipeline.errors.to_a)
         .to include 'No stages / jobs for this pipeline.'
     end
+
+    it 'wastes pipeline iid' do
+      expect(InternalId.ci_pipelines.where(project_id: project.id).last.last_value).to be > 0
+  end
   end
 
   context 'when pipeline has validation errors' do
@@ -87,6 +95,10 @@ describe Gitlab::Ci::Pipeline::Chain::Populate do
       expect(pipeline.errors.to_a)
         .to include 'Failed to build the pipeline!'
     end
+
+    it 'wastes pipeline iid' do
+      expect(InternalId.ci_pipelines.where(project_id: project.id).last.last_value).to be > 0
+  end
   end
 
   context 'when there is a seed blocks present' do
@@ -111,6 +123,12 @@ describe Gitlab::Ci::Pipeline::Chain::Populate do
         expect(pipeline.variables.first.key).to eq 'VAR'
         expect(pipeline.variables.first.value).to eq '123'
       end
+
+      it 'has pipeline iid' do
+        step.perform!
+
+        expect(pipeline.iid).to be > 0
+      end
     end
 
     context 'when seeds block tries to persist some resources' do
@@ -121,6 +139,12 @@ describe Gitlab::Ci::Pipeline::Chain::Populate do
       it 'raises exception' do
         expect { step.perform! }.to raise_error(ActiveRecord::RecordNotSaved)
       end
+
+      it 'does not waste pipeline iid' do
+        step.perform rescue nil
+
+        expect(InternalId.ci_pipelines.where(project_id: project.id).exists?).to be_falsy
+    end
     end
   end
 
diff --git a/spec/models/ci/pipeline_spec.rb b/spec/models/ci/pipeline_spec.rb
index 314cb3a28ed..7d28f2eb86b 100644
--- a/spec/models/ci/pipeline_spec.rb
+++ b/spec/models/ci/pipeline_spec.rb
@@ -397,6 +397,20 @@ describe Ci::Pipeline, :mailer do
           expect(seeds.size).to eq 1
           expect(seeds.dig(0, 0, :name)).to eq 'unit'
         end
+
+        context "when pipeline iid is used for 'only' keyword" do
+          let(:config) do
+            { rspec: { script: 'rspec', only: { variables: ['$CI_PIPELINE_IID == 2'] } },
+              prod: { script: 'cap prod', only: { variables: ['$CI_PIPELINE_IID == 1'] } } }
+          end
+
+          it 'returns stage seeds only when variables expression is truthy' do
+            seeds = pipeline.stage_seeds
+
+            expect(seeds.size).to eq 1
+            expect(seeds.dig(0, 0, :name)).to eq 'prod'
+          end
+        end
       end
     end
 
-- 
cgit v1.2.1


From 4beeb60255f228dc45dbe8f675a3cc59c0ea7773 Mon Sep 17 00:00:00 2001
From: Shinya Maeda <shinya@gitlab.com>
Date: Fri, 1 Jun 2018 14:36:52 +0900
Subject: Fix populate_spec

---
 spec/lib/gitlab/ci/pipeline/chain/populate_spec.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spec/lib/gitlab/ci/pipeline/chain/populate_spec.rb b/spec/lib/gitlab/ci/pipeline/chain/populate_spec.rb
index bcfa9f0c282..feed7728f5a 100644
--- a/spec/lib/gitlab/ci/pipeline/chain/populate_spec.rb
+++ b/spec/lib/gitlab/ci/pipeline/chain/populate_spec.rb
@@ -75,7 +75,7 @@ describe Gitlab::Ci::Pipeline::Chain::Populate do
 
     it 'wastes pipeline iid' do
       expect(InternalId.ci_pipelines.where(project_id: project.id).last.last_value).to be > 0
-  end
+    end
   end
 
   context 'when pipeline has validation errors' do
@@ -98,7 +98,7 @@ describe Gitlab::Ci::Pipeline::Chain::Populate do
 
     it 'wastes pipeline iid' do
       expect(InternalId.ci_pipelines.where(project_id: project.id).last.last_value).to be > 0
-  end
+    end
   end
 
   context 'when there is a seed blocks present' do
@@ -144,7 +144,7 @@ describe Gitlab::Ci::Pipeline::Chain::Populate do
         step.perform rescue nil
 
         expect(InternalId.ci_pipelines.where(project_id: project.id).exists?).to be_falsy
-    end
+      end
     end
   end
 
-- 
cgit v1.2.1


From f7f60ab54ab69fb4d0c3a43406a9809edab7d762 Mon Sep 17 00:00:00 2001
From: Shinya Maeda <shinya@gitlab.com>
Date: Fri, 1 Jun 2018 14:53:00 +0900
Subject: Add spec for variables expressions with pipeline iid

---
 spec/lib/gitlab/ci/pipeline/chain/populate_spec.rb | 45 +++++++++++++++-------
 1 file changed, 32 insertions(+), 13 deletions(-)

diff --git a/spec/lib/gitlab/ci/pipeline/chain/populate_spec.rb b/spec/lib/gitlab/ci/pipeline/chain/populate_spec.rb
index feed7728f5a..6b18c615430 100644
--- a/spec/lib/gitlab/ci/pipeline/chain/populate_spec.rb
+++ b/spec/lib/gitlab/ci/pipeline/chain/populate_spec.rb
@@ -156,22 +156,41 @@ describe Gitlab::Ci::Pipeline::Chain::Populate do
     end
   end
 
-  context 'when using only/except build policies' do
-    let(:config) do
-      { rspec: { script: 'rspec', stage: 'test', only: ['master'] },
-        prod: { script: 'cap prod', stage: 'deploy', only: ['tags'] } }
-    end
+  context 'when variables policy is specified' do
+    context 'when using only/except build policies' do
+      let(:config) do
+        { rspec: { script: 'rspec', stage: 'test', only: ['master'] },
+          prod: { script: 'cap prod', stage: 'deploy', only: ['tags'] } }
+      end
 
-    let(:pipeline) do
-      build(:ci_pipeline, ref: 'master', config: config)
-    end
+      let(:pipeline) do
+        build(:ci_pipeline, ref: 'master', config: config)
+      end
 
-    it 'populates pipeline according to used policies' do
-      step.perform!
+      it 'populates pipeline according to used policies' do
+        step.perform!
 
-      expect(pipeline.stages.size).to eq 1
-      expect(pipeline.stages.first.builds.size).to eq 1
-      expect(pipeline.stages.first.builds.first.name).to eq 'rspec'
+        expect(pipeline.stages.size).to eq 1
+        expect(pipeline.stages.first.builds.size).to eq 1
+        expect(pipeline.stages.first.builds.first.name).to eq 'rspec'
+      end
+
+      context 'when variables expression is specified' do
+        let(:config) do
+          { rspec: { script: 'rspec', only: { variables: ["$CI_PIPELINE_IID == '1'"] } },
+            prod: { script: 'cap prod', only: { variables: ["$CI_PIPELINE_IID == '1000'"] } } }
+        end
+
+        context 'when pipeline iid is the subject' do
+          it 'populates pipeline according to used policies' do
+            step.perform!
+
+            expect(pipeline.stages.size).to eq 1
+            expect(pipeline.stages.first.builds.size).to eq 1
+            expect(pipeline.stages.first.builds.first.name).to eq 'rspec'
+          end 
+        end
+      end
     end
   end
 end
-- 
cgit v1.2.1


From c754b6937c8077304386b3a6b37233e52eacdb3e Mon Sep 17 00:00:00 2001
From: Shinya Maeda <shinya@gitlab.com>
Date: Fri, 1 Jun 2018 15:37:36 +0900
Subject: Clean up presence validation spec

---
 spec/models/ci/pipeline_spec.rb                    |  3 +--
 .../models/atomic_internal_id_spec.rb              | 28 +++++++++++++++-------
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/spec/models/ci/pipeline_spec.rb b/spec/models/ci/pipeline_spec.rb
index 7d28f2eb86b..e03c068b88e 100644
--- a/spec/models/ci/pipeline_spec.rb
+++ b/spec/models/ci/pipeline_spec.rb
@@ -36,13 +36,12 @@ describe Ci::Pipeline, :mailer do
   end
 
   describe 'modules' do
-    it_behaves_like 'AtomicInternalId' do
+    it_behaves_like 'AtomicInternalId', validate_presence: false do
       let(:internal_id_attribute) { :iid }
       let(:instance) { build(:ci_pipeline) }
       let(:scope) { :project }
       let(:scope_attrs) { { project: instance.project } }
       let(:usage) { :ci_pipelines }
-      let(:allow_nil) { true }
     end
   end
 
diff --git a/spec/support/shared_examples/models/atomic_internal_id_spec.rb b/spec/support/shared_examples/models/atomic_internal_id_spec.rb
index a05279364f2..d0cd8da67e1 100644
--- a/spec/support/shared_examples/models/atomic_internal_id_spec.rb
+++ b/spec/support/shared_examples/models/atomic_internal_id_spec.rb
@@ -1,8 +1,6 @@
 require 'spec_helper'
 
-shared_examples_for 'AtomicInternalId' do
-  let(:allow_nil) { false }
-
+shared_examples_for 'AtomicInternalId' do |validate_presence: true|
   describe '.has_internal_id' do
     describe 'Module inclusion' do
       subject { described_class }
@@ -12,18 +10,30 @@ shared_examples_for 'AtomicInternalId' do
 
     describe 'Validation' do
       before do
-        allow_any_instance_of(described_class).to receive(:"ensure_#{scope}_#{internal_id_attribute}!") {}
-      end
+        allow_any_instance_of(described_class).to receive(:"ensure_#{scope}_#{internal_id_attribute}!")
 
-      it 'validates presence' do
         instance.valid?
+      end
 
-        if allow_nil
-          expect(instance.errors[internal_id_attribute]).to be_empty
-        else
+      context 'when presence validattion is required' do
+        before do
+          skip unless validate_presence
+        end
+
+        it 'validates presence' do
           expect(instance.errors[internal_id_attribute]).to include("can't be blank")
         end
       end
+
+      context 'when presence validattion is not required' do
+        before do
+          skip if validate_presence
+        end
+
+        it 'does not validate presence' do
+          expect(instance.errors[internal_id_attribute]).to be_empty
+        end
+      end
     end
 
     describe 'Creating an instance' do
-- 
cgit v1.2.1


From c418d68765eb09c468419ec8f438100cda64a0d4 Mon Sep 17 00:00:00 2001
From: Shinya Maeda <shinya@gitlab.com>
Date: Fri, 1 Jun 2018 15:41:33 +0900
Subject: Remove unneccesary spec

---
 spec/lib/gitlab/ci/pipeline/chain/populate_spec.rb |  2 +-
 spec/models/ci/pipeline_spec.rb                    | 14 --------------
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/spec/lib/gitlab/ci/pipeline/chain/populate_spec.rb b/spec/lib/gitlab/ci/pipeline/chain/populate_spec.rb
index 6b18c615430..ffb2c1d5b0c 100644
--- a/spec/lib/gitlab/ci/pipeline/chain/populate_spec.rb
+++ b/spec/lib/gitlab/ci/pipeline/chain/populate_spec.rb
@@ -188,7 +188,7 @@ describe Gitlab::Ci::Pipeline::Chain::Populate do
             expect(pipeline.stages.size).to eq 1
             expect(pipeline.stages.first.builds.size).to eq 1
             expect(pipeline.stages.first.builds.first.name).to eq 'rspec'
-          end 
+          end
         end
       end
     end
diff --git a/spec/models/ci/pipeline_spec.rb b/spec/models/ci/pipeline_spec.rb
index e03c068b88e..2b9c232743d 100644
--- a/spec/models/ci/pipeline_spec.rb
+++ b/spec/models/ci/pipeline_spec.rb
@@ -396,20 +396,6 @@ describe Ci::Pipeline, :mailer do
           expect(seeds.size).to eq 1
           expect(seeds.dig(0, 0, :name)).to eq 'unit'
         end
-
-        context "when pipeline iid is used for 'only' keyword" do
-          let(:config) do
-            { rspec: { script: 'rspec', only: { variables: ['$CI_PIPELINE_IID == 2'] } },
-              prod: { script: 'cap prod', only: { variables: ['$CI_PIPELINE_IID == 1'] } } }
-          end
-
-          it 'returns stage seeds only when variables expression is truthy' do
-            seeds = pipeline.stage_seeds
-
-            expect(seeds.size).to eq 1
-            expect(seeds.dig(0, 0, :name)).to eq 'prod'
-          end
-        end
       end
     end
 
-- 
cgit v1.2.1


From c89e57842ebf7f395363bcddaeff76bc7b3f7890 Mon Sep 17 00:00:00 2001
From: Shinya Maeda <shinya@gitlab.com>
Date: Fri, 1 Jun 2018 15:46:15 +0900
Subject: Use shared examples for populate spec

---
 spec/lib/gitlab/ci/pipeline/chain/populate_spec.rb | 34 ++++++++++------------
 .../models/atomic_internal_id_spec.rb              |  4 +--
 2 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/spec/lib/gitlab/ci/pipeline/chain/populate_spec.rb b/spec/lib/gitlab/ci/pipeline/chain/populate_spec.rb
index ffb2c1d5b0c..7088233f237 100644
--- a/spec/lib/gitlab/ci/pipeline/chain/populate_spec.rb
+++ b/spec/lib/gitlab/ci/pipeline/chain/populate_spec.rb
@@ -157,6 +157,16 @@ describe Gitlab::Ci::Pipeline::Chain::Populate do
   end
 
   context 'when variables policy is specified' do
+    shared_examples_for 'populates pipeline according to used policies' do
+      it 'populates pipeline according to used policies' do
+        step.perform!
+
+        expect(pipeline.stages.size).to eq 1
+        expect(pipeline.stages.first.builds.size).to eq 1
+        expect(pipeline.stages.first.builds.first.name).to eq 'rspec'
+      end
+    end
+
     context 'when using only/except build policies' do
       let(:config) do
         { rspec: { script: 'rspec', stage: 'test', only: ['master'] },
@@ -167,28 +177,16 @@ describe Gitlab::Ci::Pipeline::Chain::Populate do
         build(:ci_pipeline, ref: 'master', config: config)
       end
 
-      it 'populates pipeline according to used policies' do
-        step.perform!
-
-        expect(pipeline.stages.size).to eq 1
-        expect(pipeline.stages.first.builds.size).to eq 1
-        expect(pipeline.stages.first.builds.first.name).to eq 'rspec'
-      end
+      it_behaves_like 'populates pipeline according to used policies'
 
       context 'when variables expression is specified' do
-        let(:config) do
-          { rspec: { script: 'rspec', only: { variables: ["$CI_PIPELINE_IID == '1'"] } },
-            prod: { script: 'cap prod', only: { variables: ["$CI_PIPELINE_IID == '1000'"] } } }
-        end
-
         context 'when pipeline iid is the subject' do
-          it 'populates pipeline according to used policies' do
-            step.perform!
-
-            expect(pipeline.stages.size).to eq 1
-            expect(pipeline.stages.first.builds.size).to eq 1
-            expect(pipeline.stages.first.builds.first.name).to eq 'rspec'
+          let(:config) do
+            { rspec: { script: 'rspec', only: { variables: ["$CI_PIPELINE_IID == '1'"] } },
+              prod: { script: 'cap prod', only: { variables: ["$CI_PIPELINE_IID == '1000'"] } } }
           end
+
+          it_behaves_like 'populates pipeline according to used policies'
         end
       end
     end
diff --git a/spec/support/shared_examples/models/atomic_internal_id_spec.rb b/spec/support/shared_examples/models/atomic_internal_id_spec.rb
index d0cd8da67e1..7ab1041d17c 100644
--- a/spec/support/shared_examples/models/atomic_internal_id_spec.rb
+++ b/spec/support/shared_examples/models/atomic_internal_id_spec.rb
@@ -15,7 +15,7 @@ shared_examples_for 'AtomicInternalId' do |validate_presence: true|
         instance.valid?
       end
 
-      context 'when presence validattion is required' do
+      context 'when presence validation is required' do
         before do
           skip unless validate_presence
         end
@@ -25,7 +25,7 @@ shared_examples_for 'AtomicInternalId' do |validate_presence: true|
         end
       end
 
-      context 'when presence validattion is not required' do
+      context 'when presence validation is not required' do
         before do
           skip if validate_presence
         end
-- 
cgit v1.2.1


From e8ecae7e0be12e6a1fe0e999d724ab5db9bb8b69 Mon Sep 17 00:00:00 2001
From: Shinya Maeda <shinya@gitlab.com>
Date: Sat, 2 Jun 2018 11:55:42 +0900
Subject: Reveert   build_relations and simply add a line for creating iid

---
 lib/gitlab/ci/pipeline/chain/populate.rb           | 20 +++++++-------------
 spec/lib/gitlab/ci/pipeline/chain/populate_spec.rb |  6 +++---
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/lib/gitlab/ci/pipeline/chain/populate.rb b/lib/gitlab/ci/pipeline/chain/populate.rb
index 7a2a1c6a80b..f34c11ca3c2 100644
--- a/lib/gitlab/ci/pipeline/chain/populate.rb
+++ b/lib/gitlab/ci/pipeline/chain/populate.rb
@@ -8,7 +8,13 @@ module Gitlab
           PopulateError = Class.new(StandardError)
 
           def perform!
-            build_relations
+            # Allocate next IID. This operation must be outside of transactions of pipeline creations.
+            pipeline.ensure_project_iid!
+
+            ##
+            # Populate pipeline with block argument of CreatePipelineService#execute.
+            #
+            @command.seeds_block&.call(pipeline)
 
             ##
             # Populate pipeline with all stages, and stages with builds.
@@ -31,18 +37,6 @@ module Gitlab
           def break?
             pipeline.errors.any?
           end
-
-          private
-
-          def build_relations
-            ##
-            # Populate pipeline with block argument of CreatePipelineService#execute.
-            #
-            @command.seeds_block&.call(pipeline)
-
-            # Allocate next IID. This operation must be outside of transactions of pipeline creations.
-            pipeline.ensure_project_iid!
-          end
         end
       end
     end
diff --git a/spec/lib/gitlab/ci/pipeline/chain/populate_spec.rb b/spec/lib/gitlab/ci/pipeline/chain/populate_spec.rb
index 7088233f237..e1766fc0ec9 100644
--- a/spec/lib/gitlab/ci/pipeline/chain/populate_spec.rb
+++ b/spec/lib/gitlab/ci/pipeline/chain/populate_spec.rb
@@ -140,10 +140,10 @@ describe Gitlab::Ci::Pipeline::Chain::Populate do
         expect { step.perform! }.to raise_error(ActiveRecord::RecordNotSaved)
       end
 
-      it 'does not waste pipeline iid' do
-        step.perform rescue nil
+      it 'wastes pipeline iid' do
+        expect { step.perform! }.to raise_error
 
-        expect(InternalId.ci_pipelines.where(project_id: project.id).exists?).to be_falsy
+        expect(InternalId.ci_pipelines.where(project_id: project.id).exists?).to be_truthy
       end
     end
   end
-- 
cgit v1.2.1


From eb05d475b7e82b943f5a72b8adf41b9bce519382 Mon Sep 17 00:00:00 2001
From: Shinya Maeda <shinya@gitlab.com>
Date: Mon, 4 Jun 2018 12:12:02 +0900
Subject: Fix wording in spec. Add PIPELINE_IID in examples of debugged
 variables in documants.

---
 doc/ci/variables/README.md                         | 3 +++
 spec/lib/gitlab/ci/pipeline/chain/populate_spec.rb | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/doc/ci/variables/README.md b/doc/ci/variables/README.md
index dfea10314b9..aa4395b01a9 100644
--- a/doc/ci/variables/README.md
+++ b/doc/ci/variables/README.md
@@ -353,6 +353,8 @@ Running on runner-8a2f473d-project-1796893-concurrent-0 via runner-8a2f473d-mach
 ++ CI_PROJECT_URL=https://example.com/gitlab-examples/ci-debug-trace
 ++ export CI_PIPELINE_ID=52666
 ++ CI_PIPELINE_ID=52666
+++ export CI_PIPELINE_IID=123
+++ CI_PIPELINE_IID=123
 ++ export CI_RUNNER_ID=1337
 ++ CI_RUNNER_ID=1337
 ++ export CI_RUNNER_DESCRIPTION=shared-runners-manager-1.example.com
@@ -440,6 +442,7 @@ export CI_JOB_MANUAL="true"
 export CI_JOB_TRIGGERED="true"
 export CI_JOB_TOKEN="abcde-1234ABCD5678ef"
 export CI_PIPELINE_ID="1000"
+export CI_PIPELINE_IID="10"
 export CI_PROJECT_ID="34"
 export CI_PROJECT_DIR="/builds/gitlab-org/gitlab-ce"
 export CI_PROJECT_NAME="gitlab-ce"
diff --git a/spec/lib/gitlab/ci/pipeline/chain/populate_spec.rb b/spec/lib/gitlab/ci/pipeline/chain/populate_spec.rb
index e1766fc0ec9..c5a4d9b4778 100644
--- a/spec/lib/gitlab/ci/pipeline/chain/populate_spec.rb
+++ b/spec/lib/gitlab/ci/pipeline/chain/populate_spec.rb
@@ -143,7 +143,7 @@ describe Gitlab::Ci::Pipeline::Chain::Populate do
       it 'wastes pipeline iid' do
         expect { step.perform! }.to raise_error
 
-        expect(InternalId.ci_pipelines.where(project_id: project.id).exists?).to be_truthy
+        expect(InternalId.ci_pipelines.where(project_id: project.id).last.last_value).to be > 0
       end
     end
   end
@@ -157,7 +157,7 @@ describe Gitlab::Ci::Pipeline::Chain::Populate do
   end
 
   context 'when variables policy is specified' do
-    shared_examples_for 'populates pipeline according to used policies' do
+    shared_examples_for 'a correct pipeline' do
       it 'populates pipeline according to used policies' do
         step.perform!
 
@@ -177,7 +177,7 @@ describe Gitlab::Ci::Pipeline::Chain::Populate do
         build(:ci_pipeline, ref: 'master', config: config)
       end
 
-      it_behaves_like 'populates pipeline according to used policies'
+      it_behaves_like 'a correct pipeline'
 
       context 'when variables expression is specified' do
         context 'when pipeline iid is the subject' do
@@ -186,7 +186,7 @@ describe Gitlab::Ci::Pipeline::Chain::Populate do
               prod: { script: 'cap prod', only: { variables: ["$CI_PIPELINE_IID == '1000'"] } } }
           end
 
-          it_behaves_like 'populates pipeline according to used policies'
+          it_behaves_like 'a correct pipeline'
         end
       end
     end
-- 
cgit v1.2.1