[GitHub] [cassandra] ekaterinadimitrova2 commented on a change in pull request #747: CircleCI should run cqlshlib tests

[GitBox <gi...@apache.org>]

ekaterinadimitrova2 commented on a change in pull request #747:
URL: https://github.com/apache/cassandra/pull/747#discussion_r493906036



##########
File path: .circleci/config-2_1.yml
##########
@@ -866,6 +886,23 @@ commands:
         path: /tmp/cassandra/build/test/logs
         destination: logs
 
+  run_cqlshlib_tests:
+    parameters:
+      no_output_timeout:
+        type: string
+        default: 15m
+    steps:
+    - run:
+        name: Run cqlshlib Unit Tests
+        command: |
+          export PATH=$JAVA_HOME/bin:$PATH
+          time mv ~/cassandra /tmp
+          cd /tmp/cassandra/pylib
+          ./cassandra-cqlsh-tests.sh ..
+        no_output_timeout: <<parameters.no_output_timeout>>
+    - store_test_results:
+        path: /tmp/cassandra/pylib

Review comment:
       Are you sure about the directory?
   Other jobs have output/logs/results

##########
File path: .circleci/config-2_1.yml.mid_res.patch
##########
@@ -1,8 +1,4 @@
-diff --git .circleci/config-2_1.yml .circleci/config-2_1.yml

Review comment:
       I have the feeling that something went wrong during patch creation.
   If you try git apply check you get an error:
   error: patch fragment without header at line 1: @@ -19,39 +19,51 @@ default_env_vars: &default_env_vars

##########
File path: .circleci/config-2_1.yml.high_res.patch
##########
@@ -1,34 +1,79 @@
-22,23c22,23
-<     #exec_resource_class: xlarge
-<   parallelism: 4
----
->     exec_resource_class: xlarge
->   parallelism: 100
-28,29c28,29
-<     #exec_resource_class: xlarge
-<   parallelism: 1
----
->     exec_resource_class: xlarge
->   parallelism: 5
-34,35c34,35
-<     #exec_resource_class: xlarge
-<   parallelism: 1
----
->     exec_resource_class: xlarge
->   parallelism: 2
-40c40
-<     #exec_resource_class: xlarge
----
->     exec_resource_class: xlarge
-46,47c46,47
-<     #exec_resource_class: xlarge
-<   parallelism: 4
----
->     exec_resource_class: xlarge
->   parallelism: 100
-52,53c52,53
-<     #exec_resource_class: xlarge
-<   parallelism: 1
----
->     exec_resource_class: xlarge
->   parallelism: 2
+@@ -19,39 +19,51 @@ default_env_vars: &default_env_vars
+ j8_par_executor: &j8_par_executor
+   executor:
+     name: java8-executor
+-    #exec_resource_class: xlarge
+-  parallelism: 4
++    exec_resource_class: xlarge
++  parallelism: 100
+ 
+ j8_small_par_executor: &j8_small_par_executor
+   executor:
+     name: java8-executor
+-    #exec_resource_class: xlarge
++    exec_resource_class: xlarge
++  parallelism: 5
++
++j8_small_executor: &j8_small_executor
++  executor:
++    name: java8-executor
++    exec_resource_class: medium
+   parallelism: 1
+ 
+ j8_medium_par_executor: &j8_medium_par_executor
+   executor:
+     name: java8-executor
+-    #exec_resource_class: xlarge
+-  parallelism: 1
++    exec_resource_class: xlarge
++  parallelism: 2
+ 
+ j8_seq_executor: &j8_seq_executor
+   executor:
+     name: java8-executor
+-    #exec_resource_class: xlarge
++    exec_resource_class: xlarge
+   parallelism: 1 # sequential, single container tests: no parallelism benefits
+ 
+ j11_par_executor: &j11_par_executor
+   executor:
+     name: java11-executor
+-    #exec_resource_class: xlarge
+-  parallelism: 4
++    exec_resource_class: xlarge
++  parallelism: 100
+ 
+-j11_small_par_executor: &j11_small_par_executor
++j11_small_executor: &j11_small_executor
+   executor:
+     name: java11-executor
+-    #exec_resource_class: xlarge
++    exec_resource_class: medium
+   parallelism: 1
+ 
++j11_small_par_executor: &j11_small_par_executor
++  executor:
++    name: java11-executor
++    exec_resource_class: xlarge
++  parallelism: 2
++

Review comment:
       Below stuff shouldn't appear here. 
   +j11_small_par_executor: &j11_small_par_executor
   +  executor:
   +    name: java11-executor
   +    exec_resource_class: xlarge
   +  parallelism: 2
   
   The flow is as follows:
   1) Because we need to add new jobs, we do that in both config.yml and config-2_1.yml
   2) The jobs are added to config.yml and config-2_1.yml with their low res and commit those two files the way the lowres is supposed to look like
   3) Then the patch creation comes:
    - update the config-2_1.yml the way you want it for midres and create a patch with name config-2_1.yml.mid_res.patch. When you look at the patch, only resources will be changed - from those used for lowres to those used for highres. Save the patch and revert the changes in config-2_1.yml so it stays in the lowres
   - repeat the procedure for highres patch
   4) Now when you have your patch files, you don't have to do anything else then run generate.sh which will update config.yml.LOWRES, config.yml.MIDRES, config.yml.HIGHRES




----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



---------------------------------------------------------------------
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For additional commands, e-mail: pr-help@cassandra.apache.org