feat(ci/cd): adding a e2e with infra agent

Author: paologallinaharbur

.github/workflows/component_onhost_e2e.yaml

@@ -54,7 +54,7 @@ jobs:
         run: |
           echo "${{ secrets.NR_SYSTEM_IDENTITY_PRIVATE_KEY }}" > /tmp/newrelic-agent-control-priv.key
           sudo ${{ github.workspace }}/target/debug/e2e-runner --log-level=debug ${{ matrix.group }} \
-            --deb-package-dir ./dist \
+            --artifacts-package-dir ./dist \
             --nr-api-key "${{ secrets.E2E_API_KEY }}" \
             --nr-license-key "${{ secrets.E2E_LICENSE_KEY }}" \
             --nr-account-id "${{ secrets.E2E_ACCOUNT_ID }}" \

test/e2e-runner/Readme.md

@@ -106,10 +106,10 @@ end
   root@vagrant:~# /newrelic-agent-control/target/debug/e2e-runner infra-agent --help
   Arguments to be set for every test that needs Agent Control installation
 
-  Usage: e2e-runner infra-agent [OPTIONS] --deb-package-dir <DEB_PACKAGE_DIR> --nr-api-key <NR_API_KEY> --nr-license-key <NR_LICENSE_KEY> --nr-account-id <NR_ACCOUNT_ID> --system-identity-client-id <SYSTEM_IDENTITY_CLIENT_ID> --agent-control-private-key <AGENT_CONTROL_PRIVATE_KEY> --agent-control-version <AGENT_CONTROL_VERSION>
+  Usage: e2e-runner infra-agent [OPTIONS] --artifacts-package-dir <DEB_PACKAGE_DIR> --nr-api-key <NR_API_KEY> --nr-license-key <NR_LICENSE_KEY> --nr-account-id <NR_ACCOUNT_ID> --system-identity-client-id <SYSTEM_IDENTITY_CLIENT_ID> --agent-control-private-key <AGENT_CONTROL_PRIVATE_KEY> --agent-control-version <AGENT_CONTROL_VERSION>
 
   Options:
-        --deb-package-dir <DEB_PACKAGE_DIR>
+        --artifacts-package-dir <DEB_PACKAGE_DIR>
             Folder where '.deb' packages are stored
         --recipes-repo <RECIPES_REPO>
             Recipes repository [default: https://github.com/newrelic/open-install-library.git]

test/e2e-runner/src/common.rs

@@ -54,8 +54,7 @@ pub struct Args {
     #[arg(long, default_value = "US")]
     pub nr_region: String,
 
-    #[cfg(target_family = "unix")]
-    /// Flag to migrate existing infrastructure agent configuration
+    /// Flag to migrate existing infrastructure agent configuration. Currently used only in Linux.
     #[arg(long, default_value = "true")]
     pub migrate_config_infra: String,
 }
@@ -67,7 +66,6 @@ pub struct RecipeData {
     pub fleet_enabled: String,
     pub recipe_list: String,
     pub proxy_url: String,
-    #[cfg(target_family = "unix")]
     pub monitoring_source: String,
 }
 
@@ -81,6 +79,8 @@ impl Default for RecipeData {
             recipe_list: "agent-control".to_string(),
             #[cfg(target_family = "unix")]
             monitoring_source: "infra-agent".to_string(),
+            #[cfg(target_family = "windows")]
+            monitoring_source: "".to_string(),
         }
     }
 }

test/e2e-runner/src/linux.rs

@@ -1,3 +1,6 @@
+use crate::{LinuxCli, LinuxScenarios, init_logging, linux};
+use clap::Parser;
+
 pub mod install;
 pub mod scenarios;
 
@@ -10,3 +13,31 @@ const DEFAULT_CONFIG_PATH: &str =
 const DEFAULT_LOG_PATH: &str = "/var/log/newrelic-agent-control/newrelic-agent-control.log";
 
 const SERVICE_NAME: &str = "newrelic-agent-control";
+
+/// Run Linux e2e corresponding scenario which will panic on failure
+pub fn run_linux_e2e() {
+    let cli = LinuxCli::parse();
+    init_logging(&cli.log_level);
+
+    // Run the requested test
+    match cli.scenario {
+        LinuxScenarios::InfraAgent(args) => {
+            scenarios::infra_agent::test_installation_with_infra_agent(args);
+        }
+        LinuxScenarios::EBPFAgent(args) => {
+            scenarios::ebpf_agent::test_ebpf_agent(args);
+        }
+        LinuxScenarios::Migration(args) => {
+            scenarios::migration::test_migration(args);
+        }
+        LinuxScenarios::NrdotAgent(args) => {
+            scenarios::nrdot_agent::test_nrdot_agent(args);
+        }
+        LinuxScenarios::RemoteConfig(args) => {
+            scenarios::remote_config::test_remote_config_is_applied(args);
+        }
+        LinuxScenarios::Proxy(args) => {
+            scenarios::proxy::test_agent_control_proxy(args);
+        }
+    };
+}

test/e2e-runner/src/main.rs

@@ -10,9 +10,9 @@ use tracing_subscriber::EnvFilter;
 fn main() {
     // Using `cfg!` instead of `#[cfg]` to make development easier
     if cfg!(target_os = "windows") {
-        run_windows_e2e()
+        windows::run_windows_e2e()
     } else if cfg!(target_os = "linux") {
-        run_linux_e2e()
+        linux::run_linux_e2e()
     } else {
         panic!("Unsupported OS -- only Linux and Windows are supported");
     }
@@ -81,50 +81,6 @@ struct WindowsCli {
     scenario: WindowsScenarios,
 }
 
-/// Run Linux e2e corresponding scenario which will panic on failure
-fn run_linux_e2e() {
-    let cli = LinuxCli::parse();
-    init_logging(&cli.log_level);
-
-    // Run the requested test
-    match cli.scenario {
-        LinuxScenarios::InfraAgent(args) => {
-            linux::scenarios::infra_agent::test_installation_with_infra_agent(args);
-        }
-        LinuxScenarios::EBPFAgent(args) => {
-            linux::scenarios::ebpf_agent::test_ebpf_agent(args);
-        }
-        LinuxScenarios::Migration(args) => {
-            linux::scenarios::migration::test_migration(args);
-        }
-        LinuxScenarios::NrdotAgent(args) => {
-            linux::scenarios::nrdot_agent::test_nrdot_agent(args);
-        }
-        LinuxScenarios::RemoteConfig(args) => {
-            linux::scenarios::remote_config::test_remote_config_is_applied(args);
-        }
-        LinuxScenarios::Proxy(args) => {
-            linux::scenarios::proxy::test_agent_control_proxy(args);
-        }
-    };
-}
-
-/// Run Windows e2e corresponding scenario which will panic on failure
-fn run_windows_e2e() {
-    let cli = WindowsCli::parse();
-    init_logging(&cli.log_level);
-
-    // Run the requested test
-    match cli.scenario {
-        WindowsScenarios::Install(args) => {
-            windows::scenarios::installation::test_installation(args);
-        }
-        WindowsScenarios::InfraAgent(args) => {
-            windows::scenarios::installation_infra_agent::test_infra_agent(args);
-        }
-    }
-}
-
 fn init_logging(level: &str) {
     tracing_subscriber::fmt()
         .with_target(false)

test/e2e-runner/src/windows.rs

@@ -1,3 +1,6 @@
+use crate::{WindowsCli, WindowsScenarios, init_logging};
+use clap::Parser;
+
 pub mod install;
 pub mod scenarios;
 
@@ -14,3 +17,19 @@ const DEFAULT_NR_INFRA_PATH: &str =
 
 const DEFAULT_LOG_PATH: &str =
     r"C:\ProgramData\New Relic\newrelic-agent-control\logs\newrelic-agent-control.log";
+
+/// Run Windows e2e corresponding scenario which will panic on failure
+pub fn run_windows_e2e() {
+    let cli = WindowsCli::parse();
+    init_logging(&cli.log_level);
+
+    // Run the requested test
+    match cli.scenario {
+        WindowsScenarios::Install(args) => {
+            scenarios::installation::test_installation(args);
+        }
+        WindowsScenarios::InfraAgent(args) => {
+            scenarios::installation_infra_agent::test_infra_agent(args);
+        }
+    }
+}

test/e2e-runner/src/windows/scenarios/installation_infra_agent.rs

@@ -1,4 +1,4 @@
-use crate::common::config::{add_configs_for_infra_agent_and_logs, update_config};
+use crate::common::config::add_configs_for_infra_agent_and_logs;
 use crate::common::logs::ShowLogsOnDrop;
 use crate::common::test::retry;
 use crate::common::{Args, RecipeData, nrql};