@@ -103,42 +103,6 @@ func TestFleetManagedUpgradeUnprivilegedFIPS(t *testing.T) {
103103 testFleetManagedUpgrade (t , info , true , true , upgradeOpts ... )
104104}
105105
106- // TestFleetManagedUpgradePrivileged tests that the build under test can retrieve an action from
107- // Fleet and perform the upgrade as a privileged FIPS-capable Elastic Agent. It does not need to test all
108- // the combinations of versions as the standalone tests already perform those tests and
109- // would be redundant.
110- func TestFleetManagedUpgradePrivilegedFIPS (t * testing.T ) {
111- info := define .Require (t , define.Requirements {
112- Group : FleetPrivileged ,
113- Stack : & define.Stack {},
114- OS : []define.OS {
115- {Type : define .Linux },
116- },
117- Local : false , // requires Agent installation
118- Sudo : true , // requires Agent installation
119- FIPS : true ,
120- })
121-
122- // parse the version we are testing
123- currentVersion , err := version .ParseVersion (define .Version ())
124- require .NoError (t , err )
125-
126- // We need to start the upgrade from a FIPS-capable version
127- if ! isFIPSCapableVersion (currentVersion ) {
128- t .Skipf (
129- "Minimum start version of FIPS-capable Agent for running this test is either %q or %q, current start version: %q" ,
130- * upgradetest .Version_8_19_0_SNAPSHOT ,
131- * upgradetest .Version_9_1_0_SNAPSHOT ,
132- currentVersion ,
133- )
134- }
135-
136- // Check that new (post-upgrade) Agent is also FIPS-capable
137- postWatcherSuccessHook := upgradetest .PostUpgradeAgentIsFIPSCapable
138- upgradeOpts := []upgradetest.UpgradeOpt {upgradetest .WithPostWatcherSuccessHook (postWatcherSuccessHook )}
139- testFleetManagedUpgrade (t , info , false , true , upgradeOpts ... )
140- }
141-
142106func testFleetManagedUpgrade (t * testing.T , info * define.Info , unprivileged bool , fips bool , upgradeOpts ... upgradetest.UpgradeOpt ) {
143107 ctx , cancel := context .WithCancel (context .TODO ())
144108 defer cancel ()
0 commit comments