From 3d7d064cd297b88a327edff5091404679e11d6fd Mon Sep 17 00:00:00 2001 From: Ekaterina Dimitrova Date: Mon, 30 May 2022 12:03:58 -0400 Subject: [PATCH] Return approval step for utests_system_keyspace_directory for java8_separate_tests workflow patch by Ekaterina Dimitrova; reviewed by Brandon Williams and Andres de la Pena for CASSANDRA-17643 --- .circleci/config-2_1.yml | 3 ++ .circleci/config-2_1.yml.high_res.patch | 4 +-- .circleci/config-2_1.yml.mid_res.patch | 40 ++++++++++++------------- .circleci/config.yml | 3 ++ .circleci/config.yml.HIGHRES | 3 ++ .circleci/config.yml.LOWRES | 3 ++ .circleci/config.yml.MIDRES | 3 ++ 7 files changed, 37 insertions(+), 22 deletions(-) diff --git a/.circleci/config-2_1.yml b/.circleci/config-2_1.yml index 380b3cd36b..6a2aa5a50b 100644 --- a/.circleci/config-2_1.yml +++ b/.circleci/config-2_1.yml @@ -234,8 +234,11 @@ 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 diff --git a/.circleci/config-2_1.yml.high_res.patch b/.circleci/config-2_1.yml.high_res.patch index 615b561c01..3e92def52e 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 2022-05-27 12:27:02.000000000 -0400 -+++ config-2_1.yml.HIGHRES 2022-05-27 12:27:16.000000000 -0400 +--- config-2_1.yml 2022-05-30 12:01:09.000000000 -0400 ++++ config-2_1.yml.HIGHRES 2022-05-30 12:03:00.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 91ddacf387..43a684651a 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 2022-05-27 12:27:02.000000000 -0400 -+++ config-2_1.yml.MIDRES 2022-05-27 12:27:13.000000000 -0400 +--- config-2_1.yml 2022-05-30 12:01:09.000000000 -0400 ++++ config-2_1.yml.MIDRES 2022-05-30 12:02:51.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: -@@ -866,7 +890,7 @@ +@@ -869,7 +893,7 @@ target: testclasslist-system-keyspace-directory j8_dtests-with-vnodes: @@ -128,7 +128,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -880,7 +904,7 @@ +@@ -883,7 +907,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 -@@ -895,7 +919,7 @@ +@@ -898,7 +922,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 -@@ -909,7 +933,7 @@ +@@ -912,7 +936,7 @@ pytest_extra_args: '--skip-resource-intensive-tests' j11_dtests-no-vnodes: @@ -155,7 +155,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -924,7 +948,7 @@ +@@ -927,7 +951,7 @@ pytest_extra_args: '--skip-resource-intensive-tests' j8_upgradetests-no-vnodes: @@ -164,7 +164,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -938,7 +962,7 @@ +@@ -941,7 +965,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 -@@ -953,7 +977,7 @@ +@@ -956,7 +980,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 -@@ -968,7 +992,7 @@ +@@ -971,7 +995,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 -@@ -986,7 +1010,7 @@ +@@ -989,7 +1013,7 @@ python_version: '3.8' j8_cqlsh-dtests-py2-no-vnodes: @@ -200,7 +200,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -1001,7 +1025,7 @@ +@@ -1004,7 +1028,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 -@@ -1016,7 +1040,7 @@ +@@ -1019,7 +1043,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 -@@ -1034,7 +1058,7 @@ +@@ -1037,7 +1061,7 @@ python_version: '3.8' j11_cqlsh-dtests-py2-with-vnodes: @@ -227,7 +227,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -1049,7 +1073,7 @@ +@@ -1052,7 +1076,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 -@@ -1064,7 +1088,7 @@ +@@ -1067,7 +1091,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 -@@ -1082,7 +1106,7 @@ +@@ -1085,7 +1109,7 @@ python_version: '3.8' j11_cqlsh-dtests-py2-no-vnodes: @@ -254,7 +254,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -1097,7 +1121,7 @@ +@@ -1100,7 +1124,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 -@@ -1112,7 +1136,7 @@ +@@ -1115,7 +1139,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 -@@ -1754,3 +1778,4 @@ +@@ -1757,3 +1781,4 @@ - store_artifacts: path: ~/cassandra-dtest/logs destination: dtest_logs diff --git a/.circleci/config.yml b/.circleci/config.yml index 619c877540..6e941ea5ea 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3917,8 +3917,11 @@ 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 3bae134677..3b71be7b4b 100644 --- a/.circleci/config.yml.HIGHRES +++ b/.circleci/config.yml.HIGHRES @@ -3917,8 +3917,11 @@ 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 619c877540..6e941ea5ea 100644 --- a/.circleci/config.yml.LOWRES +++ b/.circleci/config.yml.LOWRES @@ -3917,8 +3917,11 @@ 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 11fdfdf011..be925747c9 100644 --- a/.circleci/config.yml.MIDRES +++ b/.circleci/config.yml.MIDRES @@ -3917,8 +3917,11 @@ 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