From 9be6e10defc9ff5c52af3f00f000190ee1d56a54 Mon Sep 17 00:00:00 2001
From: Halil Coban <hcoban@gitlab.com>
Date: Mon, 7 Oct 2024 11:56:33 +0000
Subject: [PATCH] Pass instance id when running executor in CI
---
DUO_WORKFLOW_EXECUTOR_VERSION | 2 +-
ee/app/services/ai/duo_workflows/start_workflow_service.rb | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/DUO_WORKFLOW_EXECUTOR_VERSION b/DUO_WORKFLOW_EXECUTOR_VERSION
index 384942600b74b..3527dbc1b4f67 100644
--- a/DUO_WORKFLOW_EXECUTOR_VERSION
+++ b/DUO_WORKFLOW_EXECUTOR_VERSION
@@ -1 +1 @@
-v0.0.9
+v0.0.11
diff --git a/ee/app/services/ai/duo_workflows/start_workflow_service.rb b/ee/app/services/ai/duo_workflows/start_workflow_service.rb
index 4421e24bc541e..88c907d4c4f69 100644
--- a/ee/app/services/ai/duo_workflows/start_workflow_service.rb
+++ b/ee/app/services/ai/duo_workflows/start_workflow_service.rb
@@ -35,7 +35,8 @@ def pipeline_variables
{ key: 'WORKFLOW_SERVICE_TOKEN', secret_value: @params[:workflow_service_token] },
{ key: 'REALM', secret_value: Gitlab::CloudConnector.gitlab_realm },
{ key: 'GIT_STRATEGY', secret_value: 'none' },
- { key: 'GLOBAL_USER_ID', secret_value: Gitlab::GlobalAnonymousId.user_id(@current_user) }
+ { key: 'GLOBAL_USER_ID', secret_value: Gitlab::GlobalAnonymousId.user_id(@current_user) },
+ { key: 'GITLAB_INSTANCE_ID', secret_value: Gitlab::GlobalAnonymousId.instance_id }
]
end
@@ -58,7 +59,7 @@ def pipeline_config
'./duo-workflow-executor --base-path ./workspace --goal "$GOAL" \
--workflow-id $WORKFLOW_ID --server $DUO_WORKFLOW_SERVICE_SERVER \
--duo-workflow-service-token $WORKFLOW_SERVICE_TOKEN \
- --user-id $GLOBAL_USER_ID --realm $REALM \
+ --user-id $GLOBAL_USER_ID --realm $REALM --instance-id $GITLAB_INSTANCE_ID \
--token $GL_TOKEN --base-url $CI_SERVER_URL',
'echo "Run complete."'
]
--
GitLab