Merge pull request #3169 from cpanato/fix_cluster_name

Fix cluster name when testing in Branches
coreos · Apr 10, 2018 · 40542ee · 40542ee
2 parents 21418bd + 269bb69
commit 40542ee
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/tests/rspec/lib/name_generator.rb b/tests/rspec/lib/name_generator.rb
@@ -19,8 +19,10 @@ def self.generate(prefix)
 
   def self.jenkins_env_name(prefix)
     build_id = ENV['BUILD_ID']
-    branch_name = ENV['BRANCH_NAME']
-    name = "#{prefix}-#{branch_name}-#{build_id}"
+    # Resource names containing dots are prohibited on most cloud providers
+    branch_name = ENV['BRANCH_NAME'].to_s.delete('.')
+    short_prefix = prefix.split('-').map { |x| x[0...3] }.join.gsub(/^(.{10,}?).*$/m, '\1')
+    name = "#{short_prefix}-#{branch_name}-#{build_id}"
     name = name[0..(MAX_NAME_LENGTH - RANDOM_HASH_LENGTH - 1)]
     name += SecureRandom.hex[0...RANDOM_HASH_LENGTH]
     name