Switch Java and Python upgrade tests from running on JDK8 to JDK11 in…

… CircleCI

patch by Ekaterina Dimitrova; reviewed by Berenguer Blasi for CASSANDRA-18285

.circleci/config_template.yml

@@ -224,14 +224,14 @@ j8_repeated_dtest_executor: &j8_repeated_dtest_executor
     name: java8-executor
   parallelism: 4
 
-j8_repeated_upgrade_dtest_executor: &j8_repeated_upgrade_dtest_executor
+j11_repeated_upgrade_dtest_executor: &j11_repeated_upgrade_dtest_executor
   executor:
-    name: java8-executor
+    name: java11-executor
   parallelism: 4
 
-j8_repeated_jvm_upgrade_dtest_executor: &j8_repeated_jvm_upgrade_dtest_executor
+j11_repeated_jvm_upgrade_dtest_executor: &j11_repeated_jvm_upgrade_dtest_executor
   executor:
-    name: java8-executor
+    name: java11-executor
   parallelism: 4
 
 j11_repeated_utest_executor: &j11_repeated_utest_executor
@@ -550,24 +550,6 @@ j8_separate_jobs: &j8_separate_jobs
         requires:
           - start_j11_utests_system_keyspace_directory_repeat
           - j8_build
-    - start_j8_dtest_jars_build:
-        type: approval
-    - j8_dtest_jars_build:
-        requires:
-          - j8_build
-          - start_j8_dtest_jars_build
-    - start_jvm_upgrade_dtests:
-        type: approval
-    - j8_jvm_upgrade_dtests:
-        requires:
-          - start_jvm_upgrade_dtests
-          - j8_dtest_jars_build
-    - start_jvm_upgrade_dtests_repeat:
-        type: approval
-    - j8_jvm_upgrade_dtests_repeat:
-        requires:
-          - start_jvm_upgrade_dtests_repeat
-          - j8_dtest_jars_build
     # Python DTests
     - start_j8_dtests:
         type: approval
@@ -669,13 +651,6 @@ j8_separate_jobs: &j8_separate_jobs
         requires:
           - start_j11_dtests_large_vnode_repeat
           - j8_build
-    # Java 8 upgrade tests
-    - start_upgrade_dtests:
-        type: approval
-    - j8_upgrade_dtests:
-        requires:
-          - start_upgrade_dtests
-          - j8_build
     # Java 8 cqlsh dtests
     - start_j8_cqlsh_tests:
         type: approval
@@ -800,13 +775,6 @@ j8_separate_jobs: &j8_separate_jobs
         requires:
           - start_j11_dtests_vnode_repeat
           - j8_build
-    # Repeated Python upgrade dtest
-    - start_j8_upgrade_dtests_repeat:
-        type: approval
-    - j8_upgrade_dtests_repeat:
-        requires:
-            - start_j8_upgrade_dtests_repeat
-            - j8_build
 
 j8_pre-commit_jobs: &j8_pre-commit_jobs
   jobs:
@@ -1008,18 +976,6 @@ j8_pre-commit_jobs: &j8_pre-commit_jobs
         requires:
           - start_utests_system_keyspace_directory
           - j8_build
-    - start_jvm_upgrade_dtests:
-        type: approval
-    - j8_dtest_jars_build:
-        requires:
-          - j8_build
-          - start_jvm_upgrade_dtests
-    - j8_jvm_upgrade_dtests:
-        requires:
-          - j8_dtest_jars_build
-    - j8_jvm_upgrade_dtests_repeat:
-        requires:
-          - j8_dtest_jars_build
     # Python DTests
     - j8_dtests:
         requires:
@@ -1103,17 +1059,6 @@ j8_pre-commit_jobs: &j8_pre-commit_jobs
         requires:
           - start_j11_dtests_large
           - j8_build
-    # Java 8 upgrade tests (on request)
-    - start_upgrade_dtests:
-        type: approval
-    - j8_upgrade_dtests:
-        requires:
-          - j8_build
-          - start_upgrade_dtests
-    - j8_upgrade_dtests_repeat:
-        requires:
-          - j8_build
-          - start_upgrade_dtests
     # Java 8 cqlsh dtests
     - j8_cqlsh_dtests_py3:
         requires:
@@ -1435,6 +1380,32 @@ j11_separate_jobs: &j11_separate_jobs
         requires:
           - start_j11_utests_system_keyspace_directory_repeat
           - j11_build
+    # Java upgrade tests
+    - start_j11_dtest_jars_build:
+        type: approval
+    - j11_dtest_jars_build:
+        requires:
+          - j11_build
+          - start_j11_dtest_jars_build
+    - start_jvm_upgrade_dtests:
+        type: approval
+    - j11_jvm_upgrade_dtests:
+        requires:
+          - start_jvm_upgrade_dtests
+          - j11_dtest_jars_build
+    - start_jvm_upgrade_dtests_repeat:
+        type: approval
+    - j11_jvm_upgrade_dtests_repeat:
+        requires:
+          - start_jvm_upgrade_dtests_repeat
+          - j11_dtest_jars_build
+    # Java 11 upgrade tests
+    - start_j11_upgrade_dtests:
+        type: approval
+    - j11_upgrade_dtests:
+        requires:
+          - start_j11_upgrade_dtests
+          - j11_build
     # Java 11 repeated utest
     - start_j11_repeated_ant_test:
         type: approval
@@ -1455,6 +1426,13 @@ j11_separate_jobs: &j11_separate_jobs
         requires:
           - start_j11_dtests_vnode_repeat
           - j11_build
+    # Repeated Python upgrade dtest
+    - start_j11_upgrade_dtests_repeat:
+        type: approval
+    - j11_upgrade_dtests_repeat:
+        requires:
+          - start_j11_upgrade_dtests_repeat
+          - j11_build
 
 j11_pre-commit_jobs: &j11_pre-commit_jobs
   jobs:
@@ -1644,6 +1622,30 @@ j11_pre-commit_jobs: &j11_pre-commit_jobs
         requires:
           - start_utests_system_keyspace_directory
           - j11_build
+    # Java upgrade tests
+    - start_jvm_upgrade_dtests:
+        type: approval
+    - j11_dtest_jars_build:
+        requires:
+          - j11_build
+          - start_jvm_upgrade_dtests
+    - j11_jvm_upgrade_dtests:
+        requires:
+          - j11_dtest_jars_build
+    - j11_jvm_upgrade_dtests_repeat:
+        requires:
+          - j11_dtest_jars_build
+    # Java 11 upgrade tests (on request)
+    - start_j11_upgrade_dtests:
+        type: approval
+    - j11_upgrade_dtests:
+        requires:
+          - j11_build
+          - start_j11_upgrade_dtests
+    - j11_upgrade_dtests_repeat:
+        requires:
+          - j11_build
+          - start_j11_upgrade_dtests
 
 workflows:
     version: 2
@@ -1706,8 +1708,8 @@ jobs:
     executor: java11-executor
     <<: *build_common
 
-  j8_dtest_jars_build:
-    executor: java8-executor
+  j11_dtest_jars_build:
+    executor: java11-executor
     parallelism: 1
     steps:
       - attach_workspace:
@@ -1809,8 +1811,8 @@ jobs:
           target: "testclasslist"
           arguments: "-Dtest.jvm.args='-Dcassandra.dtest.num_tokens=16'"
 
-  j8_jvm_upgrade_dtests:
-    <<: *j8_medium_par_executor
+  j11_jvm_upgrade_dtests:
+    <<: *j11_medium_par_executor
     steps:
       - attach_workspace:
           at: /home/cassandra
@@ -2084,18 +2086,18 @@ jobs:
         file_tag: j11_without_vnodes
         pytest_extra_args: '--skip-resource-intensive-tests'
 
-  j8_upgrade_dtests:
-    <<: *j8_par_executor
+  j11_upgrade_dtests:
+    <<: *j11_par_executor
     steps:
       - attach_workspace:
           at: /home/cassandra
       - clone_dtest
       - create_venv
       - create_dtest_containers:
-          file_tag: j8_upgradetests_without_vnodes
+          file_tag: j11_upgradetests_without_vnodes
           run_dtests_extra_args: '--execute-upgrade-tests-only --upgrade-target-version-only --upgrade-version-selection all'
       - run_dtests:
-          file_tag: j8_upgradetests_without_vnodes
+          file_tag: j11_upgradetests_without_vnodes
           pytest_extra_args: '--execute-upgrade-tests-only --upgrade-target-version-only --upgrade-version-selection all'
 
   j8_cqlsh_dtests_py3_vnode:
@@ -2636,8 +2638,8 @@ jobs:
       - log_environment
       - run_simulator_dtests_repeat
 
-  j8_jvm_upgrade_dtests_repeat:
-    <<: *j8_repeated_jvm_upgrade_dtest_executor
+  j11_jvm_upgrade_dtests_repeat:
+    <<: *j11_repeated_jvm_upgrade_dtest_executor
     steps:
       - attach_workspace:
           at: /home/cassandra
@@ -2836,8 +2838,8 @@ jobs:
           stop_on_failure: ${REPEATED_TESTS_STOP_ON_FAILURE}
           extra_dtest_args: "--only-resource-intensive-tests --force-resource-intensive-tests"
 
-  j8_upgrade_dtests_repeat:
-    <<: *j8_repeated_upgrade_dtest_executor
+  j11_upgrade_dtests_repeat:
+    <<: *j11_repeated_upgrade_dtest_executor
     steps:
       - attach_workspace:
           at: /home/cassandra
@@ -2921,7 +2923,7 @@ commands:
           cd ~/cassandra
           mkdir ~/dtest_jars
           git remote add apache https://github.com/apache/cassandra.git
-          for branch in cassandra-2.2 cassandra-3.0 cassandra-3.11 cassandra-4.0 cassandra-4.1 trunk; do
+          for branch in cassandra-4.0 cassandra-4.1 trunk; do
             # check out the correct cassandra version:
             git remote set-branches --add apache '$branch'
             git fetch --depth 1 apache $branch