Reset quorum annotations, remove rolling update

Author: bbejeck

tests/kafkatest/tests/streams/streams_application_upgrade_test.py

@@ -56,7 +56,7 @@ def perform_broker_upgrade(self, to_version):
             self.kafka.start_node(node)
 
     @cluster(num_nodes=9)
-    @matrix(from_version=smoke_test_versions, bounce_type=["full", "rolling"], metadata_quorum=[quorum.combined_kraft])
+    @matrix(from_version=smoke_test_versions, bounce_type=["full"], metadata_quorum=[quorum.combined_kraft])
     def test_app_upgrade(self, from_version, bounce_type, metadata_quorum):
         """
         Starts 3 KafkaStreams instances with <old_version>, and upgrades one-by-one to <new_version>

tests/kafkatest/tests/streams/streams_broker_bounce_test.py

@@ -208,7 +208,7 @@ def collect_results(self, sleep_time_secs):
             broker_type=["leader"],
             num_threads=[1, 3],
             sleep_time_secs=[120],
-            metadata_quorum=[quorum.combined_kraft])
+            metadata_quorum=[quorum.isolated_kraft])
     def test_broker_type_bounce(self, failure_mode, broker_type, sleep_time_secs, num_threads, metadata_quorum):
         """
         Start a smoke test client, then kill one particular broker and ensure data is still received