🐛 Changes for ODC 4.19+ (#3713)

* Changes for ODC 4.19+

* Enable dev prespective
* Drop for support for <4.14
* Selector changes for >=4.19

* Bring back support for 4.14

Author: cardil

test/ui-e2e-tests.sh

@@ -31,6 +31,29 @@ function archive_cypress_artifacts {
   popd >/dev/null
 }
 
+function enable_dev_perspective() {
+  local ocpversion
+  ocpversion="$(oc get clusterversion/version -o jsonpath='{.status.desired.version}')"
+  if versions.lt "$ocpversion" '4.19.0'; then
+    logger.info 'Dev Console is always enabled for OCP <4.19. Skipping the enablement.'
+    return
+  fi
+  local patch='{"spec":{"customization":{"perspectives":[{"id":"dev","visibility":{"state":"Enabled"}}]}}}'
+
+  if LANG=C oc patch console.operator.openshift.io/cluster \
+      --type='merge' \
+      --dry-run='server' \
+      -p "$patch" | grep -q 'no change'; then
+    logger.success 'Dev Perspective already enabled'
+    return
+  fi
+
+  oc patch console.operator.openshift.io/cluster \
+    --type='merge' \
+    -p "$patch"
+  logger.success 'Dev Perspective enabled'
+}
+
 OCP_VERSION="$(oc get clusterversion version -o jsonpath='{.status.desired.version}')"
 OCP_USERNAME="${OCP_USERNAME:-uitesting}"
 OCP_PASSWORD="${OCP_PASSWORD:-$(echo "$OCP_USERNAME" | sha1sum - | awk '{print $1}')}"
@@ -51,6 +74,7 @@ export OCP_VERSION OCP_USERNAME OCP_PASSWORD OCP_LOGIN_PROVIDER CYPRESS_BASE_URL
 
 add_user "$OCP_USERNAME" "$OCP_PASSWORD"
 check_node
+enable_dev_perspective
 archive_cypress_artifacts
 logger.success '🚀 Cluster prepared for testing.'
 

test/ui/cypress/code/knative/serving/showcase.js

@@ -24,7 +24,10 @@ class ShowcaseKservice {
    */
   url() {
     if (this.clusterLocal) {
-      let selector = '.overview__sidebar-pane .pf-v5-c-clipboard-copy input[type=text]'
+      let selector = '.overview__sidebar-pane .pf-v6-c-clipboard-copy input[type=text]'
+      if (environment.ocpVersion().satisfies('<=4.18')) {
+        selector = '.overview__sidebar-pane .pf-v5-c-clipboard-copy input[type=text]'
+      }
       if (environment.ocpVersion().satisfies('<=4.14')) {
         selector = '.overview__sidebar-pane .pf-c-clipboard-copy input[type=text]'
       }
@@ -35,9 +38,6 @@ class ShowcaseKservice {
         .and('include', 'showcase')
     }
     let selector = '.co-external-link--block a'
-    if (environment.ocpVersion().satisfies('<=4.13')) {
-      selector = 'a.co-external-link'
-    }
     return cy.get(selector)
       .last()
       .scrollIntoView()

test/ui/cypress/code/openshift/openshiftConsole.js

@@ -85,6 +85,18 @@ class OpenshiftConsole {
         drawer: '.odc-topology .pf-c-drawer',
       }
     }
+    if (environment.ocpVersion().satisfies('<=4.18')) {
+      return {
+        /**
+         * @param drawer {JQuery<HTMLElement>}
+         * @returns {boolean}
+         */
+        checkIsOpen: function (drawer) {
+          return drawer.find('.pf-topology-resizable-side-bar').length > 0
+        },
+        drawer: '.pf-v5-c-drawer__panel.ocs-sidebar-index',
+      }
+    }
     return {
       /**
        * @param drawer {JQuery<HTMLElement>}
@@ -93,7 +105,7 @@ class OpenshiftConsole {
       checkIsOpen: function (drawer) {
         return drawer.find('.pf-topology-resizable-side-bar').length > 0
       },
-      drawer: '.pf-v5-c-drawer__panel.ocs-sidebar-index',
+      drawer: '.pf-v6-c-drawer__panel.ocs-sidebar-index',
     }
   }
 }

test/ui/cypress/e2e/serving/multiple-revisions.cy.js

@@ -43,7 +43,10 @@ describe('OCP UI for Serverless Serving', () => {
     cy.get('input[name="trafficSplitting.1.tag"]')
       .type('v1')
     cy.contains('Select a Revision', {matchCase: false}).click()
-    let selector = `ul.pf-v5-c-dropdown__menu button`
+    let selector = `.pf-v6-c-dropdown.pf-m-expanded .pf-v6-c-menu button`
+    if (environment.ocpVersion().satisfies('<=4.18')) {
+      selector = `ul.pf-v5-c-dropdown__menu button`
+    }
     if (environment.ocpVersion().satisfies('<=4.14')) {
       selector = `ul.pf-c-dropdown__menu button`
     }