Skip to content
This repository has been archived by the owner on Jul 18, 2023. It is now read-only.

making sure sat_tools_repos to evaluate correct repos #1527

Merged
merged 1 commit into from
Jun 7, 2019

Conversation

omkarkhatavkar
Copy link

PR Objective

sat_tools repos are not getting evaluated correctly in pre-upgrade failing some scenarios. please check Jira 4195 for more information.
Now it should update the robottelo properties file with correct sat_tools_repo.

Not sure how I can test this up, just to ensure the change is valid enough.

@@ -876,6 +876,7 @@
default: true
description: |
This option allows to use foreman-maintain for satellite-upgrade.
- satellite6-automation-parameters
Copy link
Member

Choose a reason for hiding this comment

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

Not required as we will fetch env. vars from gitlab conf files. Remove this.

Copy link
Author

Choose a reason for hiding this comment

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

We required this for variable SATELLITE_DISTRIBUTION

Copy link
Member

Choose a reason for hiding this comment

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

We are not driving upgrade automation as per SATELLITE_DISTRIBUTION and if we want to, then it requires the framework wide change. And we can do that kinda change is separate PR.

Copy link
Author

Choose a reason for hiding this comment

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

Why Framework Change? I'm just copying all variables from Jenkins upstream Job?
Having SATELLITE_DISTRIBUTION won't make harm to the job. Everything is sourced in prerequisites steps which contain all variables.

I added change because of #902

Copy link
Author

Choose a reason for hiding this comment

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

As discussed offline, SATELLITE_DISTRIBUTION is not only required for the pre-upgrade job but also some more jobs, hence it is better to handle in some other job. I will remove that soon.

@@ -1478,6 +1479,7 @@
- '6.6'
os:
- 'rhel7'
-
Copy link
Member

Choose a reason for hiding this comment

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

Empy ?? Remove it.

Copy link
Author

Choose a reason for hiding this comment

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

that could be a typo I will remove that.

# cdn = 1 for Distributions: GA (default in robottelo.properties)
# cdn = 0 for Distributions: INTERNAL, BETA, ISO
# Sync content and use the below repos only when DISTRIBUTION is not GA
if [[ "${SATELLITE_DISTRIBUTION}" != *"GA"* ]]; then
Copy link
Member

Choose a reason for hiding this comment

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

The 'SATELLITE_DISTRIBUTION' param isn't available here, So just remove this condition.

Copy link
Author

Choose a reason for hiding this comment

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

SATELLITE_DISTRIBUTION is coming from - satellite6-automation-parameters ?

Copy link
Member

Choose a reason for hiding this comment

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

See my comment above about separate PR.

Copy link
Member

@jyejare jyejare left a comment

Choose a reason for hiding this comment

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

ACK pending comments.

@omkarkhatavkar
Copy link
Author

@jyejare @ntkathole @san7ket can you please revisit this PR let me know anything required to do, I have to make sure that this fix should be available for my upgrade tests.

Copy link
Contributor

@ntkathole ntkathole left a comment

Choose a reason for hiding this comment

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

ACK

@jyejare jyejare merged commit 3c281f8 into SatelliteQE:master Jun 7, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants