From e20d53fa52290b3688a7888649e0c3a0bd814c58 Mon Sep 17 00:00:00 2001 From: roberto montero Date: Tue, 17 Dec 2024 10:47:36 +0100 Subject: [PATCH 01/17] K8s new scenarios --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6da75a763ac..5d041f1bab1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,7 +6,7 @@ stages: - macrobenchmarks include: - - remote: https://gitlab-templates.ddbuild.io/libdatadog/include/one-pipeline.yml + - remote: https://gitlab-templates.ddbuild.io/libdatadog/include-wip/robertomonteromiguel/k8s_new_scenarios/single-step-instrumentation-tests.yml - local: ".gitlab/benchmarks.yml" - local: ".gitlab/macrobenchmarks.yml" From c0c7f21888c865e0cef2e0a8b1076c7164cfe90e Mon Sep 17 00:00:00 2001 From: roberto montero Date: Tue, 17 Dec 2024 11:13:58 +0100 Subject: [PATCH 02/17] launch k8s tests --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5d041f1bab1..657cbc15e13 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,7 +20,7 @@ onboarding_tests_installer: matrix: - ONBOARDING_FILTER_WEBLOG: [test-app-nodejs,test-app-nodejs-container] SCENARIO: [ SIMPLE_INSTALLER_AUTO_INJECTION, SIMPLE_AUTO_INJECTION_PROFILING ] - +#new scenario onboarding_tests_k8s_injection: variables: WEBLOG_VARIANT: sample-app From b95f89648a8e5e063016ac2c71db35ab33c0cbc0 Mon Sep 17 00:00:00 2001 From: roberto montero Date: Tue, 17 Dec 2024 11:17:59 +0100 Subject: [PATCH 03/17] fix one-pipeline reference --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 657cbc15e13..748ceaa0538 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,7 +6,7 @@ stages: - macrobenchmarks include: - - remote: https://gitlab-templates.ddbuild.io/libdatadog/include-wip/robertomonteromiguel/k8s_new_scenarios/single-step-instrumentation-tests.yml + - remote: https://gitlab-templates.ddbuild.io/libdatadog/include-wip/robertomonteromiguel/k8s_new_scenarios/one-pipeline.yml - local: ".gitlab/benchmarks.yml" - local: ".gitlab/macrobenchmarks.yml" From aec79520c17a140ed64c5a7166a593b90df40a33 Mon Sep 17 00:00:00 2001 From: roberto montero Date: Tue, 17 Dec 2024 11:36:40 +0100 Subject: [PATCH 04/17] Launch again the k8s scenario --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 748ceaa0538..eab776aed17 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,7 +20,7 @@ onboarding_tests_installer: matrix: - ONBOARDING_FILTER_WEBLOG: [test-app-nodejs,test-app-nodejs-container] SCENARIO: [ SIMPLE_INSTALLER_AUTO_INJECTION, SIMPLE_AUTO_INJECTION_PROFILING ] -#new scenario +#new scenario. onboarding_tests_k8s_injection: variables: WEBLOG_VARIANT: sample-app From 8e0d37406fcec3ad7ad0ddd1f14e41aa62861c5a Mon Sep 17 00:00:00 2001 From: roberto montero Date: Tue, 17 Dec 2024 14:38:16 +0100 Subject: [PATCH 05/17] k8s lib injection tests --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index eab776aed17..748ceaa0538 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,7 +20,7 @@ onboarding_tests_installer: matrix: - ONBOARDING_FILTER_WEBLOG: [test-app-nodejs,test-app-nodejs-container] SCENARIO: [ SIMPLE_INSTALLER_AUTO_INJECTION, SIMPLE_AUTO_INJECTION_PROFILING ] -#new scenario. +#new scenario onboarding_tests_k8s_injection: variables: WEBLOG_VARIANT: sample-app From c9824a87ddebb2230f222f7d5ecf2d4f776d950c Mon Sep 17 00:00:00 2001 From: roberto montero Date: Tue, 17 Dec 2024 14:49:24 +0100 Subject: [PATCH 06/17] check k8s cluster version --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 748ceaa0538..eab776aed17 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,7 +20,7 @@ onboarding_tests_installer: matrix: - ONBOARDING_FILTER_WEBLOG: [test-app-nodejs,test-app-nodejs-container] SCENARIO: [ SIMPLE_INSTALLER_AUTO_INJECTION, SIMPLE_AUTO_INJECTION_PROFILING ] -#new scenario +#new scenario. onboarding_tests_k8s_injection: variables: WEBLOG_VARIANT: sample-app From 7cb5ff9cfdf76d48e5fd988464f642daa079aa10 Mon Sep 17 00:00:00 2001 From: roberto montero Date: Tue, 17 Dec 2024 15:06:54 +0100 Subject: [PATCH 07/17] test again k8s job --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index eab776aed17..748ceaa0538 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,7 +20,7 @@ onboarding_tests_installer: matrix: - ONBOARDING_FILTER_WEBLOG: [test-app-nodejs,test-app-nodejs-container] SCENARIO: [ SIMPLE_INSTALLER_AUTO_INJECTION, SIMPLE_AUTO_INJECTION_PROFILING ] -#new scenario. +#new scenario onboarding_tests_k8s_injection: variables: WEBLOG_VARIANT: sample-app From 64f2a52ff267c201b107e449ba78f556b82c7c14 Mon Sep 17 00:00:00 2001 From: roberto montero Date: Tue, 17 Dec 2024 15:18:33 +0100 Subject: [PATCH 08/17] echo k8s job variables --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 748ceaa0538..eab776aed17 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,7 +20,7 @@ onboarding_tests_installer: matrix: - ONBOARDING_FILTER_WEBLOG: [test-app-nodejs,test-app-nodejs-container] SCENARIO: [ SIMPLE_INSTALLER_AUTO_INJECTION, SIMPLE_AUTO_INJECTION_PROFILING ] -#new scenario +#new scenario. onboarding_tests_k8s_injection: variables: WEBLOG_VARIANT: sample-app From 06d5af082f1527105503fa21f27b2e00544688c4 Mon Sep 17 00:00:00 2001 From: roberto montero Date: Tue, 17 Dec 2024 15:32:16 +0100 Subject: [PATCH 09/17] echo variables --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index eab776aed17..748ceaa0538 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,7 +20,7 @@ onboarding_tests_installer: matrix: - ONBOARDING_FILTER_WEBLOG: [test-app-nodejs,test-app-nodejs-container] SCENARIO: [ SIMPLE_INSTALLER_AUTO_INJECTION, SIMPLE_AUTO_INJECTION_PROFILING ] -#new scenario. +#new scenario onboarding_tests_k8s_injection: variables: WEBLOG_VARIANT: sample-app From eb3477862adcc15720308534271b75b37e4b5fd7 Mon Sep 17 00:00:00 2001 From: roberto montero Date: Tue, 17 Dec 2024 15:39:06 +0100 Subject: [PATCH 10/17] fix k8s --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 748ceaa0538..eab776aed17 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,7 +20,7 @@ onboarding_tests_installer: matrix: - ONBOARDING_FILTER_WEBLOG: [test-app-nodejs,test-app-nodejs-container] SCENARIO: [ SIMPLE_INSTALLER_AUTO_INJECTION, SIMPLE_AUTO_INJECTION_PROFILING ] -#new scenario +#new scenario. onboarding_tests_k8s_injection: variables: WEBLOG_VARIANT: sample-app From 976b22c1796fc38f8378ca37624845607c619e56 Mon Sep 17 00:00:00 2001 From: roberto montero Date: Tue, 17 Dec 2024 16:20:25 +0100 Subject: [PATCH 11/17] add all k8s scenario matrix --- .gitlab-ci.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index eab776aed17..06eb84cb374 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,10 +20,13 @@ onboarding_tests_installer: matrix: - ONBOARDING_FILTER_WEBLOG: [test-app-nodejs,test-app-nodejs-container] SCENARIO: [ SIMPLE_INSTALLER_AUTO_INJECTION, SIMPLE_AUTO_INJECTION_PROFILING ] -#new scenario. + onboarding_tests_k8s_injection: - variables: - WEBLOG_VARIANT: sample-app + parallel: + matrix: + - WEBLOG_VARIANT: [sample-app] + SCENARIO: [K8S_LIB_INJECTION, K8S_LIB_INJECTION_UDS, K8S_LIB_INJECTION_NO_AC, K8S_LIB_INJECTION_NO_AC_UDS, K8S_LIB_INJECTION_PROFILING_DISABLED, K8S_LIB_INJECTION_PROFILING_ENABLED, K8S_LIB_INJECTION_PROFILING_OVERRIDE] + K8S_CLUSTER_VERSION: ['7.56.2', '7.57.0', '7.59.0'] requirements_json_test: rules: From d0f15ad00190131235ad856c79b7c824024f99fd Mon Sep 17 00:00:00 2001 From: roberto montero Date: Wed, 18 Dec 2024 12:53:30 +0100 Subject: [PATCH 12/17] restore k8s --- .gitlab-ci.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 06eb84cb374..b914a9ea23c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,11 +22,13 @@ onboarding_tests_installer: SCENARIO: [ SIMPLE_INSTALLER_AUTO_INJECTION, SIMPLE_AUTO_INJECTION_PROFILING ] onboarding_tests_k8s_injection: - parallel: - matrix: - - WEBLOG_VARIANT: [sample-app] - SCENARIO: [K8S_LIB_INJECTION, K8S_LIB_INJECTION_UDS, K8S_LIB_INJECTION_NO_AC, K8S_LIB_INJECTION_NO_AC_UDS, K8S_LIB_INJECTION_PROFILING_DISABLED, K8S_LIB_INJECTION_PROFILING_ENABLED, K8S_LIB_INJECTION_PROFILING_OVERRIDE] - K8S_CLUSTER_VERSION: ['7.56.2', '7.57.0', '7.59.0'] + variables: + WEBLOG_VARIANT: sample-app + #parallel: + # matrix: + # - WEBLOG_VARIANT: [sample-app] + # SCENARIO: [K8S_LIB_INJECTION, K8S_LIB_INJECTION_UDS, K8S_LIB_INJECTION_NO_AC, K8S_LIB_INJECTION_NO_AC_UDS, K8S_LIB_INJECTION_PROFILING_DISABLED, K8S_LIB_INJECTION_PROFILING_ENABLED, K8S_LIB_INJECTION_PROFILING_OVERRIDE] + # K8S_CLUSTER_VERSION: ['7.56.2', '7.57.0', '7.59.0'] requirements_json_test: rules: From d7921b469952f88e309ee69ac439ee677ae390fa Mon Sep 17 00:00:00 2001 From: roberto montero Date: Wed, 18 Dec 2024 13:05:37 +0100 Subject: [PATCH 13/17] format --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b914a9ea23c..1012dcf3a1d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,7 +22,7 @@ onboarding_tests_installer: SCENARIO: [ SIMPLE_INSTALLER_AUTO_INJECTION, SIMPLE_AUTO_INJECTION_PROFILING ] onboarding_tests_k8s_injection: - variables: + variables: WEBLOG_VARIANT: sample-app #parallel: # matrix: From c35c06afaedf2f4bbde7d1378467427974796f90 Mon Sep 17 00:00:00 2001 From: roberto montero Date: Wed, 18 Dec 2024 14:27:30 +0100 Subject: [PATCH 14/17] test --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1012dcf3a1d..050a60b306a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,7 +24,7 @@ onboarding_tests_installer: onboarding_tests_k8s_injection: variables: WEBLOG_VARIANT: sample-app - #parallel: + ###parallel: # matrix: # - WEBLOG_VARIANT: [sample-app] # SCENARIO: [K8S_LIB_INJECTION, K8S_LIB_INJECTION_UDS, K8S_LIB_INJECTION_NO_AC, K8S_LIB_INJECTION_NO_AC_UDS, K8S_LIB_INJECTION_PROFILING_DISABLED, K8S_LIB_INJECTION_PROFILING_ENABLED, K8S_LIB_INJECTION_PROFILING_OVERRIDE] From 2e0a34c9fc7dac88d3b7779d48aae6f01f60f01d Mon Sep 17 00:00:00 2001 From: roberto montero Date: Wed, 18 Dec 2024 14:56:34 +0100 Subject: [PATCH 15/17] launch the tests --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 050a60b306a..5257f306f5f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,7 +24,7 @@ onboarding_tests_installer: onboarding_tests_k8s_injection: variables: WEBLOG_VARIANT: sample-app - ###parallel: + ####parallel: # matrix: # - WEBLOG_VARIANT: [sample-app] # SCENARIO: [K8S_LIB_INJECTION, K8S_LIB_INJECTION_UDS, K8S_LIB_INJECTION_NO_AC, K8S_LIB_INJECTION_NO_AC_UDS, K8S_LIB_INJECTION_PROFILING_DISABLED, K8S_LIB_INJECTION_PROFILING_ENABLED, K8S_LIB_INJECTION_PROFILING_OVERRIDE] From 4c709ba3690309425b3e3f90b9abde9266cb52ab Mon Sep 17 00:00:00 2001 From: roberto montero Date: Wed, 18 Dec 2024 16:39:35 +0100 Subject: [PATCH 16/17] restore matrix --- .gitlab-ci.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5257f306f5f..06eb84cb374 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,13 +22,11 @@ onboarding_tests_installer: SCENARIO: [ SIMPLE_INSTALLER_AUTO_INJECTION, SIMPLE_AUTO_INJECTION_PROFILING ] onboarding_tests_k8s_injection: - variables: - WEBLOG_VARIANT: sample-app - ####parallel: - # matrix: - # - WEBLOG_VARIANT: [sample-app] - # SCENARIO: [K8S_LIB_INJECTION, K8S_LIB_INJECTION_UDS, K8S_LIB_INJECTION_NO_AC, K8S_LIB_INJECTION_NO_AC_UDS, K8S_LIB_INJECTION_PROFILING_DISABLED, K8S_LIB_INJECTION_PROFILING_ENABLED, K8S_LIB_INJECTION_PROFILING_OVERRIDE] - # K8S_CLUSTER_VERSION: ['7.56.2', '7.57.0', '7.59.0'] + parallel: + matrix: + - WEBLOG_VARIANT: [sample-app] + SCENARIO: [K8S_LIB_INJECTION, K8S_LIB_INJECTION_UDS, K8S_LIB_INJECTION_NO_AC, K8S_LIB_INJECTION_NO_AC_UDS, K8S_LIB_INJECTION_PROFILING_DISABLED, K8S_LIB_INJECTION_PROFILING_ENABLED, K8S_LIB_INJECTION_PROFILING_OVERRIDE] + K8S_CLUSTER_VERSION: ['7.56.2', '7.57.0', '7.59.0'] requirements_json_test: rules: From e671d0ab0e66c1a6638b5ca917f7299e2e7fa9a5 Mon Sep 17 00:00:00 2001 From: roberto montero Date: Thu, 19 Dec 2024 09:10:44 +0100 Subject: [PATCH 17/17] test latest changes on one pipeline --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 06eb84cb374..2b37602ddcc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,6 +6,7 @@ stages: - macrobenchmarks include: + #TODO: Remove this before merge - remote: https://gitlab-templates.ddbuild.io/libdatadog/include-wip/robertomonteromiguel/k8s_new_scenarios/one-pipeline.yml - local: ".gitlab/benchmarks.yml" - local: ".gitlab/macrobenchmarks.yml"