Merge pull request #125 from lifull-dev/add_exe_duration_in_jobs

feat: end_time and duration

Author: shouan2212

.circleci/config.yml

@@ -38,8 +38,6 @@ jobs:
     working_directory: ~/bucky-core
     docker:
       - image: cimg/ruby:3.2.0
-        environment:
-          CC_TEST_REPORTER_ID: fd7bd9d517bdf8953c4d4803ca4ad7539d12d5c760048b8daf80cbc7d54fb262
     steps:
       - checkout
       - type: cache-restore
@@ -49,17 +47,15 @@ jobs:
         key: unit-test-{{ checksum "Gemfile.lock" }}
         paths:
           - vendor/bundle
-      # Download test-reporter
+      # Run rspec
       - run:
-          name: Setup Code Climate test-reporter
-          command: |
-            curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
-            chmod +x ./cc-test-reporter
-      # Run rspec and show on code climate
-      - run: |
-          ./cc-test-reporter before-build
-          bundle exec rspec
-          ./cc-test-reporter after-build --coverage-input-type simplecov --exit-code $?
+          name: Run RSpec tests
+          command: bundle exec rspec --format progress --format RspecJunitFormatter --out test-results/rspec/results.xml
+      # Store test results
+      - store_test_results:
+          path: test-results
+      - store_artifacts:
+          path: test-results
   static_code_analysis:
     docker:
       - image: cimg/ruby:3.2.0
@@ -83,7 +79,7 @@ jobs:
       - image: cimg/ruby:3.2.0
     steps:
       - add_ssh_keys:
-          finerprints:
+          fingerprints:
             - "6a:f3:d3:b5:a5:da:ce:e0:9f:22:f8:4a:2f:51:67:2b"
       - checkout
       - run:

Dockerfile.dev

@@ -16,7 +16,6 @@ RUN apk update && \
     mysql-dev \
     openssh \
     ruby-dev \
-    ruby-json \
     tzdata \
     yaml \
     yaml-dev \

Dockerfile.system-test

@@ -16,7 +16,6 @@ RUN apk update && \
   mysql-dev \
   openssh \
   ruby-dev \
-  ruby-json \
   tzdata \
   yaml \
   yaml-dev \

lib/bucky/core/database/test_data_operator.rb

@@ -21,7 +21,7 @@ def initialize
         def save_job_record_and_get_job_id(start_time, command_and_option, fqdn)
           return 0 if $debug
 
-          job_id = @connector.con[:jobs].insert(start_time: start_time, command_and_option: command_and_option, base_fqdn: fqdn)
+          job_id = @connector.con[:jobs].insert(start_time:, command_and_option:, base_fqdn: fqdn)
           @connector.disconnect
           job_id
         end
@@ -95,7 +95,7 @@ def get_ng_test_cases_at_last_execution(cond)
         def get_test_case_id(test_suite_id, case_name)
           return nil if $debug
 
-          test_case = @connector.con[:test_cases].filter(test_suite_id: test_suite_id, case_name: case_name).first
+          test_case = @connector.con[:test_cases].filter(test_suite_id:, case_name:).first
           @connector.disconnect
           raise "Cannot get test_case id. test_suite_id: #{test_suite_id}, case_name: #{case_name}" if test_case.nil?
 
@@ -106,11 +106,26 @@ def get_test_case_id(test_suite_id, case_name)
         # @param  [Int] job_id
         # @return [Int] round
         def get_last_round_from_job_id(job_id)
-          round = @connector.con[:test_case_results].where(job_id: job_id).max(:round)
+          round = @connector.con[:test_case_results].where(job_id:).max(:round)
           @connector.disconnect
           round
         end
 
+        # Update job record with end_time and duration
+        # @param [Integer] job_id
+        # @param [Time] end_time
+        # @param [Float] duration
+        def update_job_record(job_id, end_time, duration)
+          rounded_duration = duration.round(2)
+          return if $debug
+
+          @connector.con[:jobs].where(id: job_id).update(
+            end_time:,
+            duration: rounded_duration
+          )
+          @connector.disconnect
+        end
+
         private
 
         # Common method for getting suite
@@ -131,7 +146,7 @@ def get_suite_id_from_saved_test_suite(saved_test_suite, test_data)
               test_suite_name: test_data[:test_suite_name],
               suite_description: test_data[:suite][:desc],
               github_url: @config[:test_code_repo],
-              file_path: file_path
+              file_path:
             )
             saved_test_suite[:id]
           else # If there is no test_suite, save new record and return suite_id.
@@ -143,7 +158,7 @@ def get_suite_id_from_saved_test_suite(saved_test_suite, test_data)
               test_suite_name: test_data[:test_suite_name],
               suite_description: test_data[:suite][:desc],
               github_url: @config[:test_code_repo],
-              file_path: file_path
+              file_path:
             )
           end
         end
@@ -159,11 +174,11 @@ def insert_and_return_label_ids(labels)
           return nil if labels.empty?
 
           labels.each do |label_name|
-            label = @connector.con[:labels].filter(label_name: label_name).first
+            label = @connector.con[:labels].filter(label_name:).first
             label_ids << if label
                            label[:id]
                          else
-                           @connector.con[:labels].insert(label_name: label_name)
+                           @connector.con[:labels].insert(label_name:)
                          end
           end
           label_ids
@@ -180,14 +195,14 @@ def update_test_case_and_test_case_label(suite_id, test_case, label_ids)
             # Create new connection
             # If there is no labels, return nil
             label_ids&.each do |label_id|
-              @connector.con[:test_case_labels].insert(test_case_id: saved_test_case[:id], label_id: label_id)
+              @connector.con[:test_case_labels].insert(test_case_id: saved_test_case[:id], label_id:)
             end
           else
             # Add case data
             test_case_id = @connector.con[:test_cases].insert(test_suite_id: suite_id, case_name: test_case[:case_name], case_description: test_case[:desc])
             # If there is no labels, return nil
             label_ids&.each do |label_id|
-              @connector.con[:test_case_labels].insert(test_case_id: test_case_id, label_id: label_id)
+              @connector.con[:test_case_labels].insert(test_case_id:, label_id:)
             end
           end
         end

lib/bucky/core/test_core/test_manager.rb

@@ -55,7 +55,7 @@ def parallel_distribute_into_workers(data_set, max_processes, &block)
           data_set_grouped = data_set.group_by.with_index { |_elem, index| index % max_processes }
           r_pipe, w_pipe = IO.pipe
           # Use 'values' method to get only hash's key into an array
-          data_set_grouped.values.each do |data_for_pre_worker|
+          data_set_grouped.each_value do |data_for_pre_worker|
             # Number of child process is equal to max_processes (or equal to data_set length when data_set length is less than max_processes)
             fork do
               data_for_pre_worker.each { |data| block.call(data, w_pipe) }
@@ -112,6 +112,11 @@ def initialize(test_cond)
 
         def run
           execute_test
+
+          # Update job record with end_time and duration when test completes
+          @end_time = Time.now
+          @duration = @end_time - @start_time
+          @tdo.update_job_record($job_id, @end_time, @duration)
         end
 
         # Rerun by job id
@@ -122,6 +127,11 @@ def rerun
             is_error: 1, job_id: rerun_job_id, round: $round
           )
           execute_test
+
+          # Update job record with end_time and duration when test completes
+          @end_time = Time.now
+          @duration = @end_time - @start_time
+          @tdo.update_job_record($job_id, @end_time, @duration)
         end
 
         private
@@ -142,10 +152,10 @@ def do_test_suites(test_suite_data)
           linkstatus_parallel_num = Bucky::Utils::Config.instance[:linkstatus_parallel_num]
           tcg = Bucky::Core::TestCore::TestClassGenerator.new(@test_cond)
           case @test_cond[:test_category]
-          when 'e2e' then results_set = parallel_new_worker_each(test_suite_data, e2e_parallel_num) { |data, w_pipe| tcg.generate_test_class(data: data, w_pipe: w_pipe) }
-          when 'linkstatus' then
+          when 'e2e' then results_set = parallel_new_worker_each(test_suite_data, e2e_parallel_num) { |data, w_pipe| tcg.generate_test_class(data:, w_pipe:) }
+          when 'linkstatus'
             linkstatus_url_log = {}
-            results_set = parallel_distribute_into_workers(test_suite_data, linkstatus_parallel_num) { |data, w_pipe| tcg.generate_test_class(data: data, linkstatus_url_log: linkstatus_url_log, w_pipe: w_pipe) }
+            results_set = parallel_distribute_into_workers(test_suite_data, linkstatus_parallel_num) { |data, w_pipe| tcg.generate_test_class(data:, linkstatus_url_log:, w_pipe:) }
           end
 
           results_set

spec/core/test_core/test_manager_spec.rb

@@ -10,12 +10,13 @@
   before do
     allow(Bucky::Core::Database::TestDataOperator).to receive(:new).and_return(tdo)
     allow(tdo).to receive(:save_job_record_and_get_job_id)
+    allow(tdo).to receive(:update_job_record)
     allow(tdo).to receive(:get_ng_test_cases_at_last_execution).and_return(ng_case_data)
     allow(tm).to receive(:do_test_suites).and_return({})
   end
 
   describe '#run' do
-    let(:tm) { Bucky::Core::TestCore::TestManager.new(re_test_count: re_test_count) }
+    let(:tm) { Bucky::Core::TestCore::TestManager.new(re_test_count:) }
 
     describe '@re_test_count: run untill max round' do
       context '@re_test_count is 1' do
@@ -50,9 +51,10 @@
   end
 
   describe '#rerun' do
-    let(:tm) { Bucky::Core::TestCore::TestManager.new(re_test_count: re_test_count, job: rerun_job_id) }
+    let(:tm) { Bucky::Core::TestCore::TestManager.new(re_test_count:, job: rerun_job_id) }
     before do
       allow(tdo).to receive(:get_last_round_from_job_id)
+      allow(tdo).to receive(:update_job_record)
     end
 
     describe 'call execute_test on rerun method' do