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.

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

Update pip in GHA, rollback PR #9341 #9357

Merged
merged 2 commits into from
Feb 8, 2022
Merged

Update pip in GHA, rollback PR #9341 #9357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d4eec35
Update pip in GHA, rollback PR #9341
Gauravtalreja1 Feb 8, 2022
050ebc1
Add satutils and satclient to repos.yaml
Gauravtalreja1 Feb 8, 2022
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
2 changes: 1 addition & 1 deletion .github/workflows/merge_to_master.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
# link vs compile time ssl implementations can break the environment when installing requirements
# Uninstall pycurl - its likely not installed, but in case the ubuntu-latest packages change
# Then compile and install it with PYCURL_SSL_LIBRARY set to openssl
# pip install -U pip
pip install -U pip
pip uninstall -y pycurl
pip install --compile --no-cache-dir pycurl
pip install -U -r requirements.txt -r requirements-optional.txt
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pull_request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
# link vs compile time ssl implementations can break the environment when installing requirements
# Uninstall pycurl - its likely not installed, but in case the ubuntu-latest packages change
# Then compile and install it with PYCURL_SSL_LIBRARY set to openssl
# pip install -U pip
pip install -U pip
pip uninstall -y pycurl
pip install --compile --no-cache-dir pycurl
pip install -U -r requirements.txt -r requirements-optional.txt
Expand Down
8 changes: 8 additions & 0 deletions conf/repos.yaml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,14 @@ REPOS:
RHEL7: replace-with-rhel7-http-link
RHEL8: replace-with-rhel8-http-link
RHEL9: replace-with-rhel9-http-link
# Satellite's utils repos, and it works for 7.0 and onwards
Copy link
Member

Choose a reason for hiding this comment

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

This is a really ugly crossover in validation of the yamls, since these fields were introduced by sat6-upgrade. Not directly related to this PR or needing to be fixed in this PR. But the fact that GHA will fail for robottelo PRs because satellite6-upgrade added some fields to its repos.yaml is broken.

Copy link
Member

Choose a reason for hiding this comment

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

Yeah! Agree but the checks were failing for upgrade scenarios collections where it's looking for setting in robottelo's confs.

SATUTILS_REPO: replace-with-utils-repository-url
# Satellite's client repos, and it works for 7.0 and onwards
SATCLIENT_REPO:
RHEL6: replace-with-rhel6-http-link
RHEL7: replace-with-rhel7-http-link
RHEL8: replace-with-rhel8-http-link
RHEL9: replace-with-rhel9-http-link
# Downstream Satellite-maintain repo
SATMAINTENANCE_REPO: replace-with-sat-maintain-repo
# Software Collection Repo
Expand Down