diff --git a/acceptance/config/git/options.rb b/acceptance/config/git/options.rb index 1056c4133..9a47e1d72 100644 --- a/acceptance/config/git/options.rb +++ b/acceptance/config/git/options.rb @@ -1,18 +1,18 @@ { :install => [ 'facter#stable', 'hiera#stable', 'puppet', ], :pre_suite => [ 'setup/git/pre-suite/000_EnvSetup.rb', 'setup/git/pre-suite/010_TestSetup.rb', 'setup/git/pre-suite/020_PuppetUserAndGroup.rb', 'setup/common/pre-suite/025_StopFirewall.rb', 'setup/git/pre-suite/030_PuppetMasterSanity.rb', 'setup/common/pre-suite/040_ValidateSignCert.rb', 'setup/git/pre-suite/060_InstallModules.rb', - 'setup/git/pre-suite/070_InstalCACerts.rb', + 'setup/common/pre-suite/070_InstallCACerts.rb', 'setup/common/pre-suite/100_SetParser.rb', ], } diff --git a/acceptance/config/packages/options.rb b/acceptance/config/packages/options.rb index 343cbb48a..f7370612d 100644 --- a/acceptance/config/packages/options.rb +++ b/acceptance/config/packages/options.rb @@ -1,11 +1,12 @@ { :type => 'foss-packages', :pre_suite => [ 'setup/packages/pre-suite/010_Install.rb', 'setup/packages/pre-suite/015_PackageHostsPresets.rb', 'setup/common/pre-suite/025_StopFirewall.rb', 'setup/common/pre-suite/040_ValidateSignCert.rb', 'setup/packages/pre-suite/045_EnsureMasterStartedOnPassenger.rb', + 'setup/common/pre-suite/070_InstallCACerts.rb', 'setup/common/pre-suite/100_SetParser.rb', ], } diff --git a/acceptance/setup/git/pre-suite/070_InstalCACerts.rb b/acceptance/setup/common/pre-suite/070_InstallCACerts.rb similarity index 100% rename from acceptance/setup/git/pre-suite/070_InstalCACerts.rb rename to acceptance/setup/common/pre-suite/070_InstallCACerts.rb