From da85729d71f8236a63fe59d06b740a2c317c2eab Mon Sep 17 00:00:00 2001 From: Brian Fjeldstad Date: Mon, 7 Sep 2026 17:50:48 +0000 Subject: [PATCH] tests/images: enable Telemetry=OptIn by default for test/dev images Adds a shared tests/images/common/trident.conf with Telemetry=OptIn and references it from every test/dev image definition, enabling Application Insights telemetry opt-in by default across test/dev images. Originally part of PR #774 (appinsights-telemetry); split out to its own PR, stacked on PR #779 (installation-servicing-id), since these image-definition changes are unrelated to the core telemetry plumbing and servicing-ID work in the earlier PRs in the stack. --- tests/images/azl-installer/installer-iso.yaml | 3 +++ .../azurelinux-direct-streaming-testimage/base/baseimg.yaml | 5 +++++ tests/images/common/trident.conf | 1 + tests/images/trident-container-installer/base/baseimg.yaml | 3 +++ tests/images/trident-container-testimage/base/baseimg.yaml | 3 +++ tests/images/trident-functest/base/baseimg.yaml | 5 +++++ .../trident-installer/base/baseimg-direct-streaming.yaml | 3 +++ tests/images/trident-installer/base/baseimg-split.yaml | 3 +++ tests/images/trident-installer/base/baseimg.yaml | 3 +++ tests/images/trident-mos/containerhost-iso.yaml | 3 +++ tests/images/trident-mos/iso.yaml | 3 +++ tests/images/trident-testimage/base/baseimg.yaml | 3 +++ .../trident-verity-testimage/base/baseimg-container.yaml | 3 +++ tests/images/trident-verity-testimage/base/baseimg.yaml | 3 +++ tests/images/trident-verity-testimage/usr/container.yaml | 3 +++ tests/images/trident-verity-testimage/usr/host.yaml | 3 +++ .../trident-vm-testimage/base/baseimg-grub-verity-azure.yaml | 3 +++ .../trident-vm-testimage/base/baseimg-grub-verity.yaml | 3 +++ tests/images/trident-vm-testimage/base/baseimg-grub.yaml | 3 +++ .../trident-vm-testimage/base/baseimg-root-verity.yaml | 3 +++ .../images/trident-vm-testimage/base/baseimg-usr-verity.yaml | 3 +++ .../base/updateimg-grub-verity-azure.yaml | 3 +++ .../trident-vm-testimage/base/updateimg-grub-verity.yaml | 3 +++ tests/images/trident-vm-testimage/base/updateimg-grub.yaml | 3 +++ 24 files changed, 74 insertions(+) create mode 100644 tests/images/common/trident.conf diff --git a/tests/images/azl-installer/installer-iso.yaml b/tests/images/azl-installer/installer-iso.yaml index a5f63a0a1..805d9106d 100644 --- a/tests/images/azl-installer/installer-iso.yaml +++ b/tests/images/azl-installer/installer-iso.yaml @@ -72,6 +72,9 @@ os: - source: mos/scripts/installation.sh destination: /root/installer/installation.sh + # Enable telemetry (Application Insights tracing) by default for test/dev images + - source: ../common/trident.conf + destination: /etc/trident/trident.conf iso: initramfsType: full-os diff --git a/tests/images/azurelinux-direct-streaming-testimage/base/baseimg.yaml b/tests/images/azurelinux-direct-streaming-testimage/base/baseimg.yaml index 88a8d7b97..209e566c2 100644 --- a/tests/images/azurelinux-direct-streaming-testimage/base/baseimg.yaml +++ b/tests/images/azurelinux-direct-streaming-testimage/base/baseimg.yaml @@ -78,3 +78,8 @@ os: services: enable: - sshd + + additionalFiles: + # Enable telemetry (Application Insights tracing) by default for test/dev images + - source: ../../common/trident.conf + destination: /etc/trident/trident.conf diff --git a/tests/images/common/trident.conf b/tests/images/common/trident.conf new file mode 100644 index 000000000..a0ceefec5 --- /dev/null +++ b/tests/images/common/trident.conf @@ -0,0 +1 @@ +Telemetry=OptIn diff --git a/tests/images/trident-container-installer/base/baseimg.yaml b/tests/images/trident-container-installer/base/baseimg.yaml index 1e1dfded5..fbcb20ee8 100644 --- a/tests/images/trident-container-installer/base/baseimg.yaml +++ b/tests/images/trident-container-installer/base/baseimg.yaml @@ -57,6 +57,9 @@ os: - source: files/containerd-mmap-fix.cil destination: /usr/share/selinux/packages/containerd-mmap-fix.cil + # Enable telemetry (Application Insights tracing) by default for test/dev images + - source: ../../common/trident.conf + destination: /etc/trident/trident.conf services: enable: - trident-container diff --git a/tests/images/trident-container-testimage/base/baseimg.yaml b/tests/images/trident-container-testimage/base/baseimg.yaml index 53f3eff71..5a90a54f8 100644 --- a/tests/images/trident-container-testimage/base/baseimg.yaml +++ b/tests/images/trident-container-testimage/base/baseimg.yaml @@ -76,6 +76,9 @@ os: - source: files/containerd-mmap-fix.cil destination: /usr/share/selinux/packages/containerd-mmap-fix.cil + # Enable telemetry (Application Insights tracing) by default for test/dev images + - source: ../../common/trident.conf + destination: /etc/trident/trident.conf services: enable: - trident-container diff --git a/tests/images/trident-functest/base/baseimg.yaml b/tests/images/trident-functest/base/baseimg.yaml index 874463b5e..d7ac3875c 100644 --- a/tests/images/trident-functest/base/baseimg.yaml +++ b/tests/images/trident-functest/base/baseimg.yaml @@ -85,3 +85,8 @@ os: services: enable: - sshd + + additionalFiles: + # Enable telemetry (Application Insights tracing) by default for test/dev images + - source: ../../common/trident.conf + destination: /etc/trident/trident.conf diff --git a/tests/images/trident-installer/base/baseimg-direct-streaming.yaml b/tests/images/trident-installer/base/baseimg-direct-streaming.yaml index 3ace14fbd..26fa61cf4 100644 --- a/tests/images/trident-installer/base/baseimg-direct-streaming.yaml +++ b/tests/images/trident-installer/base/baseimg-direct-streaming.yaml @@ -87,6 +87,9 @@ os: - source: ../../../../tools/cmd/rcp-agent/rcp-agent.service destination: /usr/lib/systemd/system/rcp-agent.service + # Enable telemetry (Application Insights tracing) by default for test/dev images + - source: ../../common/trident.conf + destination: /etc/trident/trident.conf selinux: mode: enforcing diff --git a/tests/images/trident-installer/base/baseimg-split.yaml b/tests/images/trident-installer/base/baseimg-split.yaml index 6c5867d8a..cd2032d72 100644 --- a/tests/images/trident-installer/base/baseimg-split.yaml +++ b/tests/images/trident-installer/base/baseimg-split.yaml @@ -71,6 +71,9 @@ os: - source: files/trident-split-install.service destination: /usr/lib/systemd/system/trident-install.service + # Enable telemetry (Application Insights tracing) by default for test/dev images + - source: ../../common/trident.conf + destination: /etc/trident/trident.conf scripts: postCustomization: - path: post-install.sh diff --git a/tests/images/trident-installer/base/baseimg.yaml b/tests/images/trident-installer/base/baseimg.yaml index 7f6bf691b..18a9d580a 100644 --- a/tests/images/trident-installer/base/baseimg.yaml +++ b/tests/images/trident-installer/base/baseimg.yaml @@ -76,6 +76,9 @@ os: - source: files/trident-install.service destination: /usr/lib/systemd/system/trident-install.service + # Enable telemetry (Application Insights tracing) by default for test/dev images + - source: ../../common/trident.conf + destination: /etc/trident/trident.conf selinux: mode: enforcing diff --git a/tests/images/trident-mos/containerhost-iso.yaml b/tests/images/trident-mos/containerhost-iso.yaml index 586bb5ac9..89f924893 100644 --- a/tests/images/trident-mos/containerhost-iso.yaml +++ b/tests/images/trident-mos/containerhost-iso.yaml @@ -51,6 +51,9 @@ os: - source: files/download-trident-container.service destination: /usr/lib/systemd/system/download-trident-container.service + # Enable telemetry (Application Insights tracing) by default for test/dev images + - source: ../common/trident.conf + destination: /etc/trident/trident.conf services: enable: - download-trident-container diff --git a/tests/images/trident-mos/iso.yaml b/tests/images/trident-mos/iso.yaml index 00b235a02..75ffd9acb 100644 --- a/tests/images/trident-mos/iso.yaml +++ b/tests/images/trident-mos/iso.yaml @@ -94,6 +94,9 @@ os: - source: ../../../tools/cmd/rcp-agent/rcp-agent.service destination: /usr/lib/systemd/system/rcp-agent.service + # Enable telemetry (Application Insights tracing) by default for test/dev images + - source: ../common/trident.conf + destination: /etc/trident/trident.conf services: enable: - rcp-agent diff --git a/tests/images/trident-testimage/base/baseimg.yaml b/tests/images/trident-testimage/base/baseimg.yaml index 80951ff4d..9ef30e7b3 100644 --- a/tests/images/trident-testimage/base/baseimg.yaml +++ b/tests/images/trident-testimage/base/baseimg.yaml @@ -78,6 +78,9 @@ os: - source: files/use-grpc-client-commit.conf destination: /etc/systemd/system/trident.service.d/override.conf + # Enable telemetry (Application Insights tracing) by default for test/dev images + - source: ../../common/trident.conf + destination: /etc/trident/trident.conf scripts: postCustomization: - path: post-install.sh diff --git a/tests/images/trident-verity-testimage/base/baseimg-container.yaml b/tests/images/trident-verity-testimage/base/baseimg-container.yaml index 21dd824cb..f3b2a75c6 100644 --- a/tests/images/trident-verity-testimage/base/baseimg-container.yaml +++ b/tests/images/trident-verity-testimage/base/baseimg-container.yaml @@ -134,6 +134,9 @@ os: - source: files/trident-container.service destination: /usr/lib/systemd/system/trident-container.service + # Enable telemetry (Application Insights tracing) by default for test/dev images + - source: ../../common/trident.conf + destination: /etc/trident/trident.conf services: enable: - etc-mount diff --git a/tests/images/trident-verity-testimage/base/baseimg.yaml b/tests/images/trident-verity-testimage/base/baseimg.yaml index 1477615dc..85940ea7b 100644 --- a/tests/images/trident-verity-testimage/base/baseimg.yaml +++ b/tests/images/trident-verity-testimage/base/baseimg.yaml @@ -132,6 +132,9 @@ os: - source: files/use-grpc-client-commit.conf destination: /etc/systemd/system/trident.service.d/override.conf + # Enable telemetry (Application Insights tracing) by default for test/dev images + - source: ../../common/trident.conf + destination: /etc/trident/trident.conf services: enable: - etc-mount diff --git a/tests/images/trident-verity-testimage/usr/container.yaml b/tests/images/trident-verity-testimage/usr/container.yaml index 855cd0f10..3a6a4fffc 100644 --- a/tests/images/trident-verity-testimage/usr/container.yaml +++ b/tests/images/trident-verity-testimage/usr/container.yaml @@ -115,6 +115,9 @@ os: - source: files/trident-container.service destination: /usr/lib/systemd/system/trident-container.service + # Enable telemetry (Application Insights tracing) by default for test/dev images + - source: ../../common/trident.conf + destination: /etc/trident/trident.conf output: # Specifies config for output dir containining generated artifacts. This is # required for later running inject-files command, so that the final image diff --git a/tests/images/trident-verity-testimage/usr/host.yaml b/tests/images/trident-verity-testimage/usr/host.yaml index 476178d80..c4778f9bb 100644 --- a/tests/images/trident-verity-testimage/usr/host.yaml +++ b/tests/images/trident-verity-testimage/usr/host.yaml @@ -121,6 +121,9 @@ os: - source: files/use-grpc-client-commit.conf destination: /etc/systemd/system/trident.service.d/override.conf + # Enable telemetry (Application Insights tracing) by default for test/dev images + - source: ../../common/trident.conf + destination: /etc/trident/trident.conf output: # Specifies config for output dir containining generated artifacts. This is # required for later running inject-files command, so that the final image diff --git a/tests/images/trident-vm-testimage/base/baseimg-grub-verity-azure.yaml b/tests/images/trident-vm-testimage/base/baseimg-grub-verity-azure.yaml index 7da14975f..b9cf230ca 100644 --- a/tests/images/trident-vm-testimage/base/baseimg-grub-verity-azure.yaml +++ b/tests/images/trident-vm-testimage/base/baseimg-grub-verity-azure.yaml @@ -145,6 +145,9 @@ os: - source: files/sudoers-wheel destination: /etc/sudoers.d/wheel + # Enable telemetry (Application Insights tracing) by default for test/dev images + - source: ../../common/trident.conf + destination: /etc/trident/trident.conf services: enable: - etc-mount diff --git a/tests/images/trident-vm-testimage/base/baseimg-grub-verity.yaml b/tests/images/trident-vm-testimage/base/baseimg-grub-verity.yaml index 11715cfc9..f32930c35 100644 --- a/tests/images/trident-vm-testimage/base/baseimg-grub-verity.yaml +++ b/tests/images/trident-vm-testimage/base/baseimg-grub-verity.yaml @@ -143,6 +143,9 @@ os: - source: files/sudoers-wheel destination: /etc/sudoers.d/wheel + # Enable telemetry (Application Insights tracing) by default for test/dev images + - source: ../../common/trident.conf + destination: /etc/trident/trident.conf services: enable: - etc-mount diff --git a/tests/images/trident-vm-testimage/base/baseimg-grub.yaml b/tests/images/trident-vm-testimage/base/baseimg-grub.yaml index 0286a9a8a..569abd539 100644 --- a/tests/images/trident-vm-testimage/base/baseimg-grub.yaml +++ b/tests/images/trident-vm-testimage/base/baseimg-grub.yaml @@ -84,6 +84,9 @@ os: - source: files/sudoers-wheel destination: /etc/sudoers.d/wheel + # Enable telemetry (Application Insights tracing) by default for test/dev images + - source: ../../common/trident.conf + destination: /etc/trident/trident.conf users: - name: testuser sshPublicKeyPaths: diff --git a/tests/images/trident-vm-testimage/base/baseimg-root-verity.yaml b/tests/images/trident-vm-testimage/base/baseimg-root-verity.yaml index 0ec362b70..a6d14b326 100644 --- a/tests/images/trident-vm-testimage/base/baseimg-root-verity.yaml +++ b/tests/images/trident-vm-testimage/base/baseimg-root-verity.yaml @@ -146,6 +146,9 @@ os: - source: files/sudoers-wheel destination: /etc/sudoers.d/wheel + # Enable telemetry (Application Insights tracing) by default for test/dev images + - source: ../../common/trident.conf + destination: /etc/trident/trident.conf overlays: - mountPoint: /etc lowerDirs: [/etc] diff --git a/tests/images/trident-vm-testimage/base/baseimg-usr-verity.yaml b/tests/images/trident-vm-testimage/base/baseimg-usr-verity.yaml index ae5208a2b..86a5cbd79 100644 --- a/tests/images/trident-vm-testimage/base/baseimg-usr-verity.yaml +++ b/tests/images/trident-vm-testimage/base/baseimg-usr-verity.yaml @@ -145,6 +145,9 @@ os: - source: files/sudoers-wheel destination: /etc/sudoers.d/wheel + # Enable telemetry (Application Insights tracing) by default for test/dev images + - source: ../../common/trident.conf + destination: /etc/trident/trident.conf services: enable: - kdump diff --git a/tests/images/trident-vm-testimage/base/updateimg-grub-verity-azure.yaml b/tests/images/trident-vm-testimage/base/updateimg-grub-verity-azure.yaml index 6bde75530..587049fc3 100644 --- a/tests/images/trident-vm-testimage/base/updateimg-grub-verity-azure.yaml +++ b/tests/images/trident-vm-testimage/base/updateimg-grub-verity-azure.yaml @@ -136,6 +136,9 @@ os: - source: files/use-grpc-client-commit.conf destination: /etc/systemd/system/trident.service.d/override.conf + # Enable telemetry (Application Insights tracing) by default for test/dev images + - source: ../../common/trident.conf + destination: /etc/trident/trident.conf services: enable: - etc-mount diff --git a/tests/images/trident-vm-testimage/base/updateimg-grub-verity.yaml b/tests/images/trident-vm-testimage/base/updateimg-grub-verity.yaml index db03d2c61..4d251e979 100644 --- a/tests/images/trident-vm-testimage/base/updateimg-grub-verity.yaml +++ b/tests/images/trident-vm-testimage/base/updateimg-grub-verity.yaml @@ -129,6 +129,9 @@ os: - source: files/use-grpc-client-commit.conf destination: /etc/systemd/system/trident.service.d/override.conf + # Enable telemetry (Application Insights tracing) by default for test/dev images + - source: ../../common/trident.conf + destination: /etc/trident/trident.conf services: enable: - etc-mount diff --git a/tests/images/trident-vm-testimage/base/updateimg-grub.yaml b/tests/images/trident-vm-testimage/base/updateimg-grub.yaml index 02b2cd072..28a88c80b 100644 --- a/tests/images/trident-vm-testimage/base/updateimg-grub.yaml +++ b/tests/images/trident-vm-testimage/base/updateimg-grub.yaml @@ -73,6 +73,9 @@ os: - source: files/use-grpc-client-commit.conf destination: /etc/systemd/system/trident.service.d/override.conf + # Enable telemetry (Application Insights tracing) by default for test/dev images + - source: ../../common/trident.conf + destination: /etc/trident/trident.conf scripts: postCustomization: - path: scripts/post-install.sh