From 041c33e2d48f2b38b61a02fc9fa7490be48707ef Mon Sep 17 00:00:00 2001 From: Ekaterina Dimitrova Date: Thu, 19 May 2022 16:45:27 -0400 Subject: [PATCH] Add utests_system_keyspace_directory to pre-commit tests workflow in CircleCI patch by Ekaterina Dimitrova; reviewed by Brandon Williams for CASSANDRA-17643 --- .circleci/config-2_1.yml | 6 ---- .circleci/config-2_1.yml.high_res.patch | 4 +-- .circleci/config-2_1.yml.mid_res.patch | 40 ++++++++++++------------- .circleci/config.yml | 6 ---- .circleci/config.yml.HIGHRES | 6 ---- .circleci/config.yml.LOWRES | 6 ---- .circleci/config.yml.MIDRES | 6 ---- 7 files changed, 22 insertions(+), 52 deletions(-) diff --git a/.circleci/config-2_1.yml b/.circleci/config-2_1.yml index 9d308f1a3d..380b3cd36b 100644 --- a/.circleci/config-2_1.yml +++ b/.circleci/config-2_1.yml @@ -234,11 +234,8 @@ j8_with_dtests_jobs: &j8_with_dtests_jobs requires: - start_utests_fqltool - j8_build - - start_utests_system_keyspace_directory: - type: approval - utests_system_keyspace_directory: requires: - - start_utests_system_keyspace_directory - j8_build - start_j8_dtest_jars_build: type: approval @@ -424,11 +421,8 @@ j8_pre-commit_jobs: &j8_pre-commit_jobs requires: - start_utests_fqltool - j8_build - - start_utests_system_keyspace_directory: - type: approval - utests_system_keyspace_directory: requires: - - start_utests_system_keyspace_directory - j8_build - start_j8_dtest_jars_build: type: approval diff --git a/.circleci/config-2_1.yml.high_res.patch b/.circleci/config-2_1.yml.high_res.patch index d28f185c12..615b561c01 100644 --- a/.circleci/config-2_1.yml.high_res.patch +++ b/.circleci/config-2_1.yml.high_res.patch @@ -1,5 +1,5 @@ ---- config-2_1.yml 2021-11-12 11:02:52.301079060 +0100 -+++ config-2_1.yml.HIGHRES 2021-11-16 12:04:20.083117123 +0100 +--- config-2_1.yml 2022-05-27 12:27:02.000000000 -0400 ++++ config-2_1.yml.HIGHRES 2022-05-27 12:27:16.000000000 -0400 @@ -101,14 +101,14 @@ j8_par_executor: &j8_par_executor executor: diff --git a/.circleci/config-2_1.yml.mid_res.patch b/.circleci/config-2_1.yml.mid_res.patch index 28021f650e..91ddacf387 100644 --- a/.circleci/config-2_1.yml.mid_res.patch +++ b/.circleci/config-2_1.yml.mid_res.patch @@ -1,5 +1,5 @@ ---- config-2_1.yml 2021-11-12 11:02:52.301079060 +0100 -+++ config-2_1.yml.MIDRES 2021-11-16 11:53:09.052881200 +0100 +--- config-2_1.yml 2022-05-27 12:27:02.000000000 -0400 ++++ config-2_1.yml.MIDRES 2022-05-27 12:27:13.000000000 -0400 @@ -101,14 +101,14 @@ j8_par_executor: &j8_par_executor executor: @@ -119,7 +119,7 @@ j8_with_dtests_jobs: &j8_with_dtests_jobs jobs: -@@ -872,7 +896,7 @@ +@@ -866,7 +890,7 @@ target: testclasslist-system-keyspace-directory j8_dtests-with-vnodes: @@ -128,7 +128,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -886,7 +910,7 @@ +@@ -880,7 +904,7 @@ pytest_extra_args: '--use-vnodes --num-tokens=16 --skip-resource-intensive-tests' j11_dtests-with-vnodes: @@ -137,7 +137,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -901,7 +925,7 @@ +@@ -895,7 +919,7 @@ pytest_extra_args: '--use-vnodes --num-tokens=16 --skip-resource-intensive-tests' j8_dtests-no-vnodes: @@ -146,7 +146,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -915,7 +939,7 @@ +@@ -909,7 +933,7 @@ pytest_extra_args: '--skip-resource-intensive-tests' j11_dtests-no-vnodes: @@ -155,7 +155,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -930,7 +954,7 @@ +@@ -924,7 +948,7 @@ pytest_extra_args: '--skip-resource-intensive-tests' j8_upgradetests-no-vnodes: @@ -164,7 +164,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -944,7 +968,7 @@ +@@ -938,7 +962,7 @@ pytest_extra_args: '--execute-upgrade-tests-only --upgrade-target-version-only --upgrade-version-selection all' j8_cqlsh-dtests-py2-with-vnodes: @@ -173,7 +173,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -959,7 +983,7 @@ +@@ -953,7 +977,7 @@ extra_env_args: 'CQLSH_PYTHON=/usr/bin/python2.7' j8_cqlsh-dtests-py3-with-vnodes: @@ -182,7 +182,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -974,7 +998,7 @@ +@@ -968,7 +992,7 @@ extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6' j8_cqlsh-dtests-py38-with-vnodes: @@ -191,7 +191,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -992,7 +1016,7 @@ +@@ -986,7 +1010,7 @@ python_version: '3.8' j8_cqlsh-dtests-py2-no-vnodes: @@ -200,7 +200,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -1007,7 +1031,7 @@ +@@ -1001,7 +1025,7 @@ extra_env_args: 'CQLSH_PYTHON=/usr/bin/python2.7' j8_cqlsh-dtests-py3-no-vnodes: @@ -209,7 +209,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -1022,7 +1046,7 @@ +@@ -1016,7 +1040,7 @@ extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6' j8_cqlsh-dtests-py38-no-vnodes: @@ -218,7 +218,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -1040,7 +1064,7 @@ +@@ -1034,7 +1058,7 @@ python_version: '3.8' j11_cqlsh-dtests-py2-with-vnodes: @@ -227,7 +227,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -1055,7 +1079,7 @@ +@@ -1049,7 +1073,7 @@ extra_env_args: 'CQLSH_PYTHON=/usr/bin/python2.7' j11_cqlsh-dtests-py3-with-vnodes: @@ -236,7 +236,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -1070,7 +1094,7 @@ +@@ -1064,7 +1088,7 @@ extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6' j11_cqlsh-dtests-py38-with-vnodes: @@ -245,7 +245,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -1088,7 +1112,7 @@ +@@ -1082,7 +1106,7 @@ python_version: '3.8' j11_cqlsh-dtests-py2-no-vnodes: @@ -254,7 +254,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -1103,7 +1127,7 @@ +@@ -1097,7 +1121,7 @@ extra_env_args: 'CQLSH_PYTHON=/usr/bin/python2.7' j11_cqlsh-dtests-py3-no-vnodes: @@ -263,7 +263,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -1118,7 +1142,7 @@ +@@ -1112,7 +1136,7 @@ extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6' j11_cqlsh-dtests-py38-no-vnodes: @@ -272,7 +272,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -1760,3 +1784,4 @@ +@@ -1754,3 +1778,4 @@ - store_artifacts: path: ~/cassandra-dtest/logs destination: dtest_logs diff --git a/.circleci/config.yml b/.circleci/config.yml index 6632536e9b..619c877540 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3917,11 +3917,8 @@ workflows: requires: - start_utests_fqltool - j8_build - - start_utests_system_keyspace_directory: - type: approval - utests_system_keyspace_directory: requires: - - start_utests_system_keyspace_directory - j8_build - start_j8_dtest_jars_build: type: approval @@ -4092,11 +4089,8 @@ workflows: requires: - start_utests_fqltool - j8_build - - start_utests_system_keyspace_directory: - type: approval - utests_system_keyspace_directory: requires: - - start_utests_system_keyspace_directory - j8_build - start_j8_dtest_jars_build: type: approval diff --git a/.circleci/config.yml.HIGHRES b/.circleci/config.yml.HIGHRES index ae2f436ac6..3bae134677 100644 --- a/.circleci/config.yml.HIGHRES +++ b/.circleci/config.yml.HIGHRES @@ -3917,11 +3917,8 @@ workflows: requires: - start_utests_fqltool - j8_build - - start_utests_system_keyspace_directory: - type: approval - utests_system_keyspace_directory: requires: - - start_utests_system_keyspace_directory - j8_build - start_j8_dtest_jars_build: type: approval @@ -4092,11 +4089,8 @@ workflows: requires: - start_utests_fqltool - j8_build - - start_utests_system_keyspace_directory: - type: approval - utests_system_keyspace_directory: requires: - - start_utests_system_keyspace_directory - j8_build - start_j8_dtest_jars_build: type: approval diff --git a/.circleci/config.yml.LOWRES b/.circleci/config.yml.LOWRES index 6632536e9b..619c877540 100644 --- a/.circleci/config.yml.LOWRES +++ b/.circleci/config.yml.LOWRES @@ -3917,11 +3917,8 @@ workflows: requires: - start_utests_fqltool - j8_build - - start_utests_system_keyspace_directory: - type: approval - utests_system_keyspace_directory: requires: - - start_utests_system_keyspace_directory - j8_build - start_j8_dtest_jars_build: type: approval @@ -4092,11 +4089,8 @@ workflows: requires: - start_utests_fqltool - j8_build - - start_utests_system_keyspace_directory: - type: approval - utests_system_keyspace_directory: requires: - - start_utests_system_keyspace_directory - j8_build - start_j8_dtest_jars_build: type: approval diff --git a/.circleci/config.yml.MIDRES b/.circleci/config.yml.MIDRES index 2b8b183c2b..11fdfdf011 100644 --- a/.circleci/config.yml.MIDRES +++ b/.circleci/config.yml.MIDRES @@ -3917,11 +3917,8 @@ workflows: requires: - start_utests_fqltool - j8_build - - start_utests_system_keyspace_directory: - type: approval - utests_system_keyspace_directory: requires: - - start_utests_system_keyspace_directory - j8_build - start_j8_dtest_jars_build: type: approval @@ -4092,11 +4089,8 @@ workflows: requires: - start_utests_fqltool - j8_build - - start_utests_system_keyspace_directory: - type: approval - utests_system_keyspace_directory: requires: - - start_utests_system_keyspace_directory - j8_build - start_j8_dtest_jars_build: type: approval