From 2dfca2a7cdad5941c05f9f070b126d4b80398ce3 Mon Sep 17 00:00:00 2001
From: Jackson West <jgw@amazon.com>
Date: Wed, 28 Jun 2023 12:42:22 -0500
Subject: [PATCH 17/18] sets OS_VERSION for goss validation on raw image builds

---
 images/capi/packer/raw/packer.json              | 1 +
 images/capi/packer/raw/raw-ubuntu-1804.json     | 1 +
 images/capi/packer/raw/raw-ubuntu-2004-efi.json | 1 +
 images/capi/packer/raw/raw-ubuntu-2004.json     | 1 +
 images/capi/packer/raw/raw-ubuntu-2204-efi.json | 1 +
 images/capi/packer/raw/raw-ubuntu-2204.json     | 3 ++-
 6 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/images/capi/packer/raw/packer.json b/images/capi/packer/raw/packer.json
index dc494a1e8..7529f655a 100644
--- a/images/capi/packer/raw/packer.json
+++ b/images/capi/packer/raw/packer.json
@@ -114,6 +114,7 @@
       "vars_inline": {
         "ARCH": "amd64",
         "OS": "{{user `distro_name` | lower}}",
+        "OS_VERSION": "{{user `distro_version` | lower}}",
         "PROVIDER": "raw",
         "containerd_version": "{{user `containerd_version`}}",
         "kubernetes_cni_deb_version": "{{ user `kubernetes_cni_deb_version` }}",
diff --git a/images/capi/packer/raw/raw-ubuntu-1804.json b/images/capi/packer/raw/raw-ubuntu-1804.json
index 46ef18d9e..f87538b05 100644
--- a/images/capi/packer/raw/raw-ubuntu-1804.json
+++ b/images/capi/packer/raw/raw-ubuntu-1804.json
@@ -4,6 +4,7 @@
   "build_name": "ubuntu-1804",
   "build_target": "raw",
   "distro_name": "ubuntu",
+  "distro_version": "18.04",
   "guest_os_type": "ubuntu-64",
   "iso_checksum": "f5cbb8104348f0097a8e513b10173a07dbc6684595e331cb06f93f385d0aecf6",
   "iso_checksum_type": "sha256",
diff --git a/images/capi/packer/raw/raw-ubuntu-2004-efi.json b/images/capi/packer/raw/raw-ubuntu-2004-efi.json
index 7ed3ac8a3..421fe6976 100644
--- a/images/capi/packer/raw/raw-ubuntu-2004-efi.json
+++ b/images/capi/packer/raw/raw-ubuntu-2004-efi.json
@@ -4,6 +4,7 @@
   "build_name": "ubuntu-2004",
   "build_target": "raw",
   "distro_name": "ubuntu",
+  "distro_version": "20.04",
   "firmware": "OVMF.fd",
   "guest_os_type": "ubuntu-64",
   "iso_checksum": "f11bda2f2caed8f420802b59f382c25160b114ccc665dbac9c5046e7fceaced2",
diff --git a/images/capi/packer/raw/raw-ubuntu-2004.json b/images/capi/packer/raw/raw-ubuntu-2004.json
index 9e78e6384..cbcfbc6f3 100644
--- a/images/capi/packer/raw/raw-ubuntu-2004.json
+++ b/images/capi/packer/raw/raw-ubuntu-2004.json
@@ -4,6 +4,7 @@
   "build_name": "ubuntu-2004",
   "build_target": "raw",
   "distro_name": "ubuntu",
+  "distro_version": "20.04",
   "guest_os_type": "ubuntu-64",
   "iso_checksum": "f11bda2f2caed8f420802b59f382c25160b114ccc665dbac9c5046e7fceaced2",
   "iso_checksum_type": "sha256",
diff --git a/images/capi/packer/raw/raw-ubuntu-2204-efi.json b/images/capi/packer/raw/raw-ubuntu-2204-efi.json
index 7d2f921c5..279c5bcc3 100644
--- a/images/capi/packer/raw/raw-ubuntu-2204-efi.json
+++ b/images/capi/packer/raw/raw-ubuntu-2204-efi.json
@@ -3,6 +3,7 @@
   "build_name": "ubuntu-2204",
   "build_target": "raw",
   "distro_name": "ubuntu",
+  "distro_version": "22.04",
   "firmware": "OVMF.fd",
   "guest_os_type": "ubuntu-64",
   "iso_checksum": "5e38b55d57d94ff029719342357325ed3bda38fa80054f9330dc789cd2d43931",
diff --git a/images/capi/packer/raw/raw-ubuntu-2204.json b/images/capi/packer/raw/raw-ubuntu-2204.json
index 38e827ef1..7a7b3109f 100644
--- a/images/capi/packer/raw/raw-ubuntu-2204.json
+++ b/images/capi/packer/raw/raw-ubuntu-2204.json
@@ -2,7 +2,8 @@
   "boot_command_prefix": "c<wait>linux /casper/vmlinuz --- autoinstall ds='nocloud-net;s=http://{{ .HTTPIP }}:{{ .HTTPPort }}/22.04/'<enter><wait>initrd /casper/initrd<enter><wait>boot<enter>",
   "build_name": "ubuntu-2204",
   "build_target": "raw",
-  "distro_name": "ubuntu",  
+  "distro_name": "ubuntu",
+  "distro_version": "22.04",
   "guest_os_type": "ubuntu-64",
   "iso_checksum": "5e38b55d57d94ff029719342357325ed3bda38fa80054f9330dc789cd2d43931",
   "iso_checksum_type": "sha256",
-- 
2.39.1