Skip to content

Commit 5b9608e

Browse files
committed
Shelved GOSS checks in tmpl while troubleshoot tests.
1 parent e0a281b commit 5b9608e

3 files changed

Lines changed: 39 additions & 42 deletions

File tree

images/capi/packer/goss/goss-vars.yaml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -703,11 +703,8 @@ windows:
703703
- "metadata_file=META_DATA"
704704
- "networkdata_file=NETWORK_CONFIG"
705705
- "userdata_file=USER_DATA"
706-
'c:/program files/Cloudbase Solutions/Cloudbase-init/conf/cloudbase-init-unattend.conf':
707-
exists: true
708-
filetype: file
709-
contains:
710-
- "metadata_services=cloudbaseinit.metadata.services.nocloudservice.NoCloudConfigDriveService"
711706
'c:/program files/Cloudbase Solutions/Cloudbase-init/localscripts/cloudbase_helper.py':
712707
exists: true
713708
filetype: file
709+
contains:
710+
- "Apply Proxmox NoCloud network data staged as NETWORK_CONFIG."

images/capi/packer/proxmox/packer-windows.json.tmpl

Lines changed: 2 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -122,45 +122,10 @@
122122
"type": "windows-restart",
123123
"restart_timeout": "20m"
124124
},
125-
126-
{
127-
"arch": "{{user `goss_arch`}}",
128-
"download_path": "{{user `goss_download_path`}}",
129-
"except": "file",
130-
"format": "{{user `goss_format`}}",
131-
"format_options": "{{user `goss_format_options`}}",
132-
"goss_file": "{{user `goss_entry_file`}}",
133-
"inspect": "{{user `goss_inspect_mode`}}",
134-
"remote_folder": "{{user `goss_remote_folder`}}",
135-
"remote_path": "{{user `goss_remote_path`}}",
136-
"skip_install": "{{user `goss_skip_install`}}",
137-
"target_os": "Windows",
138-
"tests": [
139-
"{{user `goss_tests_dir`}}"
140-
],
141-
"type": "goss",
142-
"url": "{{user `goss_url`}}",
143-
"use_sudo": false,
144-
"vars_env": {
145-
"GOSS_MAX_CONCURRENT": "1",
146-
"GOSS_USE_ALPHA": "1"
147-
},
148-
"vars_file": "{{user `goss_vars_file`}}",
149-
"vars_inline": {
150-
"OS": "{{user `distro_name` | lower}}",
151-
"PROVIDER": "proxmox",
152-
"containerd_version": "{{user `containerd_version`}}",
153-
"distribution_version": "{{user `distribution_version`}}",
154-
"kubernetes_version": "{{user `kubernetes_semver`}}",
155-
"pause_image": "{{user `pause_image`}}",
156-
"runtime": "{{user `runtime`}}",
157-
"ssh_source_url": "{{user `ssh_source_url`}}"
158-
},
159-
"version": "{{user `goss_version`}}"
160-
},
161125
{
162126
"inline": [
163-
"nssm stop kubelet && rm -Force -Recurse C:\\var\\log\\kubelet\\*"
127+
"nssm stop kubelet",
128+
"Remove-Item -Force -Recurse C:\\var\\log\\kubelet\\* -ErrorAction SilentlyContinue"
164129
],
165130
"type": "powershell"
166131
},
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
{
2+
"arch": "{{user `goss_arch`}}",
3+
"download_path": "{{user `goss_download_path`}}",
4+
"except": "file",
5+
"format": "{{user `goss_format`}}",
6+
"format_options": "{{user `goss_format_options`}}",
7+
"goss_file": "{{user `goss_entry_file`}}",
8+
"inspect": "{{user `goss_inspect_mode`}}",
9+
"remote_folder": "{{user `goss_remote_folder`}}",
10+
"remote_path": "{{user `goss_remote_path`}}",
11+
"skip_install": "{{user `goss_skip_install`}}",
12+
"target_os": "Windows",
13+
"tests": [
14+
"{{user `goss_tests_dir`}}"
15+
],
16+
"type": "goss",
17+
"url": "{{user `goss_url`}}",
18+
"use_sudo": false,
19+
"vars_env": {
20+
"GOSS_MAX_CONCURRENT": "1",
21+
"GOSS_USE_ALPHA": "1"
22+
},
23+
"vars_file": "{{user `goss_vars_file`}}",
24+
"vars_inline": {
25+
"OS": "{{user `distro_name` | lower}}",
26+
"PROVIDER": "proxmox",
27+
"containerd_version": "{{user `containerd_version`}}",
28+
"distribution_version": "{{user `distribution_version`}}",
29+
"kubernetes_version": "{{user `kubernetes_semver`}}",
30+
"pause_image": "{{user `pause_image`}}",
31+
"runtime": "{{user `runtime`}}",
32+
"ssh_source_url": "{{user `ssh_source_url`}}"
33+
},
34+
"version": "{{user `goss_version`}}"
35+
}

0 commit comments

Comments
 (0)