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

Switch Katello bats tests to better repo (fix Katello nightly BATS failures) #1806

Merged
merged 1 commit into from
Apr 2, 2024
Merged

Switch Katello bats tests to better repo (fix Katello nightly BATS failures) #1806

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
14 changes: 13 additions & 1 deletion bats/fb-katello-content.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ setup() {
@test "create package repository" {
hammer repository create --organization="${ORGANIZATION}" \
--product="${PRODUCT}" --content-type="yum" --name "${YUM_REPOSITORY}" \
--url https://fixtures.pulpproject.org/rpm-packages-updateinfo/ | grep -q "Repository created"
--url https://fixtures.pulpproject.org/rpm-no-comps/ | grep -q "Repository created"
}

@test "upload package" {
Expand Down Expand Up @@ -449,3 +449,15 @@ setup() {
@test "fetch rpm from yum repository on old path" {
tCheckPulpYumContent "${HOSTNAME}" "pulp/repos" "Library"
}

@test "clean-up modules-rpms and rpm-deps" {
hammer repository delete --organization="${ORGANIZATION}" \
--product="${PRODUCT}" --name="${YUM_REPOSITORY_2}" \
--remove-from-content-view-versions=true
hammer repository delete --organization="${ORGANIZATION}" \
--product="${PRODUCT}" --name="${YUM_REPOSITORY_3}" \
--remove-from-content-view-versions=true

echo "::ForemanTasks.sync_task(::Actions::Katello::OrphanCleanup::RemoveOrphans, SmartProxy.pulp_primary)" \
| foreman-rake console
}
1 change: 0 additions & 1 deletion bats/fixtures/component_1_modulemds
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
-------------------|--------|----------------|--------------|---------
MODULE STREAM NAME | STREAM | VERSION | ARCHITECTURE | CONTEXT
-------------------|--------|----------------|--------------|---------
kangaroo | 0 | 20180730223407 | noarch | deadbeef
walrus | 5.21 | 20180704144203 | x86_64 | deadbeef
-------------------|--------|----------------|--------------|---------
25 changes: 7 additions & 18 deletions bats/fixtures/component_1_rpms
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,7 @@
-----------------------------
FILENAME
-----------------------------
wolf-9.4-2.noarch.rpm
whale-0.2-1.noarch.rpm
walrus-5.21-1.noarch.rpm
tiger-1.0-4.noarch.rpm
stork-0.12-2.noarch.rpm
shark-0.1-1.noarch.rpm
pike-2.2-1.noarch.rpm
penguin-0.9.1-1.noarch.rpm
lion-0.4-1.noarch.rpm
kangaroo-0.3-1.noarch.rpm
elephant-8.3-1.noarch.rpm
dolphin-3.10.232-1.noarch.rpm
crow-0.8-1.noarch.rpm
bear-4.1-1.noarch.rpm
-----------------------------
--------------------------
FILENAME
--------------------------
walrus-5.21-1.noarch.rpm
shark-0.1-1.noarch.rpm
penguin-0.9.1-1.noarch.rpm
--------------------------
3 changes: 3 additions & 0 deletions bats/fixtures/component_2_errata
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,7 @@
ERRATA ID
--------------
RHEA-2012:0055
RHEA-2012:0056
RHEA-2012:0057
RHEA-2012:0058
--------------
3 changes: 3 additions & 0 deletions bats/fixtures/composite_errata
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,7 @@
ERRATA ID
--------------
RHEA-2012:0055
RHEA-2012:0056
RHEA-2012:0057
RHEA-2012:0058
--------------
1 change: 0 additions & 1 deletion bats/fixtures/composite_modulemds
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
-------------------|--------|----------------|--------------|---------
MODULE STREAM NAME | STREAM | VERSION | ARCHITECTURE | CONTEXT
-------------------|--------|----------------|--------------|---------
kangaroo | 0 | 20180730223407 | noarch | deadbeef
walrus | 5.21 | 20180704144203 | x86_64 | deadbeef
-------------------|--------|----------------|--------------|---------
Loading