Merge pull request #123 from knabben/topic/knabben/fix-nssm-goss

Fixing GOSS command call on Windows build

Author: galop

ansible-windows/tasks/common.yml

@@ -1,8 +1,12 @@
 # Copyright 2024-25 Broadcom, Inc.
 # SPDX-License-Identifier: MPL-2.0
 
-- name: Copy goss binary
-  win_shell: cp "{{ additional_executables_destination_path }}\\goss.exe" "{{ goss_download_path }}"
+- name: Set GOSS_USE_ALPHA environment variable for Windows
+  ansible.windows.win_environment:
+    state: present
+    name: GOSS_USE_ALPHA
+    value: "1"
+    level: machine
 
 - name: Ensure log redirect directory
   ansible.windows.win_file:
@@ -24,4 +28,4 @@
     dependencies:
       - VMTools
     start_mode: auto
-    state: started
+    state: started

goss/goss-command.yaml

@@ -167,7 +167,6 @@ command:
     stdout:
     - "sandbox = '{{.Vars.pause_image}}'"
     - "conf_dir = 'C:/etc/cni/net.d'"
-    - "bin_dir = 'C:/opt/cni/bin'"
     - "root = 'C:\\ProgramData\\containerd\\root'"
     - "state = 'C:\\ProgramData\\containerd\\state'"
     timeout: 30000

goss/goss-files.yaml

@@ -11,29 +11,31 @@ file:
     - {{.}}
   {{end}}
 {{end}}
-{{range $name, $vers := index .Vars .Vars.OS .Vars.PROVIDER "files"}}
-  {{ $name }}:
-    exists: {{ $vers.exists }}
-    filetype: {{ $vers.filetype }}
-    contains: {{ range $vers.contains}}
-    - {{.}}
+{{ if ne .Vars.OS "windows" }} # Linux Only
+  {{range $name, $vers := index .Vars .Vars.OS .Vars.PROVIDER "files"}}
+    {{ $name }}:
+      exists: {{ $vers.exists }}
+      filetype: {{ $vers.filetype }}
+      contains: {{ range $vers.contains}}
+      - {{.}}
+    {{end}}
   {{end}}
-{{end}}
-# TKG specific changes.
-{{range $name, $vers := index .Vars.tkg .Vars.OS "files"}}
-  {{ $name }}:
-    exists: {{ $vers.exists }}
-    filetype: {{ $vers.filetype }}
-    contains: {{ range $vers.contains}}
-    - {{.}}
+  # TKG specific changes.
+  {{range $name, $vers := index .Vars.tkg .Vars.OS "files"}}
+    {{ $name }}:
+      exists: {{ $vers.exists }}
+      filetype: {{ $vers.filetype }}
+      contains: {{ range $vers.contains}}
+      - {{.}}
+    {{end}}
   {{end}}
-{{end}}
-#VKr STIG specific changes.
-{{range $name, $vers := index .Vars.tkg .Vars.OS "stig" "files"}}
-  {{ $name }}:
-    exists: {{ $vers.exists }}
-    filetype: {{ $vers.filetype }}
-    contains: {{ range $vers.contains}}
-    - {{.}}
+  #VKr STIG specific changes.
+  {{range $name, $vers := index .Vars.tkg .Vars.OS "stig" "files"}}
+    {{ $name }}:
+      exists: {{ $vers.exists }}
+      filetype: {{ $vers.filetype }}
+      contains: {{ range $vers.contains}}
+      - {{.}}
+    {{end}}
   {{end}}
-{{end}}
+{{end}}

goss/goss-vars.yaml

@@ -992,3 +992,5 @@ tkg:
           - "install udf /bin/false"
   windows:
     files:
+
+ssh_source_url: ""

packer-variables/windows/goss-args-windows.j2

@@ -1,8 +1,10 @@
 {
     "goss_entry_file": "goss/goss.yaml",
-    "goss_inspect_mode": "true",
+    "goss_inspect_mode": "false",
     "goss_skip_install": "true",
+    "goss_tests_dir": "/image-builder/images/capi/image/goss",
+    "goss_vars_file": "/image-builder/images/capi/image/goss/goss-vars.yaml",
     "goss_download_path": "C:\\ProgramData\\Temp\\goss.exe",
-    "goss_remote_folder": "C:\\goss",
-    "goss_remote_path": "C:\\goss\\goss"
+    "goss_remote_folder": "",
+    "goss_remote_path": ""
 }