Skip to content
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.

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

Changes to Master due to new 6.15 and 6.16 #13169

Merged
merged 1 commit into from
Nov 24, 2023

Conversation

jyejare
Copy link
Member

@jyejare jyejare commented Nov 23, 2023

Problem Statement

New 6.15 downstream and master points to stream that is 6.16

Solution

  • Dependabot.yaml cherrypicks to 6.15
  • Robottelo conf and constants now uses 6.16 and 6.15 satellite versions

Related Issues

#13168

@jyejare jyejare requested a review from a team as a code owner November 23, 2023 12:07
@jyejare jyejare added the No-CherryPick PR doesnt need CherryPick to previous branches label Nov 23, 2023
@jyejare jyejare changed the title Changes to Master due to new 6.15 Changes to Master due to new 6.15 and 6.16 Nov 23, 2023
@@ -16,9 +16,9 @@ class Colored(Box):


# This should be updated after each version branch
SATELLITE_VERSION = "6.15"
SATELLITE_VERSION = "6.16"
SATELLITE_OS_VERSION = "8"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or "9" right ? 😉

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not yet confirmed I believe, anyways OS Version would be provided by CI (either 8 or 9) for executing tests in CI! This is been managed by conf files!

If it supports on RHEL 9 , we can switch this drop down version to 9.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we use settings.robottelo.rhel_version here provided by CI instead of this constant, so this can be managed by configs for each job for 8/9?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Gauravtalreja1 Upon looking the usage of this variable it is being used in deciding(returning) capsule repo in SatelliteCapsuleRepository class of repository_mixins.py module.

We should deprecate the use of this variable and switch the url def to use rhel_version conf settings.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I dont block this PR on it as that change has to be cherrypicked back to all zBranches but this PR is not for cherrypicking

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

agree @jyejare , we could start with master for this deprecation or else you could handle this in different PR which we can cherrypick to older branch, but it's no blocker

Copy link
Member

@JacobCallahan JacobCallahan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove any current stream markers

@jyejare
Copy link
Member Author

jyejare commented Nov 23, 2023

@JacobCallahan I did not because I would like Teams to decide and remove the markers on the tests that they think are not applicable for new stream version.

There is possibility that the feature is divided into two parts and hence the test/feature is still applicable with new stream version.

@JacobCallahan
Copy link
Member

@jyejare if you'd like to tag a rep for teams that own tests with that marker, please do.

Our intent or the stream marker is that they are only applied to new tests covering functionality introduced in that stream. These markers should then be purged with each new stream cycle. In the future, this purge will be automated.

conf/robottelo.yaml.template Outdated Show resolved Hide resolved
@@ -16,9 +16,9 @@ class Colored(Box):


# This should be updated after each version branch
SATELLITE_VERSION = "6.15"
SATELLITE_VERSION = "6.16"
SATELLITE_OS_VERSION = "8"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we use settings.robottelo.rhel_version here provided by CI instead of this constant, so this can be managed by configs for each job for 8/9?

@jyejare jyejare requested a review from a team as a code owner November 24, 2023 10:59
@jyejare
Copy link
Member Author

jyejare commented Nov 24, 2023

@JacobCallahan @Gauravtalreja1 Comments addressed !

@JacobCallahan
Copy link
Member

@Gauravtalreja1 please merge if you're satisfied with the changes.

@Gauravtalreja1 Gauravtalreja1 merged commit 9f28e58 into SatelliteQE:master Nov 24, 2023
5 checks passed
shweta83 pushed a commit to shweta83/robottelo that referenced this pull request Apr 10, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
No-CherryPick PR doesnt need CherryPick to previous branches
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants