@@ -2639,11 +2639,15 @@ include = [ "*.jar", "media/mountain.jpg", "/media/person.png", ]
26392639 })
26402640
26412641 it ("uses provided run image" , func () {
2642+ forceFlag := ""
2643+ if pack .SupportsFeature (invoke .ForceRebase ) {
2644+ forceFlag = "--force"
2645+ }
26422646 output := pack .RunSuccessfully (
26432647 "rebase" , repoName ,
26442648 "--run-image" , runAfter ,
26452649 "--pull-policy" , "never" ,
2646- "--force" ,
2650+ forceFlag ,
26472651 )
26482652
26492653 assert .Contains (output , fmt .Sprintf ("Successfully rebased image '%s'" , repoName ))
@@ -2669,7 +2673,11 @@ include = [ "*.jar", "media/mountain.jpg", "/media/person.png", ]
26692673 })
26702674
26712675 it ("prefers the local mirror" , func () {
2672- output := pack .RunSuccessfully ("rebase" , repoName , "--pull-policy" , "never" , "--force" )
2676+ forceFlag := ""
2677+ if pack .SupportsFeature (invoke .ForceRebase ) {
2678+ forceFlag = "--force"
2679+ }
2680+ output := pack .RunSuccessfully ("rebase" , repoName , "--pull-policy" , "never" , forceFlag )
26732681
26742682 assertOutput := assertions .NewOutputAssertionManager (t , output )
26752683 assertOutput .ReportsSelectingRunImageMirrorFromLocalConfig (localRunImageMirror )
@@ -2724,7 +2732,11 @@ include = [ "*.jar", "media/mountain.jpg", "/media/person.png", ]
27242732 })
27252733
27262734 it ("uses provided run image" , func () {
2727- output := pack .RunSuccessfully ("rebase" , repoName , "--publish" , "--run-image" , runAfter , "--force" )
2735+ forceFlag := ""
2736+ if pack .SupportsFeature (invoke .ForceRebase ) {
2737+ forceFlag = "--force"
2738+ }
2739+ output := pack .RunSuccessfully ("rebase" , repoName , "--publish" , "--run-image" , runAfter , forceFlag )
27282740
27292741 assertions .NewOutputAssertionManager (t , output ).ReportsSuccessfulRebase (repoName )
27302742 assertImage .CanBePulledFromRegistry (repoName )
0 commit comments