Merge branch 'fix_constant_message' into 'master'

Force tmp/tests/gitlab_workhorse/config_path configuration to always recreate

See merge request gitlab-org/gitlab!67730

lib/gitlab/setup_helper.rb

@@ -21,7 +21,7 @@ module Gitlab
       end
     rescue Errno::EEXIST
       puts 'Skipping config.toml generation:'
-      puts 'A configuration file already exists.'
+      puts "A configuration file for #{config_path} already exists."
     rescue ArgumentError => e
       puts 'Skipping config.toml generation:'
       puts e.message

spec/support/helpers/test_env.rb

@@ -265,7 +265,7 @@ module TestEnv
   def setup_workhorse
     # Always rebuild the config file
     if skip_compile_workhorse?
-      Gitlab::SetupHelper::Workhorse.create_configuration(workhorse_dir, nil)
+      Gitlab::SetupHelper::Workhorse.create_configuration(workhorse_dir, nil, force: true)
       return
     end