Skip to content

promotion: always use promotion-quay only #5278

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
deepsm007 wants to merge 1 commit into
base: main
Choose a base branch
from
+3 −6
Draft

promotion: always use promotion-quay only #5278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions pkg/defaults/defaults.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
6 changes: 3 additions & 3 deletions pkg/defaults/defaults_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down Expand Up @@ -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{
Expand All @@ -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{
Expand Down