AET-203 Change stack definition to use the version of the agent corre…

…sponding to the current pipeline by default (#18772) * Inject pipeline id variable directly in the config map * Update test * Fix tests * Re add pipeline ID
DataDog · Aug 31, 2023 · 3ff5c02 · 3ff5c02
1 parent 807289b
commit 3ff5c02
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 0 deletions.
diff --git a/.gitlab/e2e.yml b/.gitlab/e2e.yml
@@ -140,6 +140,7 @@ k8s-e2e-otlp-main:
     E2E_PUBLIC_KEY_PATH: /tmp/agent-qa-ssh-key.pub
     E2E_PRIVATE_KEY_PATH: /tmp/agent-qa-ssh-key
     E2E_KEY_PAIR_NAME: datadog-agent-ci
+    E2E_PIPELINE_ID: $CI_PIPELINE_ID
   script:
     - inv -e new-e2e-tests.run --targets $TARGETS $CONFIGPARAMS --junit-tar "junit-${CI_JOB_NAME}.tgz" ${EXTRA_PARAMS}
   artifacts:

diff --git a/test/new-e2e/pkg/runner/configmap.go b/test/new-e2e/pkg/runner/configmap.go
@@ -21,6 +21,8 @@ const (
 	AgentAPIKey = commonconfig.DDAgentConfigNamespace + ":" + commonconfig.DDAgentAPIKeyParamName
 	// AgentAPPKey pulumi config paramater name
 	AgentAPPKey = commonconfig.DDAgentConfigNamespace + ":" + commonconfig.DDAgentAPPKeyParamName
+	// AgentPipelineID pulumi config parameter name
+	AgentPipelineID = commonconfig.DDAgentConfigNamespace + ":" + commonconfig.DDAgentPipelineID
 
 	// InfraEnvironmentVariables pulumi config paramater name
 	InfraEnvironmentVariables = commonconfig.DDInfraConfigNamespace + ":" + commonconfig.DDInfraEnvironment
@@ -109,6 +111,10 @@ func BuildStackParameters(profile Profile, scenarioConfig ConfigMap) (ConfigMap,
 	if err != nil {
 		return nil, err
 	}
+	err = SetConfigMapFromParameter(profile.ParamStore(), cm, parameters.PipelineID, AgentPipelineID)
+	if err != nil {
+		return nil, err
+	}
 	// Secret parameters from profile store
 	err = SetConfigMapFromSecret(profile.SecretStore(), cm, parameters.APIKey, AgentAPIKey)
 	if err != nil {

diff --git a/test/new-e2e/pkg/runner/configmap_test.go b/test/new-e2e/pkg/runner/configmap_test.go
@@ -35,5 +35,6 @@ func Test_BuildStackParameters(t *testing.T) {
 		"ddinfra:extraResourcesTags":        auto.ConfigValue{Value: "extra_resources_tags", Secret: false},
 		"ddinfra:aws/defaultPublicKeyPath":  auto.ConfigValue{Value: "public_key_path", Secret: false},
 		"ddinfra:aws/defaultPrivateKeyPath": auto.ConfigValue{Value: "private_key_path", Secret: false},
+		"ddagent:pipeline_id":               auto.ConfigValue{Value: "pipeline_id", Secret: false},
 	}, configMap)
 }
diff --git a/test/new-e2e/pkg/runner/parameters/const.go b/test/new-e2e/pkg/runner/parameters/const.go
@@ -31,4 +31,6 @@ const (
 	SkipDeleteOnFailure StoreKey = "skip_delete_on_failure"
 	// StackParameters config file parameter name
 	StackParameters StoreKey = "stack_params"
+	// PipelineID config file parameter name
+	PipelineID StoreKey = "pipeline_id"
 )