From 50addfe60e02f8a8c10ec9d88fe0791f0cbc7d48 Mon Sep 17 00:00:00 2001 From: Shalin Patel Date: Fri, 18 Aug 2023 06:50:13 -0700 Subject: [PATCH] ci: use vsphere base templates from d2iq-base-templates vsphere folder (#870) * ci: use base d2iq templates * ci: set vsphere base templates from d2iq-base-templates directory --- images/ova/rhel-79.yaml | 2 +- images/ova/rhel-84.yaml | 2 +- images/ova/rhel-86.yaml | 2 +- images/ova/rocky-91.yaml | 2 +- images/ova/ubuntu-2004.yaml | 2 +- test/infra/vsphere/packer-vsphere-airgap.yaml.tmpl | 4 +--- 6 files changed, 6 insertions(+), 8 deletions(-) diff --git a/images/ova/rhel-79.yaml b/images/ova/rhel-79.yaml index ae82c34b1..f9609042d 100644 --- a/images/ova/rhel-79.yaml +++ b/images/ova/rhel-79.yaml @@ -13,7 +13,7 @@ packer: insecure_connection: "false" network: "" resource_pool: "" - template: "os-qualification-templates/d2iq-base-RHEL-79" + template: "d2iq-base-templates/d2iq-base-RHEL-79" vsphere_guest_os_type: "rhel7_64Guest" guest_os_type: "rhel7-64" # goss params diff --git a/images/ova/rhel-84.yaml b/images/ova/rhel-84.yaml index b75d177f0..99ddae15f 100644 --- a/images/ova/rhel-84.yaml +++ b/images/ova/rhel-84.yaml @@ -13,7 +13,7 @@ packer: insecure_connection: "false" network: "" resource_pool: "" - template: "os-qualification-templates/d2iq-base-RHEL-84" # change default value with your base template name + template: "d2iq-base-templates/d2iq-base-RHEL-84" # change default value with your base template name vsphere_guest_os_type: "rhel8_64Guest" guest_os_type: "rhel8-64" # goss params diff --git a/images/ova/rhel-86.yaml b/images/ova/rhel-86.yaml index 6d8da5c0e..986014ea4 100644 --- a/images/ova/rhel-86.yaml +++ b/images/ova/rhel-86.yaml @@ -13,7 +13,7 @@ packer: insecure_connection: "false" network: "" resource_pool: "" - template: "os-qualification-templates/d2iq-base-RHEL-86" # change default value with your base template name + template: "d2iq-base-templates/d2iq-base-RHEL-86" # change default value with your base template name vsphere_guest_os_type: "rhel8_64Guest" guest_os_type: "rhel8-64" # goss params diff --git a/images/ova/rocky-91.yaml b/images/ova/rocky-91.yaml index 526c1d07a..3becc235b 100644 --- a/images/ova/rocky-91.yaml +++ b/images/ova/rocky-91.yaml @@ -13,7 +13,7 @@ packer: insecure_connection: "false" network: "" resource_pool: "" - template: "os-qualification-templates/d2iq-base-RockyLinux-9.1" # change default value with your base template name + template: "d2iq-base-templates/d2iq-base-RockyLinux-9.1" # change default value with your base template name vsphere_guest_os_type: "other4xLinux64Guest" guest_os_type: "rocky9-64" # goss params diff --git a/images/ova/ubuntu-2004.yaml b/images/ova/ubuntu-2004.yaml index c8f1c3aa8..53aec4e75 100644 --- a/images/ova/ubuntu-2004.yaml +++ b/images/ova/ubuntu-2004.yaml @@ -13,7 +13,7 @@ packer: insecure_connection: "false" network: "" resource_pool: "" - template: "os-qualification-templates/d2iq-base-Ubuntu-20.04" # change default value with your base template name + template: "d2iq-base-templates/d2iq-base-Ubuntu-20.04" # change default value with your base template name vsphere_guest_os_type: "other4xLinux64Guest" guest_os_type: "ubuntu2004-64" # goss params diff --git a/test/infra/vsphere/packer-vsphere-airgap.yaml.tmpl b/test/infra/vsphere/packer-vsphere-airgap.yaml.tmpl index a68e4ae48..8ce5aba44 100644 --- a/test/infra/vsphere/packer-vsphere-airgap.yaml.tmpl +++ b/test/infra/vsphere/packer-vsphere-airgap.yaml.tmpl @@ -15,6 +15,4 @@ packer: folder: "cluster-api" network: "Airgapped" resource_pool: "Users" - # ssh authentication with base template VM. - ssh_username: "builder" - ssh_agent_auth: true + ssh_username: "kib"