wip

Author: williamlardier

.github/workflows/end2end.yaml

@@ -517,11 +517,24 @@ jobs:
           ZENKO_NAME: "${{ env.ZENKO_NAME }}-pra"
           SETUP_IMAGE: ${{ needs.build-setup-image.outputs.image }}
           GIT_ACCESS_TOKEN: ${{ steps.app-token.outputs.token }}
-        run: ./setup-tests.sh --kubeconfig ~/.kube/config -- all --no-kafka-topics --no-rbac --no-dns --no-mocks --no-metadata
+        run: ./setup-tests.sh --kubeconfig ~/.kube/config -- setup --locations --accounts --workflows --notifications
         working-directory: ./tests/@setup
       - name: Configure hosts file
         run: bash configure-hosts.sh
         working-directory: ./.github/scripts/end2end
+      - name: Dump setup state for PRIMARY instance
+        run: bash dump-setup-state.sh default end2end > /tmp/v2-primary-dump.txt 2>&1
+        working-directory: ./.github/scripts/end2end
+        continue-on-error: true
+      - name: Dump setup state for PRA instance
+        run: bash dump-setup-state.sh default end2end-pra > /tmp/v2-pra-dump.txt 2>&1
+        working-directory: ./.github/scripts/end2end
+        continue-on-error: true
+      - name: Show diagnostic dumps
+        run: |
+          echo "=== PRIMARY INSTANCE DUMP ===" && cat /tmp/v2-primary-dump.txt
+          echo "=== PRA INSTANCE DUMP ===" && cat /tmp/v2-pra-dump.txt
+        continue-on-error: true
       - name: Run CTST end to end tests
         env:
           E2E_CTST_IMAGE: ${{ env.E2E_CTST_IMAGE_NAME }}:${{ env.E2E_IMAGE_TAG }}
@@ -727,6 +740,13 @@ jobs:
       - name: Configure hosts file
         run: bash configure-hosts.sh
         working-directory: ./.github/scripts/end2end
+      - name: Dump setup state before tests
+        run: bash dump-setup-state.sh default end2end > /tmp/v2-ctst-sharded-dump.txt 2>&1
+        working-directory: ./.github/scripts/end2end
+        continue-on-error: true
+      - name: Show diagnostic dump
+        run: cat /tmp/v2-ctst-sharded-dump.txt
+        continue-on-error: true
       - name: Run CTST end to end tests
         env:
           E2E_CTST_IMAGE: ${{ env.E2E_CTST_IMAGE_NAME }}:${{ env.E2E_IMAGE_TAG }}

tests/@setup/src/cli.ts

@@ -40,35 +40,25 @@ program
 
 program
     .command('all')
-    .description('Run complete setup (all tasks, use --no-<task> to exclude specific tasks)')
+    .description('Run complete setup (all tasks)')
     .option('--config <path>', 'Path to setup configuration file')
     .option('--workflows-config <path>', 'Path to workflows configuration file')
     .option('--locations-config <path>', 'Path to locations configuration file')
     .option('--git-access-token <token>', 'Git access token for metadata repository')
     .option('--metadata-namespace <namespace>', 'Metadata service namespace', 'metadata')
-    .option('--no-rbac', 'Skip RBAC setup')
-    .option('--no-dns', 'Skip DNS setup')
-    .option('--no-mocks', 'Skip mock services setup')
-    .option('--no-locations', 'Skip storage locations setup')
-    .option('--no-accounts', 'Skip accounts setup')
-    .option('--no-workflows', 'Skip workflows setup')
-    .option('--no-metadata', 'Skip Metadata service setup')
-    .option('--no-kafka-topics', 'Skip Kafka topics setup')
-    .option('--no-notifications', 'Skip notifications setup')
     .action(async (options) => {
         const globalOptions = program.opts();
         await runSetup({
             ...globalOptions,
-            rbac: !options.noRbac,
-            dns: !options.noDns,
-            mocks: !options.noMocks,
-            locations: !options.noLocations,
-            accounts: !options.noAccounts,
-            workflows: !options.noWorkflows,
-            metadata: !options.noMetadata,
-            kafkaTopics: !options.noKafkaTopics,
-            notifications: !options.noNotifications,
-            ctstLocal: !options.noCtstLocal,
+            rbac: true,
+            dns: true,
+            mocks: true,
+            locations: true,
+            accounts: true,
+            workflows: true,
+            metadata: true,
+            kafkaTopics: true,
+            notifications: true,
             configFile: options.config,
             workflowsConfig: options.workflowsConfig,
             locationsConfig: options.locationsConfig,

tests/@setup/src/mocks.ts

@@ -79,6 +79,29 @@ function replaceTemplateVariables(content: string, substitutions: Record<string,
     return result;
 }
 
+/**
+ * Check if a pod already exists
+ * @param podName - Name of the pod
+ * @param namespace - Namespace of the pod
+ * @returns true if pod exists, false otherwise
+ */
+async function podExists(podName: string, namespace: string): Promise<boolean> {
+    const core = KubernetesHelper.getClientCore();
+    if (!core) {
+        throw new Error('KubernetesHelper not initialized');
+    }
+
+    try {
+        await core.readNamespacedPod({ name: podName, namespace });
+        return true;
+    } catch (error: any) {
+        if (error.statusCode === 404) {
+            return false;
+        }
+        throw error;
+    }
+}
+
 /**
  * Load and apply a multi-document YAML manifest with template substitution
  * @param yamlPath - Path to the YAML file (can contain multiple documents separated by ---)
@@ -113,7 +136,11 @@ async function applyYamlManifests(yamlPath: string, substitutions: Record<string
                 await KubernetesHelper.applyService(manifest, namespace);
                 break;
             case 'Pod':
-                await KubernetesHelper.applyPod(manifest, namespace);
+                if (await podExists(name, namespace)) {
+                    logger.warn(`Pod ${name} already exists, skipping creation`);
+                } else {
+                    await KubernetesHelper.applyPod(manifest, namespace);
+                }
                 break;
             case 'Ingress':
                 await KubernetesHelper.applyIngress(manifest, namespace);

tests/ctst/features/0-diagnostics.feature

@@ -0,0 +1,9 @@
+@Diagnostics
+Feature: Diagnostic dumps for debugging setup issues
+
+    @2.6.0
+    @PreMerge
+    @DiagnosticDump
+    Scenario: Dump complete CTST world state
+        Given DIAGNOSTIC: dump complete world state
+