From ac773e0dc328bc680ec6f7cd3b8300d9adca0f16 Mon Sep 17 00:00:00 2001
From: Lin Jen-Shin <jen-shin+gitlab@gitlab.com>
Date: Wed, 7 Oct 2020 22:04:24 +0800
Subject: [PATCH] Attach CI_JOB_ID into QA JSON report

---
 qa/qa/runtime/env.rb            | 4 ++++
 qa/qa/support/json_formatter.rb | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/qa/qa/runtime/env.rb b/qa/qa/runtime/env.rb
index c254be4800b86..709467eaf3c5c 100644
--- a/qa/qa/runtime/env.rb
+++ b/qa/qa/runtime/env.rb
@@ -81,6 +81,10 @@ def admin_personal_access_token
         ENV['GITLAB_QA_ADMIN_ACCESS_TOKEN']
       end
 
+      def ci_job_id
+        ENV['CI_JOB_ID']
+      end
+
       def ci_project_name
         ENV['CI_PROJECT_NAME']
       end
diff --git a/qa/qa/support/json_formatter.rb b/qa/qa/support/json_formatter.rb
index f6e40436ec8b8..8abdee35c14cc 100644
--- a/qa/qa/support/json_formatter.rb
+++ b/qa/qa/support/json_formatter.rb
@@ -50,7 +50,8 @@ def format_example(example)
           pending_message: example.execution_result.pending_message,
           testcase: example.metadata[:testcase],
           quarantine: example.metadata[:quarantine],
-          screenshot: example.metadata[:screenshot]
+          screenshot: example.metadata[:screenshot],
+          ci_job_id: QA::Runtime::Env.ci_job_id
         }
       end
 
-- 
GitLab