fix(kitchen): [agent6] fix windows kitchen npm installer job (#31502)

DataDog · Nov 27, 2024 · 1dd463e · 1dd463e
1 parent 291e28b
commit 1dd463e
Showing 1 changed file with 21 additions and 62 deletions.
diff --git a/test/kitchen/test-definitions/windows-npm-test.yml b/test/kitchen/test-definitions/windows-npm-test.yml
@@ -9,16 +9,16 @@ suites:
     - "recipe[dd-agent-upgrade]"
   attributes:
     datadog:
-      agent_major_version: 7
-      agent_version: 7.42.0
+      agent_major_version: 6
+      agent_version: 6.42.0
       api_key: <%= api_key %>
       <% if ENV['AGENT_FLAVOR'] == 'datadog-iot-agent' %>
       agent_flavor: 'datadog-iot-agent'
       <% end %>
     dd-agent-install:
-      agent_major_version: 7
+      agent_major_version: 6
       enable_testsigning: <%= ENV['WINDOWS_DDNPM_DRIVER'] == "testsigned" %>
-      agent_version: 7.42.0
+      agent_version: 6.42.0
     dd-agent-upgrade:
       add_new_repo: true
       <% if ENV['AGENT_FLAVOR'] == 'datadog-iot-agent' %>
@@ -53,14 +53,14 @@ suites:
     - "recipe[dd-agent-upgrade]"
   attributes:
     datadog:
-      agent_major_version: 7
-      agent_version: 7.42.0
+      agent_major_version: 6
+      agent_version: 6.42.0
       api_key: <%= api_key %>
       <% if ENV['AGENT_FLAVOR'] == 'datadog-iot-agent' %>
       agent_flavor: 'datadog-iot-agent'
       <% end %>
     dd-agent-install:
-      agent_major_version: 7
+      agent_major_version: 6
       enable_testsigning: <%= ENV['WINDOWS_DDNPM_DRIVER'] == "testsigned" %>
     dd-agent-upgrade:
       add_new_repo: true
@@ -94,16 +94,16 @@ suites:
     - "recipe[dd-agent-upgrade]"
   attributes:
     datadog:
-      agent_major_version: 7
-      agent_version: 7.42.0
+      agent_major_version: 6
+      agent_version: 6.42.0
       api_key: <%= api_key %>
       <% if ENV['AGENT_FLAVOR'] == 'datadog-iot-agent' %>
       agent_flavor: 'datadog-iot-agent'
       <% end %>
     dd-agent-install:
-      agent_major_version: 7
+      agent_major_version: 6
       enable_testsigning: <%= ENV['WINDOWS_DDNPM_DRIVER'] == "testsigned" %>
-      agent_version: 7.42.0
+      agent_version: 6.42.0
       agent_install_options: >
         ADDLOCAL=NPM
     dd-agent-upgrade:
@@ -137,13 +137,13 @@ suites:
     - "recipe[dd-agent-install]"
   attributes:
     datadog:
-      agent_major_version: 7
+      agent_major_version: 6
       api_key: <%= api_key %>
       <% if ENV['AGENT_FLAVOR'] == 'datadog-iot-agent' %>
       agent_flavor: 'datadog-iot-agent'
       <% end %>
     dd-agent-install:
-      agent_major_version: 7
+      agent_major_version: 6
       windows_agent_url: <%= windows_agent_url %>
       <% if ENV['AGENT_VERSION'] %>
       windows_version: "<%= ENV['AGENT_VERSION'] %>"
@@ -164,13 +164,13 @@ suites:
     - "recipe[dd-agent-install]"
   attributes:
     datadog:
-      agent_major_version: 7
+      agent_major_version: 6
       api_key: <%= api_key %>
       <% if ENV['AGENT_FLAVOR'] == 'datadog-iot-agent' %>
       agent_flavor: 'datadog-iot-agent'
       <% end %>
     dd-agent-install:
-      agent_major_version: 7
+      agent_major_version: 6
       windows_agent_url: <%= windows_agent_url %>
       <% if ENV['AGENT_VERSION'] %>
       windows_version: "<%= ENV['AGENT_VERSION'] %>"
@@ -192,13 +192,13 @@ suites:
     - "recipe[dd-agent-reinstall]"
   attributes:
     datadog:
-      agent_major_version: 7
+      agent_major_version: 6
       api_key: <%= api_key %>
       <% if ENV['AGENT_FLAVOR'] == 'datadog-iot-agent' %>
       agent_flavor: 'datadog-iot-agent'
       <% end %>
     dd-agent-install:
-      agent_major_version: 7
+      agent_major_version: 6
       windows_agent_url: <%= windows_agent_url %>
       <% if ENV['AGENT_VERSION'] %>
       windows_version: "<%= ENV['AGENT_VERSION'] %>"
@@ -229,13 +229,13 @@ suites:
     - "recipe[dd-agent-install]"
   attributes:
     datadog:
-      agent_major_version: 7
+      agent_major_version: 6
       api_key: <%= api_key %>
       <% if ENV['AGENT_FLAVOR'] == 'datadog-iot-agent' %>
       agent_flavor: 'datadog-iot-agent'
       <% end %>
     dd-agent-install:
-      agent_major_version: 7
+      agent_major_version: 6
       windows_agent_url: <%= windows_agent_url %>
       <% if ENV['AGENT_VERSION'] %>
       windows_version: "<%= ENV['AGENT_VERSION'] %>"
@@ -259,13 +259,13 @@ suites:
     - "recipe[dd-agent-install]"
   attributes:
     datadog:
-      agent_major_version: 7
+      agent_major_version: 6
       api_key: <%= api_key %>
       <% if ENV['AGENT_FLAVOR'] == 'datadog-iot-agent' %>
       agent_flavor: 'datadog-iot-agent'
       <% end %>
     dd-agent-install:
-      agent_major_version: 7
+      agent_major_version: 6
       windows_agent_url: <%= windows_agent_url %>
       <% if ENV['AGENT_VERSION'] %>
       windows_version: "<%= ENV['AGENT_VERSION'] %>"
@@ -279,44 +279,3 @@ suites:
     dd-agent-rspec:
       agent_flavor: <%= ENV['AGENT_FLAVOR'] || "datadog-agent" %>
       skip_windows_signing_test: &skip_windows_signing_test <%= ENV['SKIP_SIGNATURE_TEST'] || false %>
-
-# Scenario 10
-# Install original NPM beta version, upgrade to latest
-#    - expect driver installed, enable NPM, expect system probe to enable & start
-- name: win-npm-beta-upgrade
-  run_list:
-    - "recipe[dd-agent-install]"
-    - "recipe[dd-agent-upgrade]"
-  attributes:
-    datadog:
-      agent_major_version: 7
-      api_key: <%= api_key %>
-      <% if ENV['AGENT_FLAVOR'] == 'datadog-iot-agent' %>
-      agent_flavor: 'datadog-iot-agent'
-      <% end %>
-    dd-agent-install:
-      agent_major_version: 7
-      windows_agent_url: https://ddagent-windows-unstable.s3.amazonaws.com/
-      windows_agent_filename: datadog-agent-7.23.2-beta1-1-x86_64
-      enable_testsigning: <%= ENV['WINDOWS_DDNPM_DRIVER'] == "testsigned" %>
-    dd-agent-upgrade:
-      add_new_repo: true
-      <% if ENV['AGENT_FLAVOR'] == 'datadog-iot-agent' %>
-      package_name: 'datadog-iot-agent'
-      <% end %>
-      <% dd_agent_config.each do |key, value| %>
-      <%= key %>: "<%= value %>"
-      <% end %>
-      <% if ENV['AGENT_VERSION'] %>
-      windows_version: "<%= ENV['AGENT_VERSION'] %>"
-      <% end %>
-      <% if ENV['WINDOWS_AGENT_FILE'] %>
-      windows_agent_filename: "<%= ENV['WINDOWS_AGENT_FILE'] %>"
-      <% end %>
-    dd-agent-import-conf:
-      api_key: <%= api_key %>
-    dd-agent-upgrade-rspec:
-      # Used by the rspec test to know the version to which the agent should be upgraded
-      agent_expected_version: &agent_expected_version <%= ENV['DD_AGENT_EXPECTED_VERSION'] || "5.99.0" %>
-    dd-agent-rspec:
-      skip_windows_signing_test: &skip_windows_signing_test <%= ENV['SKIP_SIGNATURE_TEST'] || false %>