This repository has been archived by the owner on Oct 13, 2023. It is now read-only.
[ART-4931] Rebase Dockerfiles according to release schedule #659
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
locriandev
changed the title
locriandev
requested review from
vfreex,
sosiouxme and
jupierce
and removed request for
vfreex
Build #1 |
Build #2 |
Build #3 |
openshift-merge-robot
added
the
needs-rebase
# Conflicts: # doozerlib/distgit.py
openshift-merge-robot
removed
the
needs-rebase
Build #5 |
Build #6 |
Build #7 |
Build #8 |
Build #9 |
Build #10 |
Build #11 |
|
New changes are detected. LGTM label has been removed. |
Build #12 |
sosiouxme
approved these changes
Oct 12, 2022
Comment on lines
+1646
to
+1649
| elif self.runtime.group_config.canonical_builders_from_upstream == 'on': | ||
| return True | ||
| elif self.runtime.group_config.canonical_builders_from_upstream == 'off': | ||
| return False |
There was a problem hiding this comment.
hmm... did you check these still worked? :)
IIRC "on" and "off" get translated into bool equivalents, unless you quote them.
I'd be fine with replacing the rest of this with
Suggested change
| elif self.runtime.group_config.canonical_builders_from_upstream == 'on': | |
| return True | |
| elif self.runtime.group_config.canonical_builders_from_upstream == 'off': | |
| return False | |
| else: | |
| return bool(self.runtime.group_config.canonical_builders_from_upstream) |
(let the validator complain if we enter something bogus)
There was a problem hiding this comment.
>>> bool('on')
True
>>> bool('off')
True
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Ref. ART-4931
In #646, we introduced the
canonical_builders_from_upstreamflag that controls the way we rebase Dockerfiles.With this PR, the flag is turned into a parameter that can (and normally should) be set to 'auto': when this happens, Doozer will clone https://gitlab.cee.redhat.com/ocp-release-schedule/schedule/-/tree/master/ and check the feature freeze date for the relevant OCP version. If we are before feature freeze, it will try to match upstream; otherwise, it will override upstream builders according to ART configuration.
The ReleaseSchedule class is responsible for cloning and parsing the schedule repo. I've decided to make it a Singleton, since we do not want to clone the repo more times than needed (just once), and we currently just want to do it when running
doozer images:rebase(hence not suitable for being initialized with the runtime). Using the Singleton pattern, we can safely typeReleaseSchedule(runtime)as many times as we want without worrying about checking if we already did clone.