@@ -31,6 +31,7 @@ import (
3131const (
3232 artifactoryLifecycleMinVersion = "7.68.3"
3333 signingKeyOptionalArtifactoryMinVersion = "7.104.1"
34+ promotionTypeFlagArtifactoryMinVersion = "7.106.1"
3435 gpgKeyPairName = "lc-tests-key-pair"
3536 lcTestdataPath = "lifecycle"
3637 releaseBundlesSpec = "release-bundles-spec.json"
@@ -144,8 +145,7 @@ func TestLifecycleFullFlow(t *testing.T) {
144145 defer deleteReleaseBundle (t , lcManager , tests .LcRbName3 , number3 )
145146
146147 // Promote the last release bundle to prod repo 1.
147- promoteRb (t , lcManager , number3 )
148-
148+ promoteRb (t , lcManager , tests .LcRbName3 , number3 , tests .RtProdRepo1 , "" )
149149 // Assert the artifacts of both the initial release bundles made it to prod repo 1.
150150 assertExpectedArtifacts (t , tests .SearchAllProdRepo1 , tests .GetExpectedLifecycleArtifacts ())
151151 // Assert no artifacts were promoted to prod repo 2.
@@ -181,6 +181,22 @@ func TestImportReleaseBundle(t *testing.T) {
181181 assert .Error (t , err )
182182}
183183
184+ func TestPromoteReleaseBundleWithPromotionTypeFlag (t * testing.T ) {
185+ cleanCallback := initLifecycleTest (t , promotionTypeFlagArtifactoryMinVersion )
186+ defer cleanCallback ()
187+ lcManager := getLcServiceManager (t )
188+
189+ deleteBuilds := uploadBuilds (t )
190+ defer deleteBuilds ()
191+
192+ createRbFromSpec (t , tests .LifecycleBuilds12 , tests .LcRbName1 , number1 , true , false )
193+ defer deleteReleaseBundle (t , lcManager , tests .LcRbName1 , number1 )
194+ assertStatusCompleted (t , lcManager , tests .LcRbName1 , number1 , "" )
195+
196+ promoteRb (t , lcManager , tests .LcRbName1 , number1 , tests .RtProdRepo1 , "move" )
197+ assertStatusCompleted (t , lcManager , tests .LcRbName1 , number1 , "" )
198+ }
199+
184200func deleteExportedReleaseBundle (t * testing.T , rbName string ) {
185201 assert .NoError (t , os .RemoveAll (rbName ))
186202}
@@ -285,16 +301,24 @@ func getOption(option, value string) string {
285301 return fmt .Sprintf ("--%s=%s" , option , value )
286302}
287303
288- func promoteRb (t * testing.T , lcManager * lifecycle.LifecycleServicesManager , rbVersion string ) {
289- output := lcCli . RunCliCmdWithOutput ( t , "rbp" , tests . LcRbName3 , rbVersion , prodEnvironment ,
304+ func promoteRb (t * testing.T , lcManager * lifecycle.LifecycleServicesManager , rbName , rbVersion , promoteRepo , promotionType string ) {
305+ cmdArgs := [] string { "rbp" , rbName , rbVersion , prodEnvironment ,
290306 getOption (cliutils .SigningKey , gpgKeyPairName ),
291- getOption (cliutils .IncludeRepos , tests .RtProdRepo1 ),
292- "--project=default" )
307+ getOption (cliutils .IncludeRepos , promoteRepo ),
308+ "--project=default" }
309+
310+ // Include promotion type if specified
311+ if promotionType != "" {
312+ cmdArgs = append (cmdArgs , getOption (cliutils .PromotionType , promotionType ))
313+ }
314+
315+ output := lcCli .RunCliCmdWithOutput (t , cmdArgs ... )
316+
293317 var promotionResp services.RbPromotionResp
294318 if ! assert .NoError (t , json .Unmarshal ([]byte (output ), & promotionResp )) {
295319 return
296320 }
297- assertStatusCompleted (t , lcManager , tests . LcRbName3 , rbVersion , promotionResp .CreatedMillis .String ())
321+ assertStatusCompleted (t , lcManager , rbName , rbVersion , promotionResp .CreatedMillis .String ())
298322}
299323
300324func getSpecFile (fileName string ) (string , error ) {
0 commit comments