Skip to content

Commit

Permalink
fix(artifacts): retire amazon2
Browse files Browse the repository at this point in the history
Based on scylladb/scylladb#18631 (comment)

Fixes: scylladb#8946
  • Loading branch information
yaronkaikov committed Nov 11, 2024
1 parent 93db67c commit 2c5d7a3
Show file tree
Hide file tree
Showing 14 changed files with 3 additions and 180 deletions.
7 changes: 0 additions & 7 deletions configurations/arm/amazon2.yaml

This file was deleted.

5 changes: 0 additions & 5 deletions docs/artifacts_test.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

This file was deleted.

This file was deleted.

14 changes: 0 additions & 14 deletions jenkins-pipelines/oss/artifacts/artifacts-amazon2-arm.jenkinsfile

This file was deleted.

14 changes: 0 additions & 14 deletions jenkins-pipelines/oss/artifacts/artifacts-amazon2.jenkinsfile

This file was deleted.

7 changes: 0 additions & 7 deletions sdcm/cluster.py
Original file line number Diff line number Diff line change
Expand Up @@ -2043,8 +2043,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:
Expand Down Expand Up @@ -2982,11 +2980,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")
Expand Down
7 changes: 1 addition & 6 deletions sdcm/cluster_aws.py
Original file line number Diff line number Diff line change
Expand Up @@ -415,8 +415,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)
Expand Down Expand Up @@ -873,10 +872,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
Expand Down
2 changes: 1 addition & 1 deletion sdcm/utils/distro.py
Original file line number Diff line number Diff line change
Expand Up @@ -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", ["11", "12"], DistroBase.DEBIAN),
("UBUNTU", "ubuntu", ["20.04", "21.04", "21.10", "22.04", "24.04"], DistroBase.DEBIAN),
Expand Down
19 changes: 0 additions & 19 deletions test-cases/artifacts/amazon2.yaml

This file was deleted.

This file was deleted.

This file was deleted.

6 changes: 0 additions & 6 deletions unit_tests/test_utils_distro.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"])
Expand Down
2 changes: 1 addition & 1 deletion utils/scylla_doctor.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 2c5d7a3

Please sign in to comment.