diff --git a/pkg/defaults/defaults.go b/pkg/defaults/defaults.go index 5913e9cd92..c0fcb4e49e 100644 --- a/pkg/defaults/defaults.go +++ b/pkg/defaults/defaults.go @@ -303,9 +303,6 @@ func fromConfig(ctx context.Context, cfg *Config) ([]api.Step, []api.Step, error return nil, nil, fmt.Errorf("cannot promote images, no promotion configuration defined") } - if !api.ConsolidatedQuayPromotion(cfg.CIConfig) { - promotionSteps = append(promotionSteps, releasesteps.PromotionStep(api.PromotionStepName, cfg.CIConfig, requiredNames, cfg.SkippedImages, cfg.JobSpec, cfg.podClient, cfg.PushSecret, registryDomain(cfg.CIConfig.PromotionConfiguration), api.DefaultMirrorFunc, api.DefaultTargetNameFunc, cfg.NodeArchitectures)) - } // Used primarily (only?) by the ci-chat-bot if cfg.CIConfig.PromotionConfiguration.RegistryOverride != "" { logrus.Info("No images to promote to quay.io if the registry is overridden") diff --git a/pkg/defaults/defaults_test.go b/pkg/defaults/defaults_test.go index af8c51adce..ebbcd95936 100644 --- a/pkg/defaults/defaults_test.go +++ b/pkg/defaults/defaults_test.go @@ -1715,7 +1715,7 @@ func TestFromConfig(t *testing.T) { }, promote: true, expectedSteps: []string{"[output-images]", "[images]"}, - expectedPost: []string{"[promotion]", "[promotion-quay]"}, + expectedPost: []string{"[promotion-quay]"}, }, { name: "promote 4.12 consolidated quay", config: api.ReleaseBuildConfiguration{ @@ -1743,7 +1743,7 @@ func TestFromConfig(t *testing.T) { }, promote: true, expectedSteps: []string{"[output-images]", "[images]"}, - expectedPost: []string{"[promotion]", "[promotion-quay]"}, + expectedPost: []string{"[promotion-quay]"}, }, { name: "promote 5.0 legacy quay", config: api.ReleaseBuildConfiguration{ @@ -1757,7 +1757,7 @@ func TestFromConfig(t *testing.T) { }, promote: true, expectedSteps: []string{"[output-images]", "[images]"}, - expectedPost: []string{"[promotion]", "[promotion-quay]"}, + expectedPost: []string{"[promotion-quay]"}, }, { name: "duplicate input images", config: api.ReleaseBuildConfiguration{