Skip to content

Commit

Permalink
Merge pull request #9846 from Pablogoliva/get_rid_of_debian_11
Browse files Browse the repository at this point in the history
QE: Get rid of debian 11
  • Loading branch information
raulillo82 authored Mar 3, 2025
2 parents 57d45b6 + 4d15b3a commit 1de00a8
Show file tree
Hide file tree
Showing 8 changed files with 1 addition and 164 deletions.
14 changes: 0 additions & 14 deletions testsuite/features/build_validation/core/allcli_sanity.feature
Original file line number Diff line number Diff line change
Expand Up @@ -370,20 +370,6 @@ Feature: Sanity checks
And "ubuntu2404_ssh_minion" should communicate with the server using public interface
And the clock from "ubuntu2404_ssh_minion" should be exact

@debian11_minion
Scenario: The Debian 11 minion is healthy
Then "debian11_minion" should have a FQDN
And reverse resolution should work for "debian11_minion"
And "debian11_minion" should communicate with the server using public interface
And the clock from "debian11_minion" should be exact

@debian11_ssh_minion
Scenario: The Debian 11 Salt SSH minion is healthy
Then "debian11_ssh_minion" should have a FQDN
And reverse resolution should work for "debian11_ssh_minion"
And "debian11_ssh_minion" should communicate with the server using public interface
And the clock from "debian11_ssh_minion" should be exact

@debian12_minion
Scenario: The Debian 12 minion is healthy
Then "debian12_minion" should have a FQDN
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,10 +110,6 @@ Feature: Create bootstrap repositories
Scenario: Create the bootstrap repository for a Ubuntu 24.04 minion
When I create the bootstrap repository for "ubuntu2404_minion" on the server

@debian11_minion
Scenario: Create the bootstrap repository for a Debian 11 minion
When I create the bootstrap repository for "debian11_minion" on the server

@debian12_minion
Scenario: Create the bootstrap repository for a Debian 12 minion
When I create the bootstrap repository for "debian12_minion" on the server
Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -752,26 +752,6 @@ Feature: Synchronize products in the products page of the Setup Wizard
When I use spacewalk-common-channel to add all "ubuntu-2404" channels with arch "amd64-deb"
And I wait until all synchronized channels for "ubuntu-2404" have finished

@susemanager
@debian11_minion
Scenario: Add Debian 11
Given I am authorized for the "Admin" section
When I follow the left menu "Admin > Setup Wizard > Products"
And I wait until I do not see "currently running" text
And I wait until I do not see "Loading" text
And I enter "Debian 11" as the filtered product description
And I select "Debian 11" as a product
Then I should see the "Debian 11" selected
When I click the Add Product button
And I wait until I see "Debian 11" product has been added
And I wait until all synchronized channels for "debian-11" have finished

@uyuni
@debian11_minion
Scenario: Add Debian 11
When I use spacewalk-common-channel to add all "debian-11" channels with arch "amd64-deb"
And I wait until all synchronized channels for "debian-11" have finished

@susemanager
@debian12_minion
Scenario: Add Debian 12
Expand Down
2 changes: 1 addition & 1 deletion testsuite/features/step_definitions/retail_steps.rb
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@
elsif host == 'sle15sp4_terminal'
mac = $sle15sp4_terminal_mac
mac = 'EE:EE:EE:00:00:06' if mac.nil?
elsif (host.include? 'deblike') || (host.include? 'debian11') || (host.include? 'debian12') || (host.include? 'ubuntu')
elsif (host.include? 'deblike') || (host.include? 'debian12') || (host.include? 'ubuntu')
node = get_target(host)
output, _code = node.run('ip link show dev ens4')
mac = output.split("\n")[1].split[1]
Expand Down
39 changes: 0 additions & 39 deletions testsuite/features/support/constants.rb
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,6 @@
'ubuntu2204_ssh_minion' => 'UBUNTU2204_SSHMINION',
'ubuntu2404_minion' => 'UBUNTU2404_MINION',
'ubuntu2404_ssh_minion' => 'UBUNTU2404_SSHMINION',
'debian11_minion' => 'DEBIAN11_MINION',
'debian11_ssh_minion' => 'DEBIAN11_SSHMINION',
'debian12_minion' => 'DEBIAN12_MINION',
'debian12_ssh_minion' => 'DEBIAN12_SSHMINION',
'opensuse155arm_minion' => 'OPENSUSE155ARM_MINION',
Expand Down Expand Up @@ -210,8 +208,6 @@
'ubuntu2204_ssh_minion' => 'bison',
'ubuntu2404_minion' => 'bison',
'ubuntu2404_ssh_minion' => 'bison',
'debian11_minion' => 'bison',
'debian11_ssh_minion' => 'bison',
'debian12_minion' => 'bison',
'debian12_ssh_minion' => 'bison',
'opensuse155arm_minion' => 'bison',
Expand Down Expand Up @@ -292,8 +288,6 @@
'ubuntu2204_ssh_minion' => 'ubuntu-2204-amd64-main for amd64',
'ubuntu2404_minion' => 'ubuntu-2404-amd64-main for amd64',
'ubuntu2404_ssh_minion' => 'ubuntu-2404-amd64-main for amd64',
'debian11_minion' => 'debian-11-pool for amd64',
'debian11_ssh_minion' => 'debian-11-pool for amd64',
'debian12_minion' => 'debian-12-pool for amd64',
'debian12_ssh_minion' => 'debian-12-pool for amd64',
'opensuse155arm_minion' => 'openSUSE-Leap-15.5-Pool for aarch64',
Expand Down Expand Up @@ -367,8 +361,6 @@
'ubuntu2204_ssh_minion' => 'Ubuntu 22.04 LTS AMD64 Base for Uyuni',
'ubuntu2404_minion' => 'Ubuntu 24.04 LTS AMD64 Base for Uyuni',
'ubuntu2404_ssh_minion' => 'Ubuntu 24.04 LTS AMD64 Base for Uyuni',
'debian11_minion' => 'Debian 11 (bullseye) pool for amd64 for Uyuni',
'debian11_ssh_minion' => 'Debian 11 (bullseye) pool for amd64 for Uyuni',
'debian12_minion' => 'Debian 12 (bookworm) pool for amd64 for Uyuni',
'debian12_ssh_minion' => 'Debian 12 (bookworm) pool for amd64 for Uyuni',
'opensuse155arm_minion' => 'openSUSE Leap 15.5 (aarch64)',
Expand Down Expand Up @@ -421,8 +413,6 @@
'ubuntu-2004-amd64-main for amd64' => 'ubuntu-2004-amd64-main-amd64',
'ubuntu-2204-amd64-main for amd64' => 'ubuntu-2204-amd64-main-amd64',
'ubuntu-2404-amd64-main for amd64' => 'ubuntu-2404-amd64-main-amd64',
'debian-11-pool for amd64' => 'debian-11-pool-amd64',
'debian-12-pool for amd64' => 'debian-12-pool-amd64',
'openSUSE-Leap-15.5-Pool for aarch64' => 'opensuse-leap-15.5-pool-aarch64',
'openSUSE-Leap-15.6-Pool for aarch64' => 'opensuse-leap-15.6-pool-aarch64'
},
Expand Down Expand Up @@ -455,7 +445,6 @@
'Ubuntu 20.04 LTS AMD64 Base for Uyuni' => 'ubuntu-2004-pool-amd64-uyuni',
'Ubuntu 22.04 LTS AMD64 Base for Uyuni' => 'ubuntu-2204-pool-amd64-uyuni',
'Ubuntu 24.04 LTS AMD64 Base for Uyuni' => 'ubuntu-2404-pool-amd64-uyuni',
'Debian 11 (bullseye) pool for amd64 for Uyuni' => 'debian-11-pool-amd64-uyuni',
'Debian 12 (bookworm) pool for amd64 for Uyuni' => 'debian-12-pool-amd64-uyuni',
'openSUSE Leap 15.5 (aarch64)' => 'opensuse_leap15_5-aarch64',
'openSUSE Leap 15.6 (aarch64)' => 'opensuse_leap15_6-aarch64'
Expand Down Expand Up @@ -495,7 +484,6 @@
'ubuntu-2004-amd64-main for amd64' => 'ubuntu-20.04-amd64',
'ubuntu-2204-amd64-main for amd64' => 'ubuntu-22.04-amd64',
'ubuntu-2404-amd64-main for amd64' => 'ubuntu-24.04-amd64',
'debian-11-pool for amd64' => 'debian11-amd64',
'debian-12-pool for amd64' => 'debian12-amd64',
'openSUSE-Leap-15.5-Pool for aarch64' => 'openSUSE-Leap-15.5-aarch64',
'openSUSE-Leap-15.6-Pool for aarch64' => 'openSUSE-Leap-15.6-aarch64'
Expand Down Expand Up @@ -529,7 +517,6 @@
'Ubuntu 20.04 LTS AMD64 Base for Uyuni' => 'ubuntu-2004-amd64-uyuni',
'Ubuntu 22.04 LTS AMD64 Base for Uyuni' => 'ubuntu-2204-amd64-uyuni',
'Ubuntu 24.04 LTS AMD64 Base for Uyuni' => 'ubuntu-2404-amd64-uyuni',
'Debian 11 (bullseye) pool for amd64 for Uyuni' => 'debian11-amd64-uyuni',
'Debian 12 (bookworm) pool for amd64 for Uyuni' => 'debian12-amd64-uyuni',
'openSUSE Leap 15.5 (aarch64)' => 'openSUSE-Leap-15.5-aarch64-uyuni',
'openSUSE Leap 15.6 (aarch64)' => 'openSUSE-Leap-15.6-aarch64-uyuni'
Expand Down Expand Up @@ -570,7 +557,6 @@
'ubuntu-2004-amd64-main for amd64' => nil,
'ubuntu-2204-amd64-main for amd64' => nil,
'ubuntu-2404-amd64-main for amd64' => nil,
'debian-11-pool for amd64' => 'debian-11-pool-amd64',
'debian-12-pool for amd64' => 'debian-12-pool-amd64',
'openSUSE-Leap-15.5-Pool for aarch64' => nil,
'openSUSE-Leap-15.6-Pool for aarch64' => nil
Expand Down Expand Up @@ -603,7 +589,6 @@
'Ubuntu 20.04 LTS AMD64 Base for Uyuni' => nil,
'Ubuntu 22.04 LTS AMD64 Base for Uyuni' => nil,
'Ubuntu 24.04 LTS AMD64 Base for Uyuni' => nil,
'Debian 11 (bullseye) pool for amd64 for Uyuni' => 'debian11-amd64-uyuni',
'Debian 12 (bookworm) pool for amd64 for Uyuni' => 'debian12-amd64-uyuni',
'openSUSE Leap 15.5 (aarch64)' => nil,
'openSUSE Leap 15.6 (aarch64)' => nil
Expand Down Expand Up @@ -665,8 +650,6 @@
'ubuntu2204_ssh_minion' => 'amd64',
'ubuntu2404_minion' => 'amd64',
'ubuntu2404_ssh_minion' => 'amd64',
'debian11_minion' => 'amd64',
'debian11_ssh_minion' => 'amd64',
'debian12_minion' => 'amd64',
'debian12_ssh_minion' => 'amd64',
'opensuse155arm_minion' => 'aarch64',
Expand Down Expand Up @@ -715,13 +698,6 @@
almalinux9-x86_64
almalinux9-appstream-x86_64
],
'debian-11' => # CHECKED
%w[
debian-11-pool-amd64
debian-11-main-updates-amd64
debian-11-main-security-amd64
debian-11-suse-manager-tools-amd64
],
'debian-12' => # CHECKED
%w[
debian-12-pool-amd64
Expand Down Expand Up @@ -1061,13 +1037,6 @@
centos7-x86_64-extras
centos7-uyuni-client-devel-x86_64
],
'debian-11' => # CHECKED
%w[
debian-11-pool-amd64-uyuni
debian-11-amd64-main-updates-uyuni
debian-11-amd64-main-security-uyuni
debian-11-amd64-uyuni-client-devel
],
'debian-12' => # CHECKED
%w[
debian-12-pool-amd64-uyuni
Expand Down Expand Up @@ -1396,14 +1365,6 @@
'centos7-uyuni-client-devel-x86_64' => 60,
'centos7-x86_64' => 960,
'centos7-x86_64-extras' => 120,
'debian-11-amd64-main-security-uyuni' => 240,
'debian-11-amd64-main-updates-uyuni' => 60,
'debian-11-amd64-uyuni-client-devel' => 60,
'debian-11-main-security-amd64' => 240,
'debian-11-main-updates-amd64' => 60,
'debian-11-pool-amd64' => 22_920,
'debian-11-pool-amd64-uyuni' => 23_580,
'debian-11-suse-manager-tools-amd64' => 120,
'debian-12-amd64-main-security-uyuni' => 240,
'debian-12-amd64-main-updates-uyuni' => 120,
'debian-12-amd64-uyuni-client-devel' => 60,
Expand Down
8 changes: 0 additions & 8 deletions testsuite/features/support/env.rb
Original file line number Diff line number Diff line change
Expand Up @@ -389,14 +389,6 @@ def process_code_coverage
skip_this_scenario unless ENV.key? ENV_VAR_BY_HOST['ubuntu2404_ssh_minion']
end

Before('@debian11_minion') do
skip_this_scenario unless ENV.key? ENV_VAR_BY_HOST['debian11_minion']
end

Before('@debian11_ssh_minion') do
skip_this_scenario unless ENV.key? ENV_VAR_BY_HOST['debian11_ssh_minion']
end

Before('@debian12_minion') do
skip_this_scenario unless ENV.key? ENV_VAR_BY_HOST['debian12_minion']
end
Expand Down

0 comments on commit 1de00a8

Please sign in to comment.