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

Jump to bottom

[RFE} Test for upgrading satellite to 6.16 SCA only #14476

Merged
merged 7 commits into from
Jun 5, 2024
Merged

[RFE} Test for upgrading satellite to 6.16 SCA only #14476

merged 7 commits into from
Jun 5, 2024

Conversation

ColeHiggins2
Copy link
Member

Automation for SCA Only

@ColeHiggins2 ColeHiggins2 self-assigned this Mar 21, 2024
@ColeHiggins2 ColeHiggins2 requested a review from a team as a code owner March 21, 2024 15:13
@ColeHiggins2 ColeHiggins2 marked this pull request as draft March 21, 2024 15:13
lhellebr
lhellebr reviewed Mar 26, 2024
View reviewed changes
Copy link
Contributor

@lhellebr lhellebr left a comment

Choose a reason for hiding this comment

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

This is a draft, yet it's marked for review. I've skimmed through it quickly and don't see any obvious issues.

@ColeHiggins2 ColeHiggins2 marked this pull request as ready for review April 1, 2024 13:19
vsedmik
vsedmik requested changes Apr 8, 2024
View reviewed changes
Copy link
Contributor

@vsedmik vsedmik left a comment

Choose a reason for hiding this comment

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

Looks pretty good, only one small suggestion to use GR.

tests/upgrades/test_repository.py Outdated Show resolved Hide resolved
tests/upgrades/test_repository.py Outdated Show resolved Hide resolved
tests/upgrades/test_repository.py
f'echo "Organization.find({org_id}).content_access_mode" | foreman-rake console'
)
assert 'entitlement' not in sca_mode.stdout
assert 'org_environment' in sca_mode.stdout
Copy link
Contributor

Choose a reason for hiding this comment

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

Does this stand for "SCA-only"? I wonder why it's called "org_environment".

Copy link
Member Author

Choose a reason for hiding this comment

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

Thats a question for DEV. But its my understanding that org_environment represents a organization in sca mode in 6.15

vsedmik
vsedmik approved these changes Apr 24, 2024
View reviewed changes
Copy link
Contributor

@vsedmik vsedmik left a comment

Choose a reason for hiding this comment

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

Rebase needed

@ColeHiggins2 ColeHiggins2 added RFE Issues that are requesting an enhancement to robottelo No-CherryPick PR doesnt need CherryPick to previous branches Upgrades Issues and PRs related to upgrades labels Apr 30, 2024
damoore044
damoore044 approved these changes May 1, 2024
View reviewed changes
Copy link
Contributor

@damoore044 damoore044 left a comment

Choose a reason for hiding this comment

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

ack looks good after rebase

vijaysawant
vijaysawant requested changes May 2, 2024
View reviewed changes
Copy link
Contributor

@vijaysawant vijaysawant left a comment

Choose a reason for hiding this comment

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

String format

tests/upgrades/test_repository.py Outdated Show resolved Hide resolved
tests/upgrades/test_repository.py Outdated Show resolved Hide resolved
vijaysawant
vijaysawant approved these changes May 2, 2024
View reviewed changes
Copy link
Contributor

@vijaysawant vijaysawant left a comment

Choose a reason for hiding this comment

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

Ack, requested easy changes.

tests/upgrades/test_repository.py Outdated Show resolved Hide resolved
tests/upgrades/test_repository.py Outdated Show resolved Hide resolved
@ColeHiggins2 ColeHiggins2 force-pushed the test_sca_only_6.16 branch from 3262f6a to bd59f90 Compare May 6, 2024 20:32
Griffin-Sullivan
Griffin-Sullivan approved these changes May 8, 2024
View reviewed changes
Copy link
Contributor

@Griffin-Sullivan Griffin-Sullivan left a comment

Choose a reason for hiding this comment

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

Looks good to me. Non-blocking comments. Did you test this locally? I assume PRT can't test this.

tests/upgrades/test_repository.py Outdated
enabled on host.

"""
_, manifester = upgrade_entitlement_manifest
Copy link
Contributor

Choose a reason for hiding this comment

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

Doesn't look like you're using this variable anywhere

tests/upgrades/test_repository.py
Comment on lines +425 to +432
if rhel_contenthost.os_version.major > 7:
rh_repo_id = target_sat.api_factory.enable_sync_redhat_repo(
constants.REPOS[f'rhel{rhel_contenthost.os_version.major}_bos'], org.id
)
else:
rh_repo_id = target_sat.api_factory.enable_sync_redhat_repo(
constants.REPOS[f'rhel{rhel_contenthost.os_version.major}'], org.id
)
Copy link
Contributor

Choose a reason for hiding this comment

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

We really ought to have a method for doing this in enable_sync_redhat_repo.

@ColeHiggins2
Copy link
Member Author

============================= test session starts ==============================
platform linux -- Python 3.11.2, pytest-8.1.1, pluggy-1.4.0
Mandatory Requirements Mismatch: jinja2==3.1.4 pytest-order==1.2.1 PyYAML==6.0.1 cryptography==42.0.7 nailgun @ git+https://github.com/SatelliteQE/nailgun.git@master#egg=nailgun pytest-ibutsu==2.2.4 navmazing==1.2.2 pytest-fixturecollection==0.1.2 python-box==7.1.1 wrapanapi==3.6.0 pytest-xdist==3.6.1 pytest-mock==3.14.0 pytest-services==2.2.1 betelgeuse==1.11.0 apypie==0.4.0 pytest-reportportal==5.4.1 fauxfactory==3.1.1 pyotp==2.9.0 wait-for==1.2.0 dynaconf[vault]==3.2.5 requests==2.32.3 broker[docker]==0.4.9 airgun @ git+https://github.com/SatelliteQE/airgun.git@master#egg=airgun pytest==8.2.1 testimony==2.4.0 deepdiff==7.0.1 tenacity==8.3.0 productmd==1.38 manifester==0.2.3
Optional Requirements Mismatch: pre-commit==3.7.1 sphinx==7.3.7 manage==0.1.15 pytest-cov==5.0.0 redis==5.0.4 flake8==7.0.0 sphinx-autoapi==3.1.1
To update mismatched requirements, run the pytest command with '--update-required-reqs' OR '--update-all-reqs' option.
shared_function enabled - OFF - scope: - storage: file
rootdir: /home/colehiggins/projects/robottelo
configfile: pyproject.toml
plugins: services-2.2.1, ibutsu-2.2.4, anyio-4.2.0, xdist-3.5.0, order-1.2.0, mock-3.14.0, fixturecollection-0.1.2, cov-5.0.0, reportportal-5.4.1
collected 3 items
.
.
.
-- Docs: https://docs.pytest.org/en/stable/how-to/capture-warnings.html
================= 3 passed, 356 warnings in 2223.20s (0:37:03) =================
Finished running tests!

@vsedmik vsedmik merged commit 0119a0f into SatelliteQE:master Jun 5, 2024
8 checks passed
jyejare pushed a commit to jyejare/robottelo that referenced this pull request Oct 19, 2024
@ColeHiggins2 @jyejare
[RFE} Test for upgrading satellite to 6.16 SCA only (SatelliteQE#14476)
3c00172 
* Test for candlepin testing in sca only

* Adding post upgrade test to upgrade scenario

* addressing comments

* addressing comments

* addressing comments quotes

* fixing register call

* removing extra var
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lhellebr lhellebr lhellebr left review comments

@vijaysawant vijaysawant vijaysawant approved these changes

@vsedmik vsedmik vsedmik approved these changes

@Griffin-Sullivan Griffin-Sullivan Griffin-Sullivan approved these changes

@damoore044 damoore044 damoore044 approved these changes

Assignees

@ColeHiggins2 ColeHiggins2

Labels
No-CherryPick PR doesnt need CherryPick to previous branches RFE Issues that are requesting an enhancement to robottelo Upgrades Issues and PRs related to upgrades
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@ColeHiggins2 @lhellebr @vijaysawant @vsedmik @Griffin-Sullivan @damoore044