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 uyuni testsuite features to leap 15.5 #7471

Merged
merged 3 commits into from
Sep 13, 2023
Merged

Update uyuni testsuite features to leap 15.5 #7471

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f21851b
Update uyuni testsuite features to leap 15.5
jordimassaguerpla Aug 29, 2023
f68f42d
Merge branch 'master' into update_tests_to_leap_15_5
jordimassaguerpla Sep 4, 2023
63fe41b
Merge branch 'master' into update_tests_to_leap_15_5
jordimassaguerpla Sep 12, 2023
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
60 changes: 30 additions & 30 deletions testsuite/features/init_clients/allcli_update_activationkeys.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,14 +74,14 @@ Feature: Update activation keys
When I follow the left menu "Systems > Activation Keys"
And I follow "SUSE Test Key x86_64" in the content area
And I wait until I do not see "Loading..." text
And I select "openSUSE Leap 15.4 (x86_64)" from "selectedBaseChannel"
And I wait until I do not see "Loading..." text
And I check "openSUSE 15.4 non oss (x86_64)"
And I check "openSUSE Leap 15.4 non oss Updates (x86_64)"
And I check "openSUSE Leap 15.4 Updates (x86_64)"
And I check "Update repository of openSUSE Leap 15.4 Backports (x86_64)"
And I check "Update repository with updates from SUSE Linux Enterprise 15 for openSUSE Leap 15.4 (x86_64)"
And I check "Uyuni Client Tools for openSUSE Leap 15.4 (x86_64)"
And I select "openSUSE Leap 15.5 (x86_64)" from "selectedBaseChannel"
And I wait until I do not see "Loading..." text
And I check "openSUSE 15.5 non oss (x86_64)"
And I check "openSUSE Leap 15.5 non oss Updates (x86_64)"
And I check "openSUSE Leap 15.5 Updates (x86_64)"
And I check "Update repository of openSUSE Leap 15.5 Backports (x86_64)"
And I check "Update repository with updates from SUSE Linux Enterprise 15 for openSUSE Leap 15.5 (x86_64)"
And I check "Uyuni Client Tools for openSUSE Leap 15.5 (x86_64)"
And I check "Fake-RPM-SUSE-Channel"
When I click on "Update Activation Key"
Then I should see a "Activation key SUSE Test Key x86_64 has been modified" text
Expand All @@ -107,14 +107,14 @@ Feature: Update activation keys
When I follow the left menu "Systems > Activation Keys"
And I follow "SUSE SSH Test Key x86_64" in the content area
And I wait until I do not see "Loading..." text
And I select "openSUSE Leap 15.4 (x86_64)" from "selectedBaseChannel"
And I select "openSUSE Leap 15.5 (x86_64)" from "selectedBaseChannel"
And I wait until I do not see "Loading..." text
And I check "openSUSE 15.4 non oss (x86_64)"
And I check "openSUSE Leap 15.4 non oss Updates (x86_64)"
And I check "openSUSE Leap 15.4 Updates (x86_64)"
And I check "Update repository of openSUSE Leap 15.4 Backports (x86_64)"
And I check "Update repository with updates from SUSE Linux Enterprise 15 for openSUSE Leap 15.4 (x86_64)"
And I check "Uyuni Client Tools for openSUSE Leap 15.4 (x86_64)"
And I check "openSUSE 15.5 non oss (x86_64)"
And I check "openSUSE Leap 15.5 non oss Updates (x86_64)"
And I check "openSUSE Leap 15.5 Updates (x86_64)"
And I check "Update repository of openSUSE Leap 15.5 Backports (x86_64)"
And I check "Update repository with updates from SUSE Linux Enterprise 15 for openSUSE Leap 15.5 (x86_64)"
And I check "Uyuni Client Tools for openSUSE Leap 15.5 (x86_64)"
And I check "Fake-RPM-SUSE-Channel"
And I click on "Update Activation Key"
Then I should see a "Activation key SUSE SSH Test Key x86_64 has been modified" text
Expand All @@ -140,14 +140,14 @@ Feature: Update activation keys
When I follow the left menu "Systems > Activation Keys"
And I follow "SUSE SSH Tunnel Test Key x86_64" in the content area
And I wait until I do not see "Loading..." text
And I select "openSUSE Leap 15.4 (x86_64)" from "selectedBaseChannel"
And I select "openSUSE Leap 15.5 (x86_64)" from "selectedBaseChannel"
And I wait until I do not see "Loading..." text
And I check "openSUSE 15.4 non oss (x86_64)"
And I check "openSUSE Leap 15.4 non oss Updates (x86_64)"
And I check "openSUSE Leap 15.4 Updates (x86_64)"
And I check "Update repository of openSUSE Leap 15.4 Backports (x86_64)"
And I check "Update repository with updates from SUSE Linux Enterprise 15 for openSUSE Leap 15.4 (x86_64)"
And I check "Uyuni Client Tools for openSUSE Leap 15.4 (x86_64)"
And I check "openSUSE 15.5 non oss (x86_64)"
And I check "openSUSE Leap 15.5 non oss Updates (x86_64)"
And I check "openSUSE Leap 15.5 Updates (x86_64)"
And I check "Update repository of openSUSE Leap 15.5 Backports (x86_64)"
And I check "Update repository with updates from SUSE Linux Enterprise 15 for openSUSE Leap 15.5 (x86_64)"
And I check "Uyuni Client Tools for openSUSE Leap 15.5 (x86_64)"
And I check "Fake-RPM-SUSE-Channel"
And I click on "Update Activation Key"
Then I should see a "Activation key SUSE SSH Tunnel Test Key x86_64 has been modified" text
Expand Down Expand Up @@ -177,14 +177,14 @@ Feature: Update activation keys
When I follow the left menu "Systems > Activation Keys"
And I follow "Proxy Key x86_64" in the content area
And I wait until I do not see "Loading..." text
And I select "openSUSE Leap 15.4 (x86_64)" from "selectedBaseChannel"
And I select "openSUSE Leap 15.5 (x86_64)" from "selectedBaseChannel"
And I wait until I do not see "Loading..." text
And I check "openSUSE 15.4 non oss (x86_64)"
And I check "openSUSE Leap 15.4 non oss Updates (x86_64)"
And I check "openSUSE Leap 15.4 Updates (x86_64)"
And I check "Update repository of openSUSE Leap 15.4 Backports (x86_64)"
And I check "Update repository with updates from SUSE Linux Enterprise 15 for openSUSE Leap 15.4 (x86_64)"
And I check "Uyuni Client Tools for openSUSE Leap 15.4 (x86_64)"
And I check "Uyuni Proxy Devel for openSUSE Leap 15.4 (x86_64)"
And I check "openSUSE 15.5 non oss (x86_64)"
And I check "openSUSE Leap 15.5 non oss Updates (x86_64)"
And I check "openSUSE Leap 15.5 Updates (x86_64)"
And I check "Update repository of openSUSE Leap 15.5 Backports (x86_64)"
And I check "Update repository with updates from SUSE Linux Enterprise 15 for openSUSE Leap 15.5 (x86_64)"
And I check "Uyuni Client Tools for openSUSE Leap 15.5 (x86_64)"
And I check "Uyuni Proxy Devel for openSUSE Leap 15.5 (x86_64)"
When I click on "Update Activation Key"
Then I should see a "Activation key Proxy Key x86_64 has been modified" text
16 changes: 8 additions & 8 deletions testsuite/features/init_clients/proxy_register_as_minion_with_gui.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,15 +70,15 @@ Feature: Setup Uyuni proxy
When I follow "Software" in the content area
And I follow "Software Channels" in the content area
And I wait until I do not see "Loading..." text
And I check radio button "openSUSE Leap 15.4 (x86_64)"
And I check radio button "openSUSE Leap 15.5 (x86_64)"
And I wait until I do not see "Loading..." text
And I check "openSUSE 15.4 non oss (x86_64)"
And I check "openSUSE Leap 15.4 non oss Updates (x86_64)"
And I check "openSUSE Leap 15.4 Updates (x86_64)"
And I check "Update repository of openSUSE Leap 15.4 Backports (x86_64)"
And I check "Update repository with updates from SUSE Linux Enterprise 15 for openSUSE Leap 15.4 (x86_64)"
And I check "Uyuni Client Tools for openSUSE Leap 15.4 (x86_64)"
And I check "Uyuni Proxy Devel for openSUSE Leap 15.4 (x86_64)"
And I check "openSUSE 15.5 non oss (x86_64)"
And I check "openSUSE Leap 15.5 non oss Updates (x86_64)"
And I check "openSUSE Leap 15.5 Updates (x86_64)"
And I check "Update repository of openSUSE Leap 15.5 Backports (x86_64)"
And I check "Update repository with updates from SUSE Linux Enterprise 15 for openSUSE Leap 15.5 (x86_64)"
And I check "Uyuni Client Tools for openSUSE Leap 15.5 (x86_64)"
And I check "Uyuni Proxy Devel for openSUSE Leap 15.5 (x86_64)"
And I click on "Next"
Then I should see a "Confirm Software Channel Change" text
When I click on "Confirm"
Expand Down
16 changes: 8 additions & 8 deletions testsuite/features/init_clients/proxy_register_as_minion_with_script.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,15 +80,15 @@ Feature: Setup Uyuni proxy
When I follow "Software" in the content area
And I follow "Software Channels" in the content area
And I wait until I do not see "Loading..." text
And I check radio button "openSUSE Leap 15.4 (x86_64)"
And I check radio button "openSUSE Leap 15.5 (x86_64)"
And I wait until I do not see "Loading..." text
And I check "openSUSE 15.4 non oss (x86_64)"
And I check "openSUSE Leap 15.4 non oss Updates (x86_64)"
And I check "openSUSE Leap 15.4 Updates (x86_64)"
And I check "Update repository of openSUSE Leap 15.4 Backports (x86_64)"
And I check "Update repository with updates from SUSE Linux Enterprise 15 for openSUSE Leap 15.4 (x86_64)"
And I check "Uyuni Client Tools for openSUSE Leap 15.4 (x86_64)"
And I check "Uyuni Proxy Devel for openSUSE Leap 15.4 (x86_64)"
And I check "openSUSE 15.5 non oss (x86_64)"
And I check "openSUSE Leap 15.5 non oss Updates (x86_64)"
And I check "openSUSE Leap 15.5 Updates (x86_64)"
And I check "Update repository of openSUSE Leap 15.5 Backports (x86_64)"
And I check "Update repository with updates from SUSE Linux Enterprise 15 for openSUSE Leap 15.5 (x86_64)"
And I check "Uyuni Client Tools for openSUSE Leap 15.5 (x86_64)"
And I check "Uyuni Proxy Devel for openSUSE Leap 15.5 (x86_64)"
And I click on "Next"
Then I should see a "Confirm Software Channel Change" text
When I click on "Confirm"
Expand Down
2 changes: 1 addition & 1 deletion testsuite/features/profiles/cloud_aws/Docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ip-172-16-1-175.eu-central-1.compute.internal/opensuse/leap:15.4
FROM ip-172-16-1-175.eu-central-1.compute.internal/opensuse/leap:15.5
MAINTAINER Admin User "noemail@example.com"

ARG repo
Expand Down
2 changes: 1 addition & 1 deletion testsuite/features/profiles/internal_nue/Docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.mgr.suse.de/opensuse/leap:15.4
FROM registry.mgr.suse.de/opensuse/leap:15.5
MAINTAINER Admin User "noemail@example.com"

ARG repo
Expand Down
2 changes: 1 addition & 1 deletion testsuite/features/profiles/internal_prv/Docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.mgr.prv.suse.net/opensuse/leap:15.4
FROM registry.mgr.prv.suse.net/opensuse/leap:15.5
MAINTAINER Admin User "noemail@example.com"

ARG repo
Expand Down
2 changes: 1 addition & 1 deletion testsuite/features/reposync/srv_enable_sync_products.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Feature: Be able to list available products and enable them
@uyuni
Scenario: List available products
When I execute mgr-sync "list products" with user "admin" and password "admin"
Then I should get "[ ] openSUSE Leap 15.4 x86_64"
Then I should get "[ ] openSUSE Leap 15.5 x86_64"

@susemanager
Scenario: List all available products
Expand Down
4 changes: 2 additions & 2 deletions testsuite/features/reposync/srv_sync_products.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ Feature: Synchronize products in the products page of the Setup Wizard
Then the SLE15 SP4 product should be added

@uyuni
Scenario: Add openSUSE Leap 15.4 product, including Uyuni Client Tools
When I use spacewalk-common-channel to add channel "opensuse_leap15_4 opensuse_leap15_4-non-oss opensuse_leap15_4-non-oss-updates opensuse_leap15_4-updates opensuse_leap15_4-backports-updates opensuse_leap15_4-sle-updates uyuni-proxy-devel-leap opensuse_leap15_4-uyuni-client" with arch "x86_64"
Scenario: Add openSUSE Leap 15.5 product, including Uyuni Client Tools
When I use spacewalk-common-channel to add channel "opensuse_leap15.5 opensuse_leap15.5-non-oss opensuse_leap15.5-non-oss-updates opensuse_leap15.5-updates opensuse_leap15.5-backports-updates opensuse_leap15.5-sle-updates uyuni-proxy-devel-leap opensuse_leap15.5-uyuni-client" with arch "x86_64"

@proxy
@susemanager
Expand Down
4 changes: 2 additions & 2 deletions testsuite/features/secondary/srv_dist_channel_mapping.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Feature: Distribution Channel Mapping
And I follow "Create Distribution Channel Mapping"
Then I should see a "Create Distribution Channel Map" text
When I enter "SUSE Linux Enterprise Server 15 SP 4" as "os"
And I enter "15.4" as "release"
And I enter "15.5" as "release"
And I select "x86_64" from "architecture" dropdown
And I select "SLE-Product-SLES15-SP4-Pool for x86_64" from "channel_label" dropdown
And I click on "Create Mapping"
Expand All @@ -45,7 +45,7 @@ Feature: Distribution Channel Mapping
And I follow "Create Distribution Channel Mapping"
Then I should see a "Create Distribution Channel Map" text
When I enter "SUSE Linux Enterprise Server 15 SP 4 iSeries" as "os"
And I enter "15.4" as "release"
And I enter "15.5" as "release"
And I select "iSeries" from "architecture" dropdown
And I select "Fake-i586-Channel" from "channel_label" dropdown
And I click on "Create Mapping"
Expand Down
2 changes: 1 addition & 1 deletion testsuite/features/step_definitions/vm_steps.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
when 'leap'
name = 'leap-disk-image-template.qcow2'
net = 'salt-leap'
os = 'opensuse15.4'
os = 'opensuse15.5'
memory = '1024'
when 'sles'
name = 'sles-disk-image-template.qcow2'
Expand Down
19 changes: 16 additions & 3 deletions testsuite/features/support/constants.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,11 +197,10 @@
if ENV['PROVIDER'].include? 'podman'
'Fake Base Channel'
elsif ENV['SERVER'].include?('uyuni') || ENV['SERVER'].include?('suma-pr')
'openSUSE Leap 15.4 (x86_64)'
'openSUSE Leap 15.5 (x86_64)'
else
'SLES15-SP4-Pool'
end

# Names of our base/parent channels
# The keys are the Twopence targets
# The values can be found in the webUI under Software -> Manage -> Channels -> Create Channel
Expand Down Expand Up @@ -269,7 +268,7 @@
},
'Uyuni' =>
{
'proxy' => 'openSUSE Leap 15.4 (x86_64)',
'proxy' => 'openSUSE Leap 15.5 (x86_64)',
'sle_minion' => sle_base_channel,
'ssh_minion' => 'SLES15-SP4-Pool',
'rhlike_minion' => 'RHEL8-Pool for x86_64',
Expand Down Expand Up @@ -365,6 +364,7 @@
},
'Uyuni' =>
{
'openSUSE Leap 15.5 (x86_64)' => 'opensuse_leap15_5-x86_64',
'openSUSE Leap 15.4 (x86_64)' => 'opensuse_leap15_4-x86_64',
'SLES12-SP4-Pool' => 'sles12-sp4-pool-x86_64',
'SLES12-SP5-Pool' => 'sles12-sp5-pool-x86_64',
Expand Down Expand Up @@ -426,6 +426,7 @@
},
'Uyuni' =>
{
'openSUSE Leap 15.5 (x86_64)' => 'openSUSE-Leap-15.5-x86_64-uyuni',
'openSUSE Leap 15.4 (x86_64)' => 'openSUSE-Leap-15.4-x86_64-uyuni',
'SLES12-SP4-Pool' => 'SLE-12-SP4-x86_64',
'SLES12-SP5-Pool' => 'SLE-12-SP5-x86_64',
Expand Down Expand Up @@ -489,6 +490,7 @@
},
'Uyuni' =>
{
'openSUSE Leap 15.5 (x86_64)' => nil,
'openSUSE Leap 15.4 (x86_64)' => nil,
'SLES12-SP4-Pool' => nil,
'SLES12-SP5-Pool' => nil,
Expand Down Expand Up @@ -677,6 +679,17 @@
opensuse_leap15_4-x86_64-sle-updates
uyuni-proxy-devel-leap-x86_64
opensuse_leap15_4-uyuni-client-x86_64
],
'15.5' =>
%w[
opensuse_leap15_5-x86_64
opensuse_leap15_5-x86_64-non-oss
opensuse_leap15_5-x86_64-non-oss-updates
opensuse_leap15_5-x86_64-updates
opensuse_leap15_5-x86_64-backports-updates
opensuse_leap15_5-x86_64-sle-updates
uyuni-proxy-devel-leap-x86_64
opensuse_leap15_5-uyuni-client-x86_64
]
}.freeze

Expand Down
Loading