Make the upgrade tests run on trunk

 Your job ran 4412 tests with 3923 failures

- test_IN_clause_on_last_key - upgrade_tests.cql_tests.TestCQLNodes2RF1_Upgrade_current_2_1_x_To_indev_2_1_xupgrade_tests/cql_tests.pymajor_version_int = 8

    def switch_jdks(major_version_int):
        """
        Changes the jdk version globally, by setting JAVA_HOME = JAVA[N]_HOME.
        This means the environment must have JAVA[N]_HOME set to switch to jdk version N.
        """
        new_java_home = 'JAVA{}_HOME'.format(major_version_int)
    
        try:
>           os.environ[new_java_home]

upgrade_tests/upgrade_base.py:25: 
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ 

self = environ({'PYTHONUNBUFFERED': 'true', 'DEFAULT_DIR': '/home/cassandra/cassandra-dtest', 'CIRCLE_NODE_INDEX': '47', 'CIR...ade_tests/cql_tests.py::TestCQLNodes2RF1_Upgrade_current_2_1_x_To_indev_2_1_x::()::test_IN_clause_on_last_key (call)'})
key = 'JAVA8_HOME'

    def __getitem__(self, key):
        try:
            value = self._data[self.encodekey(key)]
        except KeyError:
            # raise KeyError with the original key value
>           raise KeyError(key) from None
E           KeyError: 'JAVA8_HOME'