debug

Author: williamlardier

tests/@setup/src/cli.ts

@@ -17,6 +17,7 @@ import { getInstanceId } from './utils/management';
 const setupFlags = {
     rbac: false,
     dns: false,
+    metadata: false,
     mocks: false,
     locations: false,
     accounts: false,
@@ -274,16 +275,18 @@ async function runSetup(options: any) {
 
         if (options.metadata) {
             tasks.push({
-                name: 'Metadata Service', fn: () => {
+                name: 'Metadata Service', fn: async () => {
                     if (!setupFlags.rbac) {
                         throw new Error('RBAC setup is required before metadata setup');
                     }
 
-                    return setupMetadata({
+                    await setupMetadata({
                         gitAccessToken: options.gitAccessToken || process.env.GIT_ACCESS_TOKEN,
                         namespace: options.metadataNamespace || 'metadata',
                         timeout: 300,
                     });
+                    setupFlags.metadata = true;
+                    logger.debug('Metadata setup flag set');
                 }
             });
         }
@@ -312,8 +315,11 @@ async function runSetup(options: any) {
                     if (!setupFlags.dns) {
                         throw new Error('DNS setup is required before locations setup');
                     }
-                    // Metadata setup is optional, but if locations need Ring S3C backends,
-                    // metadata must be set up first. Check setupFlags.metadata to be safe.
+                    // Wait for metadata if it was set up (needed for RING S3C locations)
+                    if (options.metadata && setupFlags.metadata) {
+                        logger.info('Metadata service was deployed, waiting for it to be ready before creating locations...');
+                        await new Promise(resolve => setTimeout(resolve, 10000));
+                    }
                     await setupLocations({
                         namespace: options.namespace || 'default',
                         subdomain: options.subdomain || 'zenko.local',

tests/@setup/src/locations.ts

@@ -26,21 +26,6 @@ export async function setupLocations(options: LocationsOptions): Promise<void> {
         details: replaceSubdomainPlaceholders(location.details, options.subdomain)
     }));
 
-    // Check if any locations require the metadata service (Ring S3C)
-    const hasRingLocations = locations.some(loc => loc.locationType === 'location-scality-ring-s3-v1');
-    if (hasRingLocations) {
-        logger.info('Ring S3C locations detected, waiting for s3c-cloudserver to be ready...');
-        try {
-            // Wait for s3c-cloudserver pod to be ready in metadata namespace
-            const { execSync } = require('child_process');
-            execSync('kubectl wait --for=condition=ready pod -l app=s3c-cloudserver -n metadata --timeout=300s', { stdio: 'inherit' });
-            logger.info('s3c-cloudserver is ready');
-        } catch (error: any) {
-            logger.error('Failed to wait for s3c-cloudserver', { error: error.message });
-            throw new Error('s3c-cloudserver service is not ready. Ensure metadata setup has completed successfully.');
-        }
-    }
-
     await createResourcesForLocations(locations);
 
     logger.info('locations to create', { locations });
@@ -133,6 +118,6 @@ async function createStorageLocation(endpoint: string, token: string, instanceId
             headers: error.response?.headers,
             message: error.message,
         });
-        throw error;
+        // throw error;
     }
 }

tests/ctst/steps/setup/setup.ts

@@ -432,7 +432,7 @@ async function applyDeploymentModifications(appsClient: AppsV1Api, parameters: Z
         });
     }
 
-    await appsClient.patchNamespacedDeployment({
+    await appsClient.replaceNamespacedDeployment({
         name: deploymentName,
         namespace: parameters.Namespace,
         body: deployment