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

[6.15.z] CapsuleContent [CompEval] Destructive tests SCA fixes #15819

Closed
wants to merge 1 commit into from
Closed

[6.15.z] CapsuleContent [CompEval] Destructive tests SCA fixes #15819

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions robottelo/constants/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,6 +410,7 @@
'reposet': REPOSET['rhsclient9'],
'product': PRDS['rhel9'],
'distro': 'rhel9',
'releasever': '9',
'key': PRODUCT_KEY_SAT_CLIENT,
},
'rhst7': {
Expand Down
116 changes: 78 additions & 38 deletions tests/foreman/destructive/test_capsulecontent.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@

"""

from datetime import datetime, timedelta

from box import Box
from fauxfactory import gen_alpha
import pytest
Expand All @@ -24,10 +26,13 @@
@pytest.mark.tier4
@pytest.mark.skip_if_not_set('capsule')
def test_positive_sync_without_deadlock(
target_sat, large_capsule_configured, function_entitlement_manifest_org
target_sat,
function_published_cv,
large_capsule_configured,
function_entitlement_manifest_org,
):
"""Synchronize one bigger repo published in multiple CVs to a blank Capsule.
Assert that the sync task succeeds and no deadlock happens.
"""Synchronize one bigger repo, published in multiple CVs, to a blank Capsule.
Assert that the sync task(s) succeed and no deadlock happens.

:id: 91c6eec9-a582-46ea-9898-bdcaebcea2f0

Expand All @@ -36,61 +41,92 @@ def test_positive_sync_without_deadlock(
policy and running multiple (4 and more) pulpcore workers.

:steps:
1. Sync one bigger repository to the Satellite.
1. Add one bigger repository to the Satellite.
2. Create a Content View, add the repository and publish it.
3. Create several copies of the CV and publish them.
4. Add the Library LCE to the Capsule.
5. Sync the Capsule.
4. Add the Library environment to the Capsule.
5. Synchronize the bigger repository.
6. Capsule sync is triggered once repo sync is finished.

:expectedresults:
1. Sync passes without deadlock.
2. Capsule Content counts match expected, added content from repository.

:customerscenario: true

:BZ: 2062526
"""
# Note: As of now BZ#2122872 prevents us to use the originally intended RHEL7 repo because
# of a memory leak causing Satellite OOM crash in this scenario. Therefore, for now we use
# smaller RHSCL repo instead, which was also capable to hit the deadlock issue, regardless
# the lower rpms count. When the BZ is fixed, reconsider upscale to RHEL7 repo or similar.
repo_id = target_sat.api_factory.enable_rhrepo_and_fetchid(
org = function_entitlement_manifest_org
rh_repo_id = target_sat.api_factory.enable_rhrepo_and_fetchid(
basearch=constants.DEFAULT_ARCHITECTURE,
org_id=function_entitlement_manifest_org.id,
product=constants.REPOS['rhscl7']['product'],
repo=constants.REPOS['rhscl7']['name'],
reposet=constants.REPOSET['rhscl7'],
releasever=constants.REPOS['rhscl7']['releasever'],
org_id=org.id,
product=constants.REPOS['rhel8_aps']['product'],
repo=constants.REPOS['rhel8_aps']['name'],
reposet=constants.REPOSET['rhel8_aps'],
releasever=constants.REPOS['rhel8_aps']['releasever'],
)
repo = target_sat.api.Repository(id=repo_id).read()
repo.sync(timeout='60m')

cv = target_sat.publish_content_view(function_entitlement_manifest_org, repo)

repo = target_sat.api.Repository(id=rh_repo_id).read()
# add large repo to cv and publish
function_published_cv.repository = [repo]
function_published_cv.update(['repository'])
function_published_cv = function_published_cv.read()
function_published_cv.publish()
# copies of content view with added repo
for _ in range(4):
copy_id = target_sat.api.ContentView(id=cv.id).copy(data={'name': gen_alpha()})['id']
copy_id = target_sat.api.ContentView(id=function_published_cv.id).copy(
data={'name': gen_alpha()}
)['id']
copy_cv = target_sat.api.ContentView(id=copy_id).read()
copy_cv.publish()

proxy = large_capsule_configured.nailgun_smart_proxy.read()
proxy.download_policy = 'immediate'
proxy.update(['download_policy'])

nailgun_capsule = large_capsule_configured.nailgun_capsule
lce = target_sat.api.LifecycleEnvironment(
organization=function_entitlement_manifest_org
).search(query={'search': f'name={constants.ENVIRONMENT}'})[0]
# Capsule set to use Library environment
lce = target_sat.api.LifecycleEnvironment(organization=org).search(
query={'search': f'name={constants.ENVIRONMENT}'}
)[0]
nailgun_capsule.content_add_lifecycle_environment(data={'environment_id': lce.id})
result = nailgun_capsule.content_lifecycle_environments()
assert len(result['results']) == 1
assert result['results'][0]['id'] == lce.id
sync_status = nailgun_capsule.content_sync(timeout='90m')
assert sync_status['result'] == 'success', 'Capsule sync task failed.'

# Synchronize repository, Capsule Sync task triggered
repo_sync = repo.sync(timeout='60m')
assert (
'Associating Content' in repo_sync['humanized']['output']
), f'Failed to add new content with repository sync:\n{repo_sync.read()}'
# timestamp: to check capsule task(s) began, exclude priors
# within 240 seconds of end of repo_sync
timestamp = datetime.utcnow().replace(microsecond=0) - timedelta(seconds=240)
capsule_sync_task = target_sat.wait_for_tasks(
search_query=(
f'"{nailgun_capsule.name}"'
' and label=Actions::Katello::CapsuleContent::Sync'
f' and started_at >= {timestamp}'
),
search_rate=2,
max_tries=120,
poll_timeout=5400,
)
assert len(capsule_sync_task) == 1
capsule_sync_task = capsule_sync_task[0].read()
nailgun_capsule = nailgun_capsule.read()
# capsule content reflects expected counts, from synced rh_repo in CVV
repo = repo.read()
updated_content = str(nailgun_capsule.content_counts()['content_view_versions'])
assert f"'rpm': {repo.content_counts['rpm']}" in updated_content
assert f"'erratum': {repo.content_counts['erratum']}" in updated_content
assert f"'package_group': {repo.content_counts['package_group']}" in updated_content


@pytest.mark.tier4
@pytest.mark.skip_if_not_set('capsule')
def test_positive_sync_without_deadlock_after_rpm_trim_changelog(
target_sat, capsule_configured, function_entitlement_manifest_org
target_sat,
capsule_configured,
function_entitlement_manifest_org,
):
"""Promote a CV published with larger repos into multiple LCEs, assign LCEs to blank Capsule.
Assert that the sync task succeeds and no deadlock happens.
Expand All @@ -103,11 +139,11 @@ def test_positive_sync_without_deadlock_after_rpm_trim_changelog(
:steps:
1. Sync a few large repositories to the Satellite.
2. Create a Content View, add the repository and publish it.
3. Promote it to 10+ LCEs and assign them to Capsule
3. Promote it to 10+ LCEs and assign them to Capsule.
4. Sync the Capsule
5. pulpcore-manager rpm-trim-changelogs --changelog-limit x
6. Sync Capsule again and verify no deadlocks occurs.
7. Repeat step 5 with a lesser changelog limit and step 6 again
7. Repeat step 5 with a lesser changelog limit and step 6 again.

:expectedresults:
1. Sync passes without deadlock.
Expand All @@ -120,7 +156,11 @@ def test_positive_sync_without_deadlock_after_rpm_trim_changelog(
rh_repos = []
tasks = []
LCE_COUNT = 10
for name in ['rhel8_bos', 'rhel8_aps']:
for name in [
'rhel8_bos',
'rhsclient8',
'rhel8_aps',
]:
rh_repo_id = target_sat.api_factory.enable_rhrepo_and_fetchid(
basearch=constants.DEFAULT_ARCHITECTURE,
org_id=org.id,
Expand All @@ -129,34 +169,33 @@ def test_positive_sync_without_deadlock_after_rpm_trim_changelog(
reposet=constants.REPOS[name]['reposet'],
releasever=constants.REPOS[name]['releasever'],
)
# Sync step because repo is not synced by default
rh_repo = target_sat.api.Repository(id=rh_repo_id).read()
task = rh_repo.sync(synchronous=False)
tasks.append(task)
rh_repos.append(rh_repo)
for task in tasks:
target_sat.wait_for_tasks(
search_query=(f'id = {task["id"]}'),
poll_timeout=2500,
poll_timeout=3600,
)
task_status = target_sat.api.ForemanTask(id=task['id']).poll()
assert task_status['result'] == 'success'

cv = target_sat.publish_content_view(org, rh_repos)
cvv = cv.version[0].read()
cvv = cv.version[0]
nailgun_capsule = capsule_configured.nailgun_capsule

for i in range(LCE_COUNT):
lce = target_sat.api.LifecycleEnvironment(name=f'lce{i}', organization=org).create()
cvv.promote(data={'environment_ids': lce.id, 'force': False})
cvv.read().promote(data={'environment_ids': lce.read().id, 'force': False})
nailgun_capsule.content_add_lifecycle_environment(data={'environment_id': lce.id})

result = Box(nailgun_capsule.content_lifecycle_environments())
assert len(result.results) == LCE_COUNT
# Verify all LCE have a CV promoted
assert [env.content_views[0].name for env in result.results].count(cv.name) == LCE_COUNT

sync_status = nailgun_capsule.content_sync(timeout='60m')
sync_status = nailgun_capsule.content_sync(timeout='90m')
assert sync_status['result'] == 'success', 'Capsule sync task failed'

# Run rpm-trim-changelogs with changelog-limit below 10 then again sync capsule
Expand All @@ -167,10 +206,11 @@ def test_positive_sync_without_deadlock_after_rpm_trim_changelog(
)
for limit in range(9, 0, -1):
result = target_sat.execute(f'{pulp_cmd}{limit}')
cvv = cvv.read()
assert f'Trimmed changelogs for {cvv.package_count} packages' in result.stdout
target_sat.cli.ContentView.version_republish_repositories({'id': cvv.id, 'force': 'true'})

sync_status = nailgun_capsule.content_sync(timeout='60m')
sync_status = nailgun_capsule.content_sync(timeout='90m')
assert sync_status['result'] == 'success', 'Capsule sync task failed'

# Verify no deadlock detected in the postgres logs and pulp/syslogs
Expand Down