Skip to content

Commit e53b17f

Browse files
committed
Switch Katello bats tests to better repo
1 parent 4c2e830 commit e53b17f

7 files changed

+27
-21
lines changed

bats/export_repos

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Zoo

bats/fb-katello-content.bats

+13-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ setup() {
3232
@test "create package repository" {
3333
hammer repository create --organization="${ORGANIZATION}" \
3434
--product="${PRODUCT}" --content-type="yum" --name "${YUM_REPOSITORY}" \
35-
--url https://fixtures.pulpproject.org/rpm-packages-updateinfo/ | grep -q "Repository created"
35+
--url https://fixtures.pulpproject.org/rpm-no-comps/ | grep -q "Repository created"
3636
}
3737

3838
@test "upload package" {
@@ -449,3 +449,15 @@ setup() {
449449
@test "fetch rpm from yum repository on old path" {
450450
tCheckPulpYumContent "${HOSTNAME}" "pulp/repos" "Library"
451451
}
452+
453+
@test "clean-up modules-rpms and rpm-deps" {
454+
hammer repository delete --organization="${ORGANIZATION}" \
455+
--product="${PRODUCT}" --name="${YUM_REPOSITORY_2}" \
456+
--remove-from-content-view-versions=true
457+
hammer repository delete --organization="${ORGANIZATION}" \
458+
--product="${PRODUCT}" --name="${YUM_REPOSITORY_3}" \
459+
--remove-from-content-view-versions=true
460+
461+
echo "::ForemanTasks.sync_task(::Actions::Katello::OrphanCleanup::RemoveOrphans, SmartProxy.pulp_primary)" \
462+
| foreman-rake console
463+
}

bats/fixtures/component_1_modulemds

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
-------------------|--------|----------------|--------------|---------
22
MODULE STREAM NAME | STREAM | VERSION | ARCHITECTURE | CONTEXT
33
-------------------|--------|----------------|--------------|---------
4-
kangaroo | 0 | 20180730223407 | noarch | deadbeef
54
walrus | 5.21 | 20180704144203 | x86_64 | deadbeef
65
-------------------|--------|----------------|--------------|---------

bats/fixtures/component_1_rpms

+7-18
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,7 @@
1-
-----------------------------
2-
FILENAME
3-
-----------------------------
4-
wolf-9.4-2.noarch.rpm
5-
whale-0.2-1.noarch.rpm
6-
walrus-5.21-1.noarch.rpm
7-
tiger-1.0-4.noarch.rpm
8-
stork-0.12-2.noarch.rpm
9-
shark-0.1-1.noarch.rpm
10-
pike-2.2-1.noarch.rpm
11-
penguin-0.9.1-1.noarch.rpm
12-
lion-0.4-1.noarch.rpm
13-
kangaroo-0.3-1.noarch.rpm
14-
elephant-8.3-1.noarch.rpm
15-
dolphin-3.10.232-1.noarch.rpm
16-
crow-0.8-1.noarch.rpm
17-
bear-4.1-1.noarch.rpm
18-
-----------------------------
1+
--------------------------
2+
FILENAME
3+
--------------------------
4+
walrus-5.21-1.noarch.rpm
5+
shark-0.1-1.noarch.rpm
6+
penguin-0.9.1-1.noarch.rpm
7+
--------------------------

bats/fixtures/component_2_errata

+3
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,7 @@
22
ERRATA ID
33
--------------
44
RHEA-2012:0055
5+
RHEA-2012:0056
6+
RHEA-2012:0057
7+
RHEA-2012:0058
58
--------------

bats/fixtures/composite_errata

+3
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,7 @@
22
ERRATA ID
33
--------------
44
RHEA-2012:0055
5+
RHEA-2012:0056
6+
RHEA-2012:0057
7+
RHEA-2012:0058
58
--------------

bats/fixtures/composite_modulemds

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
-------------------|--------|----------------|--------------|---------
22
MODULE STREAM NAME | STREAM | VERSION | ARCHITECTURE | CONTEXT
33
-------------------|--------|----------------|--------------|---------
4-
kangaroo | 0 | 20180730223407 | noarch | deadbeef
54
walrus | 5.21 | 20180704144203 | x86_64 | deadbeef
65
-------------------|--------|----------------|--------------|---------

0 commit comments

Comments
 (0)