[Backport 2024.2] fix(artifacts): retire amazon2

docs/artifacts_test.md

@@ -14,7 +14,6 @@ There are pipeline files for Jenkins in the repository:
 vars
 `-- artifactsPipeline.groovy
 jenkins-pipelines
-|-- artifacts-amazon2.jenkinsfile
 |-- artifacts-ami.jenkinsfile
 |-- artifacts-centos7.jenkinsfile
 |-- artifacts-debian10.jenkinsfile
@@ -87,10 +86,6 @@ hydra run-test artifacts_test --backend gce --config test-cases/artifacts/rhel8.
 hydra run-test artifacts_test --backend aws --config test-cases/artifacts/oel76.yaml
 ```
 
-## Amazon Linux 2
-```sh
-hydra run-test artifacts_test --backend aws --config test-cases/artifacts/amazon2.yaml
-```
 
 ## Ubuntu 22.04 LTS (jammy)
 ```sh

sdcm/cluster.py

@@ -2023,8 +2023,6 @@ def offline_install_scylla(self, unified_package, nonroot):
             self.install_package(package_name='python2')
         # Offline install does't provide openjdk-11, it has to be installed in advance
         # https://github.com/scylladb/scylla-jmx/issues/127
-        if self.distro.is_amazon2:
-            self.remoter.sudo('amazon-linux-extras install java-openjdk11')
         elif self.distro.is_amazon2023:
             self.install_package(package_name="java-11-amazon-corretto-headless")
         elif self.distro.is_rhel_like:
@@ -2950,11 +2948,6 @@ def install_epel(self):
         if not self.distro.is_rhel_like:
             raise Exception('EPEL can only be installed for RHEL like distros')
 
-        if self.distro.is_amazon2:
-            # Enable amazon2-extras repo for installing epel
-            # Reference: https://aws.amazon.com/amazon-linux-2/faqs/#Amazon_Linux_Extras
-            self.remoter.run('sudo amazon-linux-extras install epel')
-
         if self.distro.is_rhel8:
             self.remoter.run(
                 "sudo yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm")

sdcm/cluster_aws.py

@@ -410,8 +410,7 @@ def add_nodes(self, count, ec2_user_data='', dc_idx=0, rack=0, enable_auto_boots
             node = self._create_node(instance, self._ec2_ami_username, self.node_prefix,
                                      self._node_index, self.logdir, dc_idx=dc_idx, rack=node_rack)
             node.enable_auto_bootstrap = enable_auto_bootstrap
-            if ssh_connection_ip_type(self.params) == 'ipv6' and not node.distro.is_amazon2 and \
-                    not node.distro.is_ubuntu:
+            if ssh_connection_ip_type(self.params) == 'ipv6' and not node.distro.is_ubuntu:
                 node.config_ipv6_as_persistent()
             self.nodes.append(node)
         self.write_node_public_ip_file()
@@ -864,10 +863,6 @@ def traffic_control(self, tcconfig_params=None):
             self.remoter.run('sudo bash -cxe "%s"' % tc_command)
 
     def install_traffic_control(self):
-        if self.distro.is_amazon2:
-            self.log.debug("Installing iproute-tc package for AMAZON2")
-            self.remoter.run("sudo yum install -y iproute-tc", ignore_status=True)
-
         return self.remoter.run("/sbin/tc -h", ignore_status=True).ok
 
     @property

sdcm/utils/distro.py

@@ -35,7 +35,7 @@ class DistroBase(enum.Enum):
     ("CENTOS", "centos", ["7", "8", "9"], DistroBase.RHEL),
     ("RHEL", "rhel", ["7", "8", "9"], DistroBase.RHEL),
     ("OEL", "ol", ["7", "8", "9"], DistroBase.RHEL),
-    ("AMAZON", "amzn", ["2", "2023"], DistroBase.RHEL),
+    ("AMAZON", "amzn", ["2023"], DistroBase.RHEL),
     ("ROCKY", "rocky", ["8", "9"], DistroBase.RHEL),
     ("DEBIAN", "debian", ["10", "11"], DistroBase.DEBIAN),
     ("UBUNTU", "ubuntu", ["20.04", "21.04", "21.10", "22.04", "24.04"], DistroBase.DEBIAN),

unit_tests/test_utils_distro.py

@@ -348,12 +348,6 @@ def test_ubuntu22(self):
         self.assertTrue(distro.is_ubuntu22)
         self.assertTrue(distro.is_ubuntu)
 
-    def test_amazon2(self):
-        self.assertTrue(Distro.AMAZON2.is_amazon2)
-        distro = Distro.from_os_release(DISTROS_OS_RELEASE["Amazon Linux 2"])
-        self.assertTrue(distro.is_amazon2)
-        self.assertTrue(distro.is_rhel_like)
-
     def test_amazon2023(self):
         self.assertTrue(Distro.AMAZON2023.is_amazon2023)
         distro = Distro.from_os_release(DISTROS_OS_RELEASE["Amazon Linux 2023"])

utils/scylla_doctor.py

@@ -114,7 +114,7 @@ def filter_out_failed_collectors(self, collector):
             return True
 
         # https://github.com/scylladb/scylladb/issues/18631
-        if self.node.distro.is_amazon2 and collector in ["CPUSetCollector", "PerftuneSystemConfigurationCollector"]:
+        if collector in ["CPUSetCollector", "PerftuneSystemConfigurationCollector"]:
             return True
 
         return False