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

Update offline backup files list #15685

Merged
merged 1 commit into from
Jul 22, 2024
Merged

Update offline backup files list #15685

merged 1 commit into from
Jul 22, 2024

Conversation

jameerpathan111
Copy link
Contributor

@jameerpathan111 jameerpathan111 commented Jul 17, 2024 •
edited
Loading

Problem Statement

Solution

  • Update the OFFLINE_SAT_FILES to reflect changes.
  • Remove test_positive_backup_offline_logical
  • Remove unwanted code

Related Issues

@jameerpathan111 jameerpathan111 added the No-CherryPick PR doesnt need CherryPick to previous branches label Jul 17, 2024
@jameerpathan111 jameerpathan111 self-assigned this Jul 17, 2024
@jameerpathan111 jameerpathan111 requested a review from a team as a code owner July 17, 2024 12:23
@jameerpathan111
Copy link
Contributor Author 

trigger: test-robottelo
pytest: tests/foreman/maintain/test_backup_restore.py --select-random-tests '50%'
theforeman:
    foreman_maintain: 893

@Satellite-QE
Copy link
Collaborator

PRT Result

Build Number: 7763
Build Status: UNSTABLE
PRT Comment: pytest tests/foreman/maintain/test_backup_restore.py --select-random-tests 50% --external-logging
Test Result : ========= 20 deselected, 912 warnings, 20 errors in 7666.34s (2:07:46) =========

@Satellite-QE Satellite-QE added the PRT-Failed Indicates that latest PRT run is failed for the PR label Jul 17, 2024
@Griffin-Sullivan
Copy link
Contributor 

trigger: test-robottelo
pytest: tests/foreman/maintain/test_backup_restore.py::test_positive_backup_restore[capsule-offline-include_pulp]
theforeman:
    foreman_maintain: 893

@Satellite-QE
Copy link
Collaborator

PRT Result

Build Number: 7764
Build Status: UNSTABLE
PRT Comment: pytest tests/foreman/maintain/test_backup_restore.py::test_positive_backup_restore[capsule-offline-include_pulp] --external-logging
Test Result : =================== 6 warnings, 1 error in 278.61s (0:04:38) ===================

@Griffin-Sullivan
Copy link
Contributor 

trigger: test-robottelo
pytest: tests/foreman/maintain/test_backup_restore.py::test_positive_backup_restore[capsule-offline-include_pulp]
theforeman:
    foreman_maintain: 893

@Satellite-QE
Copy link
Collaborator

PRT Result

Build Number: 7767
Build Status: UNSTABLE
PRT Comment: pytest tests/foreman/maintain/test_backup_restore.py::test_positive_backup_restore[capsule-offline-include_pulp] --external-logging
Test Result : ================= 1 failed, 25 warnings in 7715.47s (2:08:35) ==================

@Griffin-Sullivan
Copy link
Contributor 

trigger: test-robottelo
pytest: tests/foreman/maintain/test_backup_restore.py::test_positive_backup_restore[satellite-offline-include_pulp]
theforeman:
    foreman_maintain: 893

@Satellite-QE
Copy link
Collaborator

PRT Result

Build Number: 7769
Build Status: UNSTABLE
PRT Comment: pytest tests/foreman/maintain/test_backup_restore.py::test_positive_backup_restore[satellite-offline-include_pulp] --external-logging
Test Result : ============= 1 failed, 23 warnings, 1 error in 7080.14s (1:58:00) =============

@evgeni
Copy link
Member

evgeni commented Jul 18, 2024

Also, the test_positive_backup_offline_logical test can be deleted, and so can the --include-db-dumps handling in the tooling -- That option is gone.

@jameerpathan111 jameerpathan111 force-pushed the offline_backup_files branch 2 times, most recently from 3157b2d to a7764d0 Compare July 18, 2024 09:00
@jameerpathan111 jameerpathan111 requested a review from a team as a code owner July 18, 2024 09:00
@jameerpathan111
Copy link
Contributor Author 

trigger: test-robottelo
pytest: tests/foreman/maintain/test_backup_restore.py::test_positive_backup_restore[satellite-offline-include_pulp]
theforeman:
    foreman_maintain: 893

@Satellite-QE
Copy link
Collaborator

PRT Result

Build Number: 7773
Build Status: UNSTABLE
PRT Comment: pytest tests/foreman/maintain/test_backup_restore.py::test_positive_backup_restore[satellite-offline-include_pulp] --external-logging
Test Result : ============= 1 failed, 19 warnings, 1 error in 6379.80s (1:46:19) =============

@evgeni
Copy link
Member

evgeni commented Jul 19, 2024 

trigger: test-robottelo
pytest: tests/foreman/maintain/test_backup_restore.py::test_positive_backup_restore[satellite-offline-include_pulp]
theforeman:
    foreman_maintain: 893

1 similar comment
@evgeni
Copy link
Member

evgeni commented Jul 19, 2024 

trigger: test-robottelo
pytest: tests/foreman/maintain/test_backup_restore.py::test_positive_backup_restore[satellite-offline-include_pulp]
theforeman:
    foreman_maintain: 893

@Satellite-QE
Copy link
Collaborator

PRT Result

Build Number: 7787
Build Status: SUCCESS
PRT Comment: pytest tests/foreman/maintain/test_backup_restore.py::test_positive_backup_restore[satellite-offline-include_pulp] --external-logging
Test Result : ================= 1 passed, 21 warnings in 6988.57s (1:56:28) ==================

@Satellite-QE Satellite-QE added PRT-Passed Indicates that latest PRT run is passed for the PR and removed PRT-Failed Indicates that latest PRT run is failed for the PR labels Jul 19, 2024
evgeni
evgeni reviewed Jul 19, 2024
View reviewed changes
tests/foreman/maintain/test_backup_restore.py
@@ -446,8 +404,8 @@ def test_positive_puppet_backup_restore(
@pytest.mark.parametrize('backup_type', ['online', 'offline'])
def test_positive_backup_restore(
Copy link
Member

Choose a reason for hiding this comment

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

I do not understand the changes here.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think it should have been module_target_sat from the start, as when I compared session_target_sat and sat_maintain, they were different.

Copy link
Member

Choose a reason for hiding this comment

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

def sat_maintain(request, module_target_sat, module_capsule_configured):

And since this test is using sat_maintain fixture, and we want the test to point to the same Satellite and Capsule object, the test needs to use the same fixture as the sat_maintain fixture does.

tests/foreman/maintain/test_backup_restore.py
@@ -236,47 +235,6 @@ def test_positive_backup_all(sat_maintain, setup_backup_tests, module_synced_rep
assert 'FAIL' not in result.stdout


@pytest.mark.include_capsule
def test_positive_backup_offline_logical(sat_maintain, setup_backup_tests, module_synced_repos):
Copy link
Member

Choose a reason for hiding this comment

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

This removal is correct, as we are dropping the --include-db-dumps parameter.

tests/foreman/maintain/test_backup_restore.py Outdated
@@ -30,8 +30,7 @@


BASIC_FILES = {"config_files.tar.gz", ".config.snar", "metadata.yml"}
OFFLINE_FILES = {"pgsql_data.tar.gz", ".postgres.snar"} | BASIC_FILES
ONLINE_SAT_FILES = {"candlepin.dump", "foreman.dump", "pulpcore.dump"} | BASIC_FILES
ONLINE_SAT_FILES = OFFLINE_FILES = {"candlepin.dump", "foreman.dump", "pulpcore.dump"} | BASIC_FILES
ONLINE_CAPS_FILES = {"pulpcore.dump"} | BASIC_FILES
Copy link
Member

Choose a reason for hiding this comment

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

Hmm, I think we need to introduce OFFLINE_CAPS_FILES now -- or rather use ONLINE_CAPS_FILES always for capsules (as those won't have foreman.dump and candlepin.dump).

Probably just rename it to CAPS_FILES then.
And then we can also rename ONLINE_SAT_FILES and OFFLINE_FILES to SAT_FILES.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Updated the PR

@Satellite-QE Satellite-QE removed the PRT-Passed Indicates that latest PRT run is passed for the PR label Jul 22, 2024
@jameerpathan111 jameerpathan111 requested a review from evgeni July 22, 2024 09:54
@rmynar rmynar added the Stream Introduced in or relating directly to Satellite Stream/Master label Jul 22, 2024
@rmynar rmynar merged commit af5bf09 into SatelliteQE:master Jul 22, 2024
10 checks passed
jyejare pushed a commit to jyejare/robottelo that referenced this pull request Oct 19, 2024
@jameerpathan111 @jyejare
Update offline backup files list (SatelliteQE#15685)
27e9aaa
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@evgeni evgeni evgeni approved these changes

@ogajduse ogajduse ogajduse approved these changes

@rmynar rmynar rmynar approved these changes

Assignees

@jameerpathan111 jameerpathan111

Labels
No-CherryPick PR doesnt need CherryPick to previous branches Stream Introduced in or relating directly to Satellite Stream/Master
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@jameerpathan111 @Satellite-QE @Griffin-Sullivan @evgeni @ogajduse @rmynar