Merge pull request #32 from CircleCI-Public/fix/update-ubuntu-images-dec

fix: updated supported ubuntu images

Author: rlegan

pkg/parser/validate/executor.go

@@ -116,16 +116,30 @@ func (val Validate) validateLinuxMachineExecutor(executor ast.MachineExecutor) {
 }
 
 var ValidARMOrMachineImages = []string{
+	// Ubuntu 2004
 	"ubuntu-2004:current",
+	"ubuntu-2004:2022.10.1",
+	"ubuntu-2004:2022.07.1",
+	"ubuntu-2004:2022.04.2",
 	"ubuntu-2004:2022.04.1",
 	"ubuntu-2004:202201-02",
 	"ubuntu-2004:202201-01",
 	"ubuntu-2004:202111-02",
 	"ubuntu-2004:202111-01",
-	"ubuntu-2004:202107-01",
+	"ubuntu-2004:202107-02",
 	"ubuntu-2004:202104-01",
 	"ubuntu-2004:202101-01",
-	"ubuntu-2004:202011-01",
+	"ubuntu-2004:202010-01",
+
+	// Ubuntu 2204
+	"ubuntu-2204:current",
+	"ubuntu-2204:edge",
+	"ubuntu-2204:2022.10.2",
+	"ubuntu-2204:2022.10.1",
+	"ubuntu-2204:2022.07.2",
+	"ubuntu-2204:2022.07.1",
+	"ubuntu-2204:2022.04.2",
+	"ubuntu-2204:2022.04.1",
 }
 
 func (val Validate) validateImage(img string, imgRange protocol.Range) {

pkg/services/complete_test.go

@@ -214,6 +214,15 @@ func TestComplete(t *testing.T) {
 				{
 					Label: "ubuntu-2004:current",
 				},
+				{
+					Label: "ubuntu-2004:2022.10.1",
+				},
+				{
+					Label: "ubuntu-2004:2022.07.1",
+				},
+				{
+					Label: "ubuntu-2004:2022.04.2",
+				},
 				{
 					Label: "ubuntu-2004:2022.04.1",
 				},
@@ -230,7 +239,7 @@ func TestComplete(t *testing.T) {
 					Label: "ubuntu-2004:202111-01",
 				},
 				{
-					Label: "ubuntu-2004:202107-01",
+					Label: "ubuntu-2004:202107-02",
 				},
 				{
 					Label: "ubuntu-2004:202104-01",
@@ -239,7 +248,31 @@ func TestComplete(t *testing.T) {
 					Label: "ubuntu-2004:202101-01",
 				},
 				{
-					Label: "ubuntu-2004:202011-01",
+					Label: "ubuntu-2004:202010-01",
+				},
+				{
+					Label: "ubuntu-2204:current",
+				},
+				{
+					Label: "ubuntu-2204:edge",
+				},
+				{
+					Label: "ubuntu-2204:2022.10.2",
+				},
+				{
+					Label: "ubuntu-2204:2022.10.1",
+				},
+				{
+					Label: "ubuntu-2204:2022.07.2",
+				},
+				{
+					Label: "ubuntu-2204:2022.07.1",
+				},
+				{
+					Label: "ubuntu-2204:2022.04.2",
+				},
+				{
+					Label: "ubuntu-2204:2022.04.1",
 				},
 			},
 		},