Merge pull request #14325 from sanketpathak/OCPBUGS-42418-improve-kna…

…tive-installation OCPBUGS-42418: Solved the knative test issue when instances are not present
openshift · Sep 28, 2024 · 9789f25 · 9789f25
2 parents d242415 + 0b9768a
commit 9789f25
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 4 deletions.
diff --git a/...end/packages/dev-console/integration-tests/support/pages/functions/checkOperatorStatus.ts b/...end/packages/dev-console/integration-tests/support/pages/functions/checkOperatorStatus.ts
@@ -1,4 +1,9 @@
 import { operatorNamespaces, operatorSubscriptions } from '../../constants';
+import {
+  createKnativeEventingUsingCLI,
+  createKnativeKafkaUsingCLI,
+  createKnativeServingUsingCLI,
+} from './knativeSubscriptions';
 
 export const checkRedHatIntegrationCamelKOperatorStatus = (retries: number = 5) => {
   const namespace = operatorNamespaces.RedHatIntegrationCamelK;
@@ -125,8 +130,12 @@ export const checkKnativeOperatorStatus = () => {
     ).then(function (result) {
       if (result.stdout.includes('condition met')) {
         cy.log(result.stdout);
-      } else {
-        throw new Error(result.stderr);
+      } else if (resourceName === 'KnativeServing') {
+        createKnativeServingUsingCLI();
+      } else if (resourceName === 'KnativeEventing') {
+        createKnativeEventingUsingCLI();
+      } else if (resourceName === 'KnativeKafka') {
+        createKnativeKafkaUsingCLI();
       }
     });
   };

diff --git a/frontend/packages/integration-tests-cypress/support/admin.ts b/frontend/packages/integration-tests-cypress/support/admin.ts
@@ -1,3 +1,4 @@
+import { guidedTour } from '../views/guided-tour';
 import { nav } from '../views/nav';
 
 declare global {
@@ -29,4 +30,5 @@ Cypress.Commands.add('initDeveloper', () => {
   cy.log('switched perspective to Developer');
   nav.sidenav.switcher.shouldHaveText('Developer');
   cy.log('Developer perspective confirmed ');
+  guidedTour.close();
 });
diff --git a/frontend/packages/knative-plugin/integration-tests/testData/knative-eventing.yaml b/frontend/packages/knative-plugin/integration-tests/testData/knative-eventing.yaml
@@ -1,3 +1,8 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: knative-eventing
+---
 apiVersion: operator.knative.dev/v1beta1
 kind: KnativeEventing
 metadata:

diff --git a/frontend/packages/knative-plugin/integration-tests/testData/knative-kafka.yaml b/frontend/packages/knative-plugin/integration-tests/testData/knative-kafka.yaml
@@ -11,9 +11,9 @@ spec:
       replicationFactor: 3
       bootstrapServers: REPLACE_WITH_COMMA_SEPARATED_KAFKA_BOOTSTRAP_SERVERS
   source:
-    enabled: false
+    enabled: true
   sink:
-    enabled: false
+    enabled: true
   channel:
     enabled: false
     bootstrapServers: REPLACE_WITH_COMMA_SEPARATED_KAFKA_BOOTSTRAP_SERVERS
diff --git a/frontend/packages/knative-plugin/integration-tests/testData/knative-serving.yaml b/frontend/packages/knative-plugin/integration-tests/testData/knative-serving.yaml
@@ -1,3 +1,8 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: knative-serving
+---
 kind: KnativeServing
 apiVersion: operator.knative.dev/v1beta1
 metadata: