From 7825eeb1333575bbc6ffad6e922ec82a5d17d461 Mon Sep 17 00:00:00 2001
From: Vignesh Goutham Ganesh <vgg@amazon.com>
Date: Tue, 11 Jan 2022 21:00:12 -0800
Subject: [PATCH 02/18] Output vsphere builds to content library instead of
 exports

Signed-off-by: Vignesh Goutham Ganesh <vgg@amazon.com>
---
 images/capi/packer/ova/packer-node.json | 36 ++++++++++++++++---------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/images/capi/packer/ova/packer-node.json b/images/capi/packer/ova/packer-node.json
index d6fc80fdd..0b3e48792 100644
--- a/images/capi/packer/ova/packer-node.json
+++ b/images/capi/packer/ova/packer-node.json
@@ -173,6 +173,12 @@
         }
       ],
       "type": "vsphere-iso",
+       "content_library_destination": {
+         "name": "{{user `build_version`}}",
+         "library": "{{user `vsphere_library_name`}}",
+         "ovf": true,
+         "destroy": true
+      },
       "username": "{{user `username`}}",
       "vcenter_server": "{{user `vcenter_server`}}",
       "vm_name": "{{user `base_build_version`}}",
@@ -194,11 +200,6 @@
       "datacenter": "{{user `datacenter`}}",
       "datastore": "{{user `datastore`}}",
       "disk_controller_type": "{{user `disk_controller_type`}}",
-      "export": {
-        "force": true,
-        "manifest": "{{ user `export_manifest`}}",
-        "output_directory": "{{user `output_dir`}}"
-      },
       "firmware": "{{user `firmware`}}",
       "floppy_dirs": "{{ user `floppy_dirs`}}",
       "folder": "{{user `folder`}}",
@@ -229,6 +230,12 @@
         }
       ],
       "type": "vsphere-iso",
+      "content_library_destination": {
+        "name": "{{user `build_version`}}",
+        "library": "{{user `vsphere_library_name`}}",
+        "ovf": true,
+        "destroy": true
+      },
       "username": "{{user `username`}}",
       "vcenter_server": "{{user `vcenter_server`}}",
       "vm_name": "{{user `build_version`}}",
@@ -244,11 +251,6 @@
       "create_snapshot": "{{user `create_snapshot`}}",
       "datacenter": "{{user `datacenter`}}",
       "datastore": "{{user `datastore`}}",
-      "export": {
-        "force": true,
-        "manifest": "{{ user `export_manifest`}}",
-        "output_directory": "{{user `output_dir`}}"
-      },
       "folder": "{{user `folder`}}",
       "host": "{{user `host`}}",
       "insecure_connection": "{{user `insecure_connection`}}",
@@ -268,6 +270,13 @@
     }
   ],
   "post-processors": [
+    {
+      "inline": [
+        "mkdir -p {{user `output_dir`}}"
+      ],
+      "name": "create-output-dir",
+      "type": "shell-local"
+    },
     {
       "custom_data": {
         "build_date": "{{isotime}}",
@@ -303,7 +312,9 @@
       ],
       "inline": [
         "cd {{user `output_dir`}}",
-        "../../hack/image-build-ova.py --vmx {{user `vmx_version`}} --eula ../../hack/ovf_eula.txt --ovf_template ../../hack/ovf_template.xml --vmdk_file {{user `build_version`}}-disk-0.vmdk"
+        "govc library.export /{{user `vsphere_library_name`}}/{{user `build_version`}}",
+        "govc library.rm /{{user `vsphere_library_name`}}/{{user `build_version`}}",
+        "../hack/image-build-ova.py --vmx {{user `vmx_version`}} --eula ../hack/ovf_eula.txt --ovf_template ../hack/ovf_template.xml --vmdk_file {{user `build_version`}}-1.vmdk"
       ],
       "name": "vsphere",
       "type": "shell-local"
@@ -480,6 +491,7 @@
     "output_dir": "./output/{{user `build_version`}}",
     "username": "",
     "vcenter_server": "",
-    "vsphere_guest_os_type": null
+    "vsphere_guest_os_type": null,
+    "vsphere_library_name": ""
   }
 }
-- 
2.39.1