Nick Thomas · @nick.thomas · Adam Niedzielski · Nick Thomas · Adam Niedzielski · Nick Thomas
--- a/app/models/environment.rb
+++ b/app/models/environment.rb
 class Environment < ActiveRecord::Base
+  # Used to generate random suffixes for the cleaned names
+  SUFFIX_CHARS = ('A'..'Z').to_a + ('a'..'z').to_a + ('0'..'9').to_a
+
  belongs_to :project, required: true, validate: true

  has_many :deployments

  before_validation :nullify_external_url
+  before_validation :generate_clean_name, if: ->(env) { !env.clean_name.present? }
--- a/app/models/environment.rb
+++ b/app/models/environment.rb
    self.external_url = nil if self.external_url.blank?
  end

+  def generate_clean_name
+    cleaned = self.name.to_s.gsub(/[^a-z0-9]/i, '-')[0..12]
--- a/db/migrate/20161207231626_add_clean_environment_name.rb 0 → 100644
+++ b/db/migrate/20161207231626_add_clean_environment_name.rb 0 → 100644
+  SUFFIX_CHARS = ('A'..'Z').to_a + ('a'..'z').to_a + ('0'..'9').to_a
+
+  def up
+    environments = Arel::Table.new(:environments)
+
+    add_column :environments, :clean_name, :string
+    finder = environments.project(:id, :name)
+
+    connection.exec_query(finder.to_sql).rows.each do |id, name|
+      updater = Arel::UpdateManager.new(ActiveRecord::Base).
+        table(environments).
+        set(environments[:clean_name] => generate_clean_name(name)).
+        where(environments[:id].eq(id))
+
+      connection.exec_update(updater.to_sql, self.class.name, [])
+    end
--- a/app/models/environment.rb
+++ b/app/models/environment.rb
    self.external_url = nil if self.external_url.blank?
  end

+  def generate_clean_name
+    cleaned = self.name.to_s.gsub(/[^a-z0-9]/i, '-')[0..12]
+    suffix = (0..5).map { SUFFIX_CHARS.sample }.join("")
--- a/app/models/environment.rb
+++ b/app/models/environment.rb
    state :stopped
  end

+  def predefined_variables
+    [
+      { key: 'CI_ENVIRONMENT_NAME', value: name, public: true },
+      { key: 'CI_ENVIRONMENT_NAME_SLUG', value: clean_name, public: true },
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb

    has_many :deployments, as: :deployable

+    # The "environment" field for builds is a String, and is the unexpanded name
+    def persisted_environment
+      @persisted_environment ||= Environment.find_by(
+        name: expanded_environment_name,
+        project_id: project_id
--- a/app/models/environment.rb
+++ b/app/models/environment.rb
            format: { with: Gitlab::Regex.environment_name_regex,
                      message: Gitlab::Regex.environment_name_regex_message }

+  validates :clean_name,
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
      project.build_timeout
    end

-    def variables
+    # Variables whose value does not depend on other variables
+    def simple_variables
      variables = predefined_variables
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
      variables
    end

+    # All variables, including those dependent on other variables
+    def variables
+      variables = simple_variables
--- a/app/services/ci/create_pipeline_builds_service.rb
+++ b/app/services/ci/create_pipeline_builds_service.rb
    def create_build(build_attributes)
      build_attributes = build_attributes.merge(
        pipeline: pipeline,
-        project: pipeline.project,
+        project: project,
        ref: pipeline.ref,
        tag: pipeline.tag,
        user: current_user,
        trigger_request: trigger_request
      )
-      pipeline.builds.create(build_attributes)
+      build = pipeline.builds.create(build_attributes)
+
+      # Create the environment before the build starts. This sets its clean_name
+      # and makes it available as an environment variable
+      project.environments.find_or_create_by(name: build.expanded_environment_name) if
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb

    has_many :deployments, as: :deployable

+    # The "environment" field for builds is a String, and is the unexpanded name
+    def persisted_environment
--- a/app/models/environment.rb
+++ b/app/models/environment.rb
      action.expanded_environment_name == environment
    end
  end
+
+  # An environment name is not necessarily suitable for use in URLs, DNS
+  # or other third-party contexts. Provide a clean version. A clean name
+  # has the following properties:
+  #   * contains only lowercase letters (a-z), numbers (0-9), and '-'
+  #   * begins with a letter
+  #   * has a maximum length of 24 bytes (OpenShift limitation)
+  def generate_clean_name
--- a/app/models/environment.rb
+++ b/app/models/environment.rb
    state :stopped
  end

+  def predefined_variables
+    [
+      { key: 'CI_ENVIRONMENT_NAME', value: name,       public: true },
+      { key: 'CI_ENVIRONMENT_SLUG', value: clean_name, public: true },
--- a/spec/requests/api/environments_spec.rb
+++ b/spec/requests/api/environments_spec.rb
      expect(json_response['external_url']).to eq(url)
    end

+    it "won't allow clean_name to be changed" do
+      clean_name = environment.clean_name
+      api_url = api("/projects/#{project.id}/environments/#{environment.id}", user)
+      put api_url, clean_name: clean_name + "-foo"
+
+      expect(response).to have_http_status(200)
--- a/lib/gitlab/regex.rb
+++ b/lib/gitlab/regex.rb
    def environment_name_regex_message
      "can contain only letters, digits, '-', '_', '/', '$', '{', '}', '.' and spaces"
    end
+
+    def environment_slug_regex
+      @environment_slug_regex ||= /\A[a-z][a-z0-9-]+\z/i.freeze
--- a/db/migrate/20161207231626_add_environment_slug.rb 0 → 100644
+++ b/db/migrate/20161207231626_add_environment_slug.rb 0 → 100644
+# See http://doc.gitlab.com/ce/development/migration_style_guide.html
+# for more information on how to write migrations for GitLab.
+
+class AddEnvironmentSlug < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = true
--- a/db/migrate/20161209153400_add_unique_index_for_environment_slug.rb 0 → 100644
+++ b/db/migrate/20161209153400_add_unique_index_for_environment_slug.rb 0 → 100644
+# See http://doc.gitlab.com/ce/development/migration_style_guide.html
+# for more information on how to write migrations for GitLab.
+
+class AddUniqueIndexForEnvironmentSlug < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = true
--- a/db/migrate/20161207231620_fixup_environment_name_uniqueness.rb 0 → 100644
+++ b/db/migrate/20161207231620_fixup_environment_name_uniqueness.rb 0 → 100644
+      to_sql
+
+    # Now we have the data for all the conflicting rows
+    conflicts = connection.exec_query(finder_sql).rows
+    conflicts.shift # Leave the first row alone
+
+    conflicts.each do |id, name|
+      update_sql =
+        Arel::UpdateManager.new(ActiveRecord::Base).
+        table(environments).
+        set(environments[:name] => name + "-" + id.to_s).
+        where(environments[:id].eq(id)).
+        to_sql
+
+      connection.exec_update(update_sql, self.class.name, [])
+    end
--- a/db/migrate/20161207231621_create_environment_name_unique_index.rb 0 → 100644
+++ b/db/migrate/20161207231621_create_environment_name_unique_index.rb 0 → 100644
+class CreateEnvironmentNameUniqueIndex < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  DOWNTIME = true
+  DOWNTIME_REASON = 'Making a non-unique index into a unique index'
--- a/db/migrate/20161207231626_add_environment_slug.rb 0 → 100644
+++ b/db/migrate/20161207231626_add_environment_slug.rb 0 → 100644
+    end
+
+    change_column_null :environments, :slug, false
+  end
+
+  def down
+    remove_column :environments, :slug
+  end
+
+  # Copy of the Environment#generate_slug implementation
+  def generate_slug(name)
+    # Lowercase letters and numbers only
+    slugified = name.to_s.downcase.gsub(/[^a-z0-9]/, '-')
+
+    # Must start with a letter
+    slugified = "env-" + slugified if ('0'..'9').cover?(slugified[0])