hybrid_platforms_conductor 33.9.4 → 33.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 433e01481e26d03667cde79b93697f0f14e949a6201931c6e570ebb84670e79a
-  data.tar.gz: 61c1eb5c9b9ec3df221528e8ae1c08a7a6bdf3628c2a6a83b1756e11a84a2e88
+  metadata.gz: 03d8f9c77d6fd058348749c2ba567f905af52558207e281c8d20678775bfc85c
+  data.tar.gz: 56ca17b26a52bee7cff5659718a283368270815e5e61f1bc4cae0201da1d39c8
 SHA512:
-  metadata.gz: 31ff562ab7108537b8ba57b8c657ef516ef5665fb40fc81d4afe4f14a54400f62324597136845af8c39bd8788318d3d12c54362562cb73dff9d769c60cf8bce1
-  data.tar.gz: cb7dfea944204a89f9522703fb588ec8085dcd9a92816abe0cc012f0e7440432ee4a3831825517ae9b74f59e1ac1ff7d4995b6fa75220c28096de1a8e95f31b6
+  metadata.gz: 6a97cab5245e2b0bcf27a869b783055560b3f0f95a70b3596fdba74fd64f4ddc41af715c54e66561ea59afdde83f382a5ff9e1fc05c9e85842276450e467cae9
+  data.tar.gz: 521ea609ddc3952fbb924fb333f40901ed28396b575899c5dae2a43256c2e821162de13bb94a2c846817816205d062960590cc3088f3d0f6da74821103a62519

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# [v33.9.5](https://github.com/sweet-delights/hybrid-platforms-conductor/compare/v33.9.4...v33.9.5) (2022-03-20 17:46:29)
+
+### Patches
+
+* [[#118] Fix linear strategy checks when merge commits are found](https://github.com/sweet-delights/hybrid-platforms-conductor/commit/01464ae5bb5c39e95be6216fceed0e9ac00ae83e)
+
 # [v33.9.4](https://github.com/sweet-delights/hybrid-platforms-conductor/compare/v33.9.3...v33.9.4) (2022-03-20 16:20:04)
 
 ### Patches

data/lib/hybrid_platforms_conductor/hpc_plugins/test/linear_strategy.rb

@@ -20,18 +20,18 @@ module HybridPlatformsConductor
             _exit_status, stdout, _stderr = @cmd_runner.run_cmd(<<~EO_BASH, log_to_stdout: log_debug?, no_exception: true, expected_code: [0, 1])
               cd #{@platform.repository_path} && \
               git --no-pager log \
+                --pretty=format:\"%H\" \
+                --graph \
                 $(git merge-base \
                   --octopus \
                   $(git --no-pager log #{merge_commit_id} --max-count 1 --pretty=format:\"%P\") \
-                )..#{merge_commit_id} \
-                --pretty=format:\"%H\" \
-                --graph \
+                )..#{merge_commit_id}
               | grep '|'
             EO_BASH
             next if stdout.empty?
 
             _exit_status, stdout, _stderr = @cmd_runner.run_cmd(
-              "cd #{@platform.repository_path} && git --no-pager log #{merge_commit_id} --max-count 1 --pretty=format:%aI",
+              "cd #{@platform.repository_path} && git show --no-patch --format=%ci #{merge_commit_id}",
               log_to_stdout: log_debug?
             )
             error "Git history is not linear because of Merge commit #{merge_commit_id}" if Time.now - Time.parse(stdout.strip) < LOOKING_PERIOD

data/lib/hybrid_platforms_conductor/version.rb

@@ -1,5 +1,5 @@
 module HybridPlatformsConductor
 
-  VERSION = '33.9.4'
+  VERSION = '33.9.5'
 
 end

data/spec/hybrid_platforms_conductor_test/api/tests_runner/test_plugins/linear_strategy_spec.rb

@@ -0,0 +1,69 @@
+describe HybridPlatformsConductor::TestsRunner do
+
+  context 'when checking test plugins' do
+
+    context 'with linear_strategy' do
+
+      it 'succeeds when git history is linear' do
+        with_test_platform({}) do |repository_path|
+          test_tests_runner.tests = [:linear_strategy]
+          with_cmd_runner_mocked [
+            ["cd #{repository_path} && git --no-pager log --merges --pretty=format:\"%H\"", proc { [0, '', ''] }]
+          ] do
+            expect(test_tests_runner.run_tests([])).to eq 0
+          end
+        end
+      end
+
+      it 'succeeds when git history is semi-linear' do
+        with_test_platform({}) do |repository_path|
+          test_tests_runner.tests = [:linear_strategy]
+          with_cmd_runner_mocked [
+            ["cd #{repository_path} && git --no-pager log --merges --pretty=format:\"%H\"", proc { [0, "11111111\n22222222\n", ''] }],
+            [/^cd #{Regexp.escape(repository_path)} && git --no-pager log\s+--pretty=format:"%H"\s+--graph\s+\$\(git merge-base\s+--octopus\s+\$\(git --no-pager log 11111111 --max-count 1 --pretty=format:"%P"\)\s*\)\.\.11111111\s+\| grep '\|'$/, proc { [1, '', ''] }],
+            [/^cd #{Regexp.escape(repository_path)} && git --no-pager log\s+--pretty=format:"%H"\s+--graph\s+\$\(git merge-base\s+--octopus\s+\$\(git --no-pager log 22222222 --max-count 1 --pretty=format:"%P"\)\s*\)\.\.22222222\s+\| grep '\|'$/, proc { [1, '', ''] }]
+          ] do
+            expect(test_tests_runner.run_tests([])).to eq 0
+          end
+        end
+      end
+
+      it 'fails when git history is not semi-linear' do
+        with_test_platform({}) do |repository_path|
+          test_tests_runner.tests = [:linear_strategy]
+          register_tests_report_plugins(test_tests_runner, report: HybridPlatformsConductorTest::TestsReportPlugin)
+          test_tests_runner.reports = [:report]
+          with_cmd_runner_mocked [
+            ["cd #{repository_path} && git --no-pager log --merges --pretty=format:\"%H\"", proc { [0, "11111111\n22222222\n", ''] }],
+            [/^cd #{Regexp.escape(repository_path)} && git --no-pager log\s+--pretty=format:"%H"\s+--graph\s+\$\(git merge-base\s+--octopus\s+\$\(git --no-pager log 11111111 --max-count 1 --pretty=format:"%P"\)\s*\)\.\.11111111\s+\| grep '\|'$/, proc { [1, '', ''] }],
+            [/^cd #{Regexp.escape(repository_path)} && git --no-pager log\s+--pretty=format:"%H"\s+--graph\s+\$\(git merge-base\s+--octopus\s+\$\(git --no-pager log 22222222 --max-count 1 --pretty=format:"%P"\)\s*\)\.\.22222222\s+\| grep '\|'$/, proc { [0, '* | 33333333', ''] }],
+            ["cd #{repository_path} && git show --no-patch --format=%ci 22222222", proc { [0, "#{(Time.now - (24 * 60 * 60)).strftime('%F %T')}\n", ''] }]
+          ] do
+            expect(test_tests_runner.run_tests([])).to eq 1
+            expect(HybridPlatformsConductorTest::TestsReportPlugin.reports.size).to eq 1
+            expect(HybridPlatformsConductorTest::TestsReportPlugin.reports.first[:platform_tests].sort).to eq [
+              [:linear_strategy, true, 'platform', ['Git history is not linear because of Merge commit 22222222']]
+            ]
+          end
+        end
+      end
+
+      it 'succeeds when git history is not semi-linear before 6 months' do
+        with_test_platform({}) do |repository_path|
+          test_tests_runner.tests = [:linear_strategy]
+          with_cmd_runner_mocked [
+            ["cd #{repository_path} && git --no-pager log --merges --pretty=format:\"%H\"", proc { [0, "11111111\n22222222\n", ''] }],
+            [/^cd #{Regexp.escape(repository_path)} && git --no-pager log\s+--pretty=format:"%H"\s+--graph\s+\$\(git merge-base\s+--octopus\s+\$\(git --no-pager log 11111111 --max-count 1 --pretty=format:"%P"\)\s*\)\.\.11111111\s+\| grep '\|'$/, proc { [1, '', ''] }],
+            [/^cd #{Regexp.escape(repository_path)} && git --no-pager log\s+--pretty=format:"%H"\s+--graph\s+\$\(git merge-base\s+--octopus\s+\$\(git --no-pager log 22222222 --max-count 1 --pretty=format:"%P"\)\s*\)\.\.22222222\s+\| grep '\|'$/, proc { [0, '* | 33333333', ''] }],
+            ["cd #{repository_path} && git show --no-patch --format=%ci 22222222", proc { [0, "#{(Time.now - (6 * 31 * 24 * 60 * 60)).strftime('%F %T')}\n", ''] }]
+          ] do
+            expect(test_tests_runner.run_tests([])).to eq 0
+          end
+        end
+      end
+
+    end
+
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hybrid_platforms_conductor
 version: !ruby/object:Gem::Version
-  version: 33.9.4
+  version: 33.9.5
 platform: ruby
 authors:
 - Muriel Salvan
@@ -950,6 +950,7 @@ files:
 - spec/hybrid_platforms_conductor_test/api/tests_runner/reports_spec.rb
 - spec/hybrid_platforms_conductor_test/api/tests_runner/test_plugins/bitbucket_conf_spec.rb
 - spec/hybrid_platforms_conductor_test/api/tests_runner/test_plugins/github_ci_spec.rb
+- spec/hybrid_platforms_conductor_test/api/tests_runner/test_plugins/linear_strategy_spec.rb
 - spec/hybrid_platforms_conductor_test/api/tests_runner/test_reports_plugins/confluence_spec.rb
 - spec/hybrid_platforms_conductor_test/cmdb_plugins/test_cmdb.rb
 - spec/hybrid_platforms_conductor_test/cmdb_plugins/test_cmdb_2.rb