Align naming of kitchen.ec2.yml to the one in kitchen.docker.yml

Author: ermanno

.github/workflows/dokken-unit-tests.yml

@@ -10,8 +10,8 @@ jobs:
         os: &os-list
           - alinux2
           - centos7
-          - ubuntu18
-          - ubuntu20
+          - ubuntu1804
+          - ubuntu2004
           - rhel8
         suite:
           - setup-envars
@@ -111,8 +111,8 @@ jobs:
         os:
           - alinux2
           - centos7
-          - ubuntu18
-          - ubuntu20
+          - ubuntu1804
+          - ubuntu2004
           - rhel8
         suite:
           - fs-update

.github/workflows/dokken-validate.yml

@@ -14,8 +14,8 @@ jobs:
         os:
           - alinux2
           - centos7
-          - ubuntu18
-          - ubuntu20
+          - ubuntu1804
+          - ubuntu2004
           - rhel8
         suite:
           - aws-parallelcluster-install

README.md

@@ -70,10 +70,10 @@ export KITCHEN_SECURITY_GROUP_ID=sg-your-group
 
 # amis for eu-west-1
 export KITCHEN_ALINUX2_AMI=ami-xxxxxxxxxxxxxxxxx
-export KITCHEN_REDHAT8_AMI=ami-xxxxxxxxxxxxxxxxx
+export KITCHEN_RHEL8_AMI=ami-xxxxxxxxxxxxxxxxx
 export KITCHEN_CENTOS7_AMI=ami-xxxxxxxxxxxxxxxxx
-export KITCHEN_UBUNTU18_AMI=ami-xxxxxxxxxxxxxxxxx
-export KITCHEN_UBUNTU20_AMI=ami-xxxxxxxxxxxxxxxxx
+export KITCHEN_UBUNTU1804_AMI=ami-xxxxxxxxxxxxxxxxx
+export KITCHEN_UBUNTU2004_AMI=ami-xxxxxxxxxxxxxxxxx
 ```
 
 ### Known issues with docker

kitchen.ec2.sh

@@ -32,16 +32,16 @@
 # KITCHEN_ALINUX2_AMI:        specific AMI to use for alinux2
 #                             if not specified, will look for the latest suitable ParallelCluster AMI
 #
-# KITCHEN_REDHAT8_AMI:        specific AMI to use for redhat8
+# KITCHEN_RHEL8_AMI:        specific AMI to use for redhat8
 #                             if not specified, will look for the latest suitable ParallelCluster AMI
 #
 # KITCHEN_CENTOS7_AMI:        specific AMI to use for centos7
 #                             if not specified, will look for the latest suitable ParallelCluster AMI
 #
-# KITCHEN_UBUNTU18_AMI:       specific AMI to use for ubuntu18.04
+# KITCHEN_UBUNTU1804_AMI:       specific AMI to use for ubuntu18.04
 #                             if not specified, will look for the latest suitable ParallelCluster AMI
 #
-# KITCHEN_UBUNTU20_AMI:       specific AMI to use for ubuntu20.04
+# KITCHEN_UBUNTU2004_AMI:       specific AMI to use for ubuntu20.04
 #                             if not specified, will look for the latest suitable ParallelCluster AMI
 #
 

kitchen.ec2.yml

@@ -78,9 +78,9 @@ platforms:
   - name: rhel8
     driver_plugin: ec2
     driver:
-      <% if ENV['KITCHEN_REDHAT8_AMI'] %>
+      <% if ENV['KITCHEN_RHEL8_AMI'] %>
       # Use the RedHat 8 AMI most similar to the base AMI used to build the ParallelCluster image
-      image_id: <%= ENV['KITCHEN_REDHAT8_AMI'] %>
+      image_id: <%= ENV['KITCHEN_RHEL8_AMI'] %>
       <% else %>
       image_search:
         name: <% if ENV['KITCHEN_PHASE']=='install' %>RHEL-8.7.*_HVM*<% else %><%= pcluster_prefix %>-rhel8-hvm-*<% end %>
@@ -132,9 +132,9 @@ platforms:
   - name: ubuntu1804
     driver_plugin: ec2
     driver:
-      <% if ENV['KITCHEN_UBUNTU18_AMI'] %>
+      <% if ENV['KITCHEN_UBUNTU1804_AMI'] %>
       # Use the Ubuntu 18 AMI most similar to the base AMI used to build the ParallelCluster image
-      image_id: <%= ENV['KITCHEN_UBUNTU18_AMI'] %>
+      image_id: <%= ENV['KITCHEN_UBUNTU1804_AMI'] %>
       <% else %>
       image_search:
         name: <% if ENV['KITCHEN_PHASE']=='install' %>ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-<% if ENV['KITCHEN_ARCHITECTURE'] == 'x86_64' %>amd64<% else %>arm64<% end %>-server-20221207<% else %><%= pcluster_prefix %>-ubuntu-1804-lts-hvm-*<% end %>
@@ -159,9 +159,9 @@ platforms:
   - name: ubuntu2004
     driver_plugin: ec2
     driver:
-      <% if ENV['KITCHEN_UBUNTU20_AMI'] %>
+      <% if ENV['KITCHEN_UBUNTU2004_AMI'] %>
       # Use the Ubuntu 20 AMI most similar to the base AMI used to build the ParallelCluster image
-      image_id: <%= ENV['KITCHEN_UBUNTU20_AMI'] %>
+      image_id: <%= ENV['KITCHEN_UBUNTU2004_AMI'] %>
       <% else %>
       image_search:
         name: <% if ENV['KITCHEN_PHASE']=='install' %>ubuntu/images/hvm-ssd/ubuntu-focal-20.04-<% if ENV['KITCHEN_ARCHITECTURE'] == 'x86_64' %>amd64<% else %>arm64<% end %>-server-20230112<% else %><%= pcluster_prefix %>-ubuntu-2004-lts-hvm-*<% end %>