Skip to content

Commit 7066d8d

Browse files
himani2411Himani Deshpande
himani2411
and
Himani Deshpande
authored
Deprecating support for Ubuntu18 (aws#5436)
* Deprecating Ubuntu18 from CLI * Deprecating Ubuntu18 from Integration Tests --------- Co-authored-by: Himani Deshpande <[email protected]>
1 parent c157a81 commit 7066d8d

File tree

47 files changed

+125
-142
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+125
-142
lines changed

‎cli/src/pcluster/cli/commands/dcv_util.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ def get_supported_dcv_os(architecture):
1616
"""Return a list of all the operating system supported by DCV."""
1717
architectures_dict = {
1818
"x86_64": SUPPORTED_OSES,
19-
"arm64": ["ubuntu1804", "alinux2", "centos7", "rhel8"],
19+
"arm64": ["alinux2", "centos7", "rhel8"],
2020
}
2121
return architectures_dict.get(architecture, [])

‎cli/src/pcluster/constants.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
SUPPORTED_SCHEDULERS = ["slurm", "awsbatch"]
2525
SCHEDULERS_SUPPORTING_IMDS_SECURED = ["slurm"]
26-
SUPPORTED_OSES = ["alinux2", "centos7", "ubuntu1804", "ubuntu2004", "ubuntu2204", "rhel8"]
26+
SUPPORTED_OSES = ["alinux2", "centos7", "ubuntu2004", "ubuntu2204", "rhel8"]
2727
SUPPORTED_OSES_FOR_SCHEDULER = {"slurm": SUPPORTED_OSES, "awsbatch": ["alinux2"]}
2828
DELETE_POLICY = "Delete"
2929
RETAIN_POLICY = "Retain"
@@ -37,7 +37,6 @@
3737
OS_MAPPING = {
3838
"centos7": {"user": "centos"},
3939
"alinux2": {"user": "ec2-user"},
40-
"ubuntu1804": {"user": "ubuntu"},
4140
"ubuntu2004": {"user": "ubuntu"},
4241
"ubuntu2204": {"user": "ubuntu"},
4342
"rhel8": {"user": "ec2-user"},
@@ -46,7 +45,6 @@
4645
OS_TO_IMAGE_NAME_PART_MAP = {
4746
"alinux2": "amzn2-hvm",
4847
"centos7": "centos7-hvm",
49-
"ubuntu1804": "ubuntu-1804-lts-hvm",
5048
"ubuntu2004": "ubuntu-2004-lts-hvm",
5149
"ubuntu2204": "ubuntu-2204-lts-hvm",
5250
"rhel8": "rhel8-hvm",

‎cli/src/pcluster/resources/imagebuilder/parallelcluster.yaml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ phases:
5757
[ -n "${CfnParamCincInstaller}" ] && CINC_URL="${CfnParamCincInstaller}"
5858
echo "${!CINC_URL}"
5959
60-
# Check input base AMI OS and get OS information, the output should be like centos.7 | amzn.2 | ubuntu.18.04 | ubuntu.20.04 | ubuntu.22.04 | rhel.8.7
60+
# Check input base AMI OS and get OS information, the output should be like centos.7 | amzn.2 | ubuntu.20.04 | ubuntu.22.04 | rhel.8.7
6161
- name: OperatingSystemRelease
6262
action: ExecuteBash
6363
inputs:
@@ -86,8 +86,6 @@ phases:
8686
OS='alinux2'
8787
elif [ `echo "${!RELEASE}" | grep '^centos\.7'` ]; then
8888
OS='centos7'
89-
elif [ `echo "${!RELEASE}" | grep '^ubuntu\.18'` ]; then
90-
OS='ubuntu1804'
9189
elif [ `echo "${!RELEASE}" | grep '^ubuntu\.20'` ]; then
9290
OS='ubuntu2004'
9391
elif [ `echo "${!RELEASE}" | grep '^ubuntu\.22'` ]; then
@@ -153,10 +151,10 @@ phases:
153151
exit {{ FailExitCode }}
154152
fi
155153
156-
# This component only supports aarch64 CPUs on Amazon Linux 2, Ubuntu1804, Ubuntu2004, Ubuntu2204, Centos7 and RHEL8
154+
# This component only supports aarch64 CPUs on Amazon Linux 2, Ubuntu2004, Ubuntu2204, Centos7 and RHEL8
157155
ARCH=$(uname -m)
158156
if [[ `echo ${!ARCH}` == 'aarch64' ]]; then
159-
if [ `echo "${!RELEASE}" | grep -Ev '^(amzn\.2|centos\.7|ubuntu\.18\.04|ubuntu\.20\.04|ubuntu\.22\.04|rhel\.8)'` ]; then
157+
if [ `echo "${!RELEASE}" | grep -Ev '^(amzn\.2|centos\.7|ubuntu\.20\.04|ubuntu\.22\.04|rhel\.8)'` ]; then
160158
echo "This component does not support '${!RELEASE}' on ARM64 CPUs. Failing build."
161159
exit {{ FailExitCode }}
162160
fi

‎cli/src/pcluster/resources/imagebuilder/parallelcluster_tag.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,6 @@ phases:
4949
OS='alinux2'
5050
elif [ $(echo "${RELEASE}" | grep '^centos\.7') ]; then
5151
OS='centos7'
52-
elif [ $(echo "${RELEASE}" | grep '^ubuntu\.18') ]; then
53-
OS='ubuntu1804'
5452
elif [ $(echo "${RELEASE}" | grep '^ubuntu\.20') ]; then
5553
OS='ubuntu2004'
5654
elif [ $(echo "${RELEASE}" | grep '^ubuntu\.22') ]; then

‎cli/src/pcluster/resources/imagebuilder/parallelcluster_test.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ phases:
3838
OS='alinux2'
3939
elif [ `echo "${RELEASE}" | grep '^centos\.7'` ]; then
4040
OS='centos7'
41-
elif [ `echo "${RELEASE}" | grep '^ubuntu\.18'` ]; then
42-
OS='ubuntu1804'
4341
elif [ `echo "${RELEASE}" | grep '^ubuntu\.20'` ]; then
4442
OS='ubuntu2004'
4543
elif [ `echo "${RELEASE}" | grep '^ubuntu\.22'` ]; then

‎cli/src/pcluster/resources/imagebuilder/parallelcluster_validate.yaml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ phases:
3838
OS='alinux2'
3939
elif [ `echo "${RELEASE}" | grep '^centos\.7'` ]; then
4040
OS='centos7'
41-
elif [ `echo "${RELEASE}" | grep '^ubuntu\.18'` ]; then
42-
OS='ubuntu1804'
4341
elif [ `echo "${RELEASE}" | grep '^ubuntu\.20'` ]; then
4442
OS='ubuntu2004'
4543
elif [ `echo "${RELEASE}" | grep '^ubuntu\.22'` ]; then
@@ -126,7 +124,7 @@ phases:
126124
set -v
127125
ARCHITECTURE='{{ validate.OperatingSystemArchitecture.outputs.stdout }}'
128126
OS='{{ validate.OperatingSystemName.outputs.stdout }}'
129-
if [ ${ARCHITECTURE} == 'arm64' ] && [[ ${OS} =~ ^(ubuntu(18|20|22)04|alinux2|rhel8)$ ]] || [ ${ARCHITECTURE} == 'x86_64' ]; then
127+
if [ ${ARCHITECTURE} == 'arm64' ] && [[ ${OS} =~ ^(ubuntu(20|22)04|alinux2|rhel8)$ ]] || [ ${ARCHITECTURE} == 'x86_64' ]; then
130128
echo "true"
131129
else
132130
echo "false"
@@ -326,8 +324,6 @@ phases:
326324
echo "Checking for Lustre client..."
327325
if [ ${OS} == centos7 ]; then
328326
rpm -qa | grep lustre-client
329-
elif [ ${OS} == ubuntu1804 ]; then
330-
dpkg -l | grep lustre
331327
fi
332328
fi
333329
[[ $? -ne 0 ]] && echo "Check for Lustre client failed" && exit 1

‎cli/src/pcluster/resources/imagebuilder/update_and_reboot.yaml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ constants:
1010
phases:
1111
- name: build
1212
steps:
13-
# Check input base AMI OS and get OS information, the output should be like centos.7 | amzn.2 | ubuntu.18.04 | ubuntu.20.04 | ubuntu.22.04 | rhel.8.7
13+
# Check input base AMI OS and get OS information, the output should be like centos.7 | amzn.2 | ubuntu.20.04 | ubuntu.22.04 | rhel.8.7
1414
- name: OperatingSystemRelease
1515
action: ExecuteBash
1616
inputs:
@@ -39,8 +39,6 @@ phases:
3939
OS='alinux2'
4040
elif [ `echo "${!RELEASE}" | grep '^centos\.7'` ]; then
4141
OS='centos7'
42-
elif [ `echo "${!RELEASE}" | grep '^ubuntu\.18'` ]; then
43-
OS='ubuntu1804'
4442
elif [ `echo "${!RELEASE}" | grep '^ubuntu\.20'` ]; then
4543
OS='ubuntu2004'
4644
elif [ `echo "${!RELEASE}" | grep '^ubuntu\.22'` ]; then
@@ -84,10 +82,10 @@ phases:
8482
exit {{ FailExitCode }}
8583
fi
8684
87-
# This component only supports aarch64 CPUs on Amazon Linux 2, Ubuntu1804, Ubuntu2004, Ubuntu2204, Centos7 and RHEL 8
85+
# This component only supports aarch64 CPUs on Amazon Linux 2, Ubuntu2004, Ubuntu2204, Centos7 and RHEL 8
8886
ARCH=$(uname -m)
8987
if [[ `echo ${!ARCH}` == 'aarch64' ]]; then
90-
if [ `echo "${!RELEASE}" | grep -Ev '^(amzn\.2|centos\.7|ubuntu\.18\.04|ubuntu\.20\.04|ubuntu\.22\.04|rhel\.8)'` ]; then
88+
if [ `echo "${!RELEASE}" | grep -Ev '^(amzn\.2|centos\.7|ubuntu\.20\.04|ubuntu\.22\.04|rhel\.8)'` ]; then
9189
echo "This component does not support '${!RELEASE}' on ARM64 CPUs. Failing build."
9290
exit {{ FailExitCode }}
9391
fi

‎cli/src/pcluster/templates/cw_dashboard_builder.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -710,7 +710,7 @@ def _add_cw_log(self):
710710
),
711711
self._new_cw_log_widget(
712712
title="syslog",
713-
conditions=[Condition(["ubuntu1804", "ubuntu2004", "ubuntu2204"], base_os)],
713+
conditions=[Condition(["ubuntu2004", "ubuntu2204"], base_os)],
714714
filters=[self._new_filter(pattern=f"{head_private_ip}.*syslog")],
715715
),
716716
self._new_cw_log_widget(

‎cli/tests/pcluster/cli/configure/test_pcluster_configure.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@ def _run_input_test(
453453
):
454454
if with_input:
455455
input_composer = ComposeInput(aws_region_name="us-east-1", key="key2", scheduler="slurm")
456-
input_composer.add_first_flow(op_sys="ubuntu1804", head_node_instance=head_node_instance)
456+
input_composer.add_first_flow(op_sys="ubuntu2004", head_node_instance=head_node_instance)
457457
input_composer.add_compute_instance(compute_instance, "18")
458458
input_composer.add_no_automation_no_empty_vpc(
459459
vpc_id="vpc-34567891", head_node_id="subnet-34567891", compute_id="subnet-45678912"

‎cli/tests/pcluster/cli/configure/test_pcluster_configure/test_disabled_efa_no_placement_group/output.txt‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,9 @@ Allowed values for Scheduler:
3232
Allowed values for Operating System:
3333
1. alinux2
3434
2. centos7
35-
3. ubuntu1804
36-
4. ubuntu2004
37-
5. ubuntu2204
38-
6. rhel8
35+
3. ubuntu2004
36+
4. ubuntu2204
37+
5. rhel8
3938
The EC2 instance selected supports enhanced networking capabilities using Elastic Fabric Adapter (EFA). EFA enables you to run applications requiring high levels of inter-node communications at scale on AWS at no additional charge (https://docs.aws.amazon.com/parallelcluster/latest/ug/efa-v3.html).
4039
Allowed values for VPC ID:
4140
# id name number_of_subnets

0 commit comments

Comments
 (0)