CI: Remove hack to disable standard test suite on SWING CI
authorJan Vrany <jan.vrany@fit.cvut.cz>
Tue, 13 Dec 2016 22:06:34 +0000
changeset 104 3c610bb4c1f0
parent 103 fda494c2564b
child 105 983a637074e6
CI: Remove hack to disable standard test suite on SWING CI ...as a preparation to move SWING CI from matrix jobs to pipeline jobs.
specs/stx-jv.rbspec
--- a/specs/stx-jv.rbspec	Tue Dec 13 13:50:58 2016 +0000
+++ b/specs/stx-jv.rbspec	Tue Dec 13 22:06:34 2016 +0000
@@ -203,22 +203,12 @@
 
   # Define a "default" test suite, i.e., a set of tests that are run when
   # user does `rake test`. 
-  # The test suite is defined conditionally only when not running under SWING Jenkins. 
-  # Though this is hacky, I'd like a Jenkins job to build exactly the same 
-  # project as user to make sure they're in sync. However, under Jenkins I don't
-  # want them to run - for running tests we have other jobs which run them under
-  # different configurations. 
-  #
-  # This hack will go as soon as SWING Jenkins will switch to pipeline
-  #
-  if (ENV['USER'] != 'builder') and (ENV['USERNAME'] != 'builder') then
-    package 'stx:libview/tests', :test => true;
-    package 'stx:libjava', :test => true;
-    package 'stx:libjava/tools', :test => true;
-    package 'stx:goodies/regression', :test => true;
-    package 'stx:libscm/mercurial', :test => true;
-  end
-
+  package 'stx:libview/tests', :test => true;
+  package 'stx:libjava', :test => true;
+  package 'stx:libjava/tools', :test => true;
+  package 'stx:goodies/regression', :test => true;
+  package 'stx:libscm/mercurial', :test => true;
+  
   tasks do
     # We need to checkout CharacterEncoderCodeGenerator from stx:goodies
     # because RegressionTests::CharacterTests>>test01_CaseTesting needs that.