Merge pull request #1246 from kylog/issue/fact-1281/cleanup

(FACT-1281) Cleanup

acceptance/Rakefile

@@ -93,11 +93,7 @@ EOS
   tests = ENV['TESTS'] || ENV['TEST']
   tests_opt = "--tests=#{tests}" if tests
 
-  # The 'if ...' suffix conditional below is a temporary measure which should go
-  # away once the pipeline changes are made so that TEST_TARGET is always
-  # intended for use with beaker-hostgenerator. So please remove that
-  # conditional (and this comment) once that pipeline change is made.
-  target = ENV['TEST_TARGET'] if ENV['TEST_TARGET'] && ENV['TEST_TARGET'][-1,1] == 'a'
+  target = ENV['TEST_TARGET']
   if target
     cli = BeakerHostGenerator::CLI.new([target, '--disable-default-role', '--osinfo-version', '1'])
     ENV['CONFIG'] = "tmp/#{target}-#{SecureRandom.uuid}.yaml"