Resolve conflicts to merge to main

Author: MarcialRosales

.github/workflows/test-management-ui-for-pr.yaml

@@ -71,35 +71,19 @@ jobs:
 
     - name: Run short ui suites on a standalone rabbitmq server
       run: |
-<<<<<<< HEAD
-        RABBITMQ_DOCKER_IMAGE=bazel/packaging/docker-image:rabbitmq-amd64 \
-            ${SELENIUM_DIR}/run-suites.sh
-        mkdir -p /tmp/full-suite
-        mv /tmp/selenium/* /tmp/full-suite
-        mkdir -p /tmp/full-suite/logs
-        mv ${SELENIUM_DIR}/logs/* /tmp/full-suite/logs
-        mkdir -p /tmp/full-suite/screens
-        mv ${SELENIUM_DIR}/screens/* /tmp/full-suite/screens
-
-=======
         IMAGE_TAG=$(find PACKAGES/rabbitmq-server-generic-unix-*.tar.xz | awk -F 'PACKAGES/rabbitmq-server-generic-unix-|.tar.xz' '{print $2}')
         RABBITMQ_DOCKER_IMAGE=pivotalrabbitmq/rabbitmq:$IMAGE_TAG \
           ${SELENIUM_DIR}/run-suites.sh short-suite-management-ui        
         mkdir -p /tmp/short-suite
         mv /tmp/selenium/* /tmp/short-suite
         
->>>>>>> ce760c688b (Insert control-cache headers to every resource and reload index.html)
     - name: Upload Test Artifacts
       if: always()
       uses: actions/[email protected]
       with:
         name: test-artifacts-${{ matrix.browser }}-${{ matrix.erlang_version }}
         path: |
-<<<<<<< HEAD
-          /tmp/full-suite
-=======
           /tmp/short-suite
->>>>>>> ce760c688b (Insert control-cache headers to every resource and reload index.html)
 
   summary-selenium:
     needs:

deps/rabbitmq_management/test/rabbit_mgmt_http_SUITE.erl

@@ -200,18 +200,14 @@ all_tests() -> [
     disabled_qq_replica_opers_test,
     qq_status_test,
     list_deprecated_features_test,
-    list_used_deprecated_features_test,
-<<<<<<< HEAD
-    cluster_and_node_tags_test
-=======
+    list_used_deprecated_features_test,    
     connections_amqpl,
     connections_amqp,
     amqp_sessions,
     amqpl_sessions,
     enable_plugin_amqp,
     cluster_and_node_tags_test,
     version_test
->>>>>>> ce760c688b (Insert control-cache headers to every resource and reload index.html)
 ].
 
 %% -------------------------------------------------------------------