Provision only SKR in SKR suspension test

kyma-project · Dec 4, 2024 · b0b8156 · b0b8156
1 parent a28f99e
commit b0b8156
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 21 deletions.
diff --git a/testing/e2e/skr/kyma-environment-broker/helpers.js b/testing/e2e/skr/kyma-environment-broker/helpers.js
@@ -6,7 +6,6 @@ const os = require('os');
 async function provisionSKR(
     keb,
     kcp,
-    gardener,
     instanceID,
     name,
     platformCreds,
@@ -32,20 +31,6 @@ async function provisionSKR(
   const runtimeStatus = await kcp.getRuntimeStatusOperations(instanceID);
   const objRuntimeStatus = JSON.parse(runtimeStatus);
   expect(objRuntimeStatus).to.have.nested.property('data[0].shootName').not.empty;
-  let shoot;
-  if (process.env['GARDENER_KUBECONFIG']) {
-    debug('Fetching shoot info from gardener...');
-    shoot = await gardener.getShoot(objRuntimeStatus.data[0].shootName);
-    debug(`Compass ID ${shoot.compassID}`);
-  } else {
-    debug('Fetching shoot info using kcp cli...');
-    shoot = await getShoot(kcp, objRuntimeStatus.data[0].shootName);
-  }
-
-  return {
-    operationID,
-    shoot,
-  };
 }
 
 async function getShoot(kcp, shootName) {

diff --git a/testing/e2e/skr/skr-test/provision/provision-skr.js b/testing/e2e/skr/skr-test/provision/provision-skr.js
@@ -14,7 +14,20 @@ const {getSecret} = require('../../utils');
 
 async function provisionSKRAndInitK8sConfig(options, provisioningTimeout) {
   console.log('Provisioning new SKR instance...');
-  const shoot = await provisionSKRInstance(options, provisioningTimeout);
+  await provisionSKRInstance(options, provisioningTimeout);
+
+  const runtimeStatus = await kcp.getRuntimeStatusOperations(options.instanceID);
+  const objRuntimeStatus = JSON.parse(runtimeStatus);
+  expect(objRuntimeStatus).to.have.nested.property('data[0].shootName').not.empty;
+  let shoot;
+  if (process.env['GARDENER_KUBECONFIG']) {
+    debug('Fetching shoot info from gardener...');
+    shoot = await gardener.getShoot(objRuntimeStatus.data[0].shootName);
+    debug(`Compass ID ${shoot.compassID}`);
+  } else {
+    debug('Fetching shoot info using kcp cli...');
+    shoot = await getShoot(kcp, objRuntimeStatus.data[0].shootName);
+  }
 
   if (process.env['GARDENER_KUBECONFIG']) {
     console.log('Initiating K8s config...');
@@ -56,8 +69,8 @@ async function provisionSKRInstance(options, timeout) {
     console.log(`\nInstanceID ${options.instanceID}`,
         `Runtime ${options.runtimeName}`, `Application ${options.appName}`, `Suffix ${options.suffix}`);
 
-    const skr = await provisionSKR(keb,
-        kcp, gardener,
+    await provisionSKR(keb,
+        kcp,
         options.instanceID,
         options.runtimeName,
         null,
@@ -66,7 +79,6 @@ async function provisionSKRInstance(options, timeout) {
         timeout);
 
     debug('SKR is provisioned!');
-    return skr.shoot;
   } catch (e) {
     throw new Error(`Provisioning failed: ${e.toString(), e.stack}`);
   } finally {

diff --git a/testing/e2e/skr/trial-suspension-test/test.js b/testing/e2e/skr/trial-suspension-test/test.js
@@ -1,7 +1,7 @@
 const {KCPWrapper, KCPConfig} = require('../kcp/client');
 const {KEBClient, KEBConfig} = require('../kyma-environment-broker');
 const {gatherOptions} = require('../skr-test/helpers');
-const {provisionSKRAndInitK8sConfig} = require('../skr-test/provision/provision-skr');
+const {provisionSKRInstance} = require('../skr-test/provision/provision-skr');
 const {deprovisionAndUnregisterSKR} = require('../skr-test/provision/deprovision-skr');
 const {debug} = require('../utils');
 const {assert} = require('chai');
@@ -31,7 +31,7 @@ describe('SKR Trial suspension test', function() {
 
   before('Ensure SKR Trial is provisioned', async function() {
     try {
-      await callFuncAndPrintExecutionTime(provisionSKRAndInitK8sConfig, [options, provisioningTimeout]);
+      await callFuncAndPrintExecutionTime(provisionSKRInstance, [options, provisioningTimeout]);
     } catch (e) {
       throw new Error(`${e.toString()}\n`);
     }