ci: remove integration test (--test-it) infrastructure from deploy-camunda CLI and CI workflows

eamonnmoloney · eamonnmoloney · commit 5d1f4379f58f · 2026-05-01T04:07:45.000Z
The IT test runner was built into the Helm repo but is no longer used — all post-deployment testing now goes through E2E/Playwright. This removes: - --test-it CLI flag and TestIT/RunIntegrationTests config fields - SkipIT from CIScenario and matrix Entry structs - skip-it workflow inputs from all CI workflow templates - skip-it entries from ci-test-config.yaml (8.7–8.10) - skipIT handling from generate-chart-matrix.sh - IT log file creation in the matrix runner Closes #5764
diff --git a/.github/workflows/test-chart-version-template.yaml b/.github/workflows/test-chart-version-template.yaml
@@ -117,11 +117,6 @@ on:
         required: false
         default: false
         type: boolean
-      skip-it:
-        description: "Skip integration (Playwright IT) tests for this scenario"
-        required: false
-        default: false
-        type: boolean
 
 concurrency:
   group: ${{ github.workflow }}-${{ inputs.pr-number }}-${{ inputs.shortname }}-${{ inputs.flows }}-${{ inputs.camunda-version }}-${{ inputs.auth }}-${{ inputs.flows }}-${{ inputs.exclude }}-${{ inputs.platforms }}-${{ github.ref_name || github.ref }}
@@ -187,7 +182,6 @@ jobs:
       test-qa: ${{ inputs.test-qa }}
       test-upgrade: ${{ inputs.test-upgrade }}
       skip-e2e: ${{ inputs.skip-e2e }}
-      skip-it: ${{ inputs.skip-it }}
       vault-secret-mapping: |
         secret/data/products/distribution/ci ENTRA_APP_CLIENT_ID;
         secret/data/products/distribution/ci ENTRA_APP_CLIENT_SECRET;
diff --git a/.github/workflows/test-chart-version.yaml b/.github/workflows/test-chart-version.yaml
@@ -220,4 +220,3 @@ jobs:
       test-qa: ${{ matrix.qa == 'true' }}
       test-upgrade: ${{ matrix.upgrade == 'true' }}
       skip-e2e: ${{ matrix.skipE2E == 'true' }}
-      skip-it: ${{ matrix.skipIT == 'true' }}
diff --git a/.github/workflows/test-integration-runner.yaml b/.github/workflows/test-integration-runner.yaml
@@ -139,11 +139,6 @@ on:
         required: false
         default: false
         type: boolean
-      skip-it:
-        description: "Skip integration (Playwright IT) tests for this scenario (declared in ci-test-config.yaml)"
-        required: false
-        default: false
-        type: boolean
       camunda-helm-post-render:
         description: Set to true if you would like to run the post-renderer script for OpenShift
         required: false
diff --git a/.github/workflows/test-integration-template.yaml b/.github/workflows/test-integration-template.yaml
@@ -130,11 +130,6 @@ on:
         required: false
         default: false
         type: boolean
-      skip-it:
-        description: "Skip integration (Playwright IT) tests for this scenario"
-        required: false
-        default: false
-        type: boolean
       shortname:
         required: false
         default: "es"
@@ -353,7 +348,6 @@ jobs:
       test-qa: ${{ inputs.test-qa }}
       test-upgrade: ${{ inputs.test-upgrade }}
       skip-e2e: ${{ inputs.skip-e2e }}
-      skip-it: ${{ inputs.skip-it }}
       camunda-helm-post-render: ${{ inputs.camunda-helm-post-render }}
       camunda-helm-credentials-source: ${{ inputs.camunda-helm-credentials-source }}
       run-all-e2e-tests: ${{ inputs.run-all-e2e-tests }}
diff --git a/charts/camunda-platform-8.10/test/ci-test-config.yaml b/charts/camunda-platform-8.10/test/ci-test-config.yaml
@@ -99,7 +99,6 @@ integration:
           auth: oidc
           flow: upgrade-minor
           skip-e2e: true  # OIDC auth incompatible with Keycloak-dependent smoke tests
-          skip-it: true   # OIDC ITs require Entra setup that returns 401
           infra-type:
             gke: distroci
             eks: preemptible
@@ -188,7 +187,6 @@ integration:
           exclude: []
           flow: install
           skip-e2e: true  # No Elasticsearch means no secondary storage for E2E tests
-          skip-it: true   # Integration tests require Elasticsearch
           identity: keycloak
           persistence: no-elasticsearch
           features: [no-secondary-storage]
diff --git a/charts/camunda-platform-8.7/test/ci-test-config.yaml b/charts/camunda-platform-8.7/test/ci-test-config.yaml
@@ -67,7 +67,6 @@ integration:
           persistence: elasticsearch
           flow: install,upgrade-patch
           skip-e2e: true  # 8.7 web-modeler-restapi bug + OIDC incompatible with Keycloak-dependent smoke tests
-          skip-it: true   # OIDC ITs require Entra setup that returns 401
           infra-type:
             gke: distroci
             eks: preemptible
diff --git a/charts/camunda-platform-8.8/test/ci-test-config.yaml b/charts/camunda-platform-8.8/test/ci-test-config.yaml
@@ -62,7 +62,6 @@ integration:
           auth: oidc
           flow: install,upgrade-minor
           skip-e2e: true  # OIDC auth incompatible with Keycloak-dependent smoke tests
-          skip-it: true   # OIDC ITs require Entra setup that returns 401
           infra-type:
             gke: distroci
             eks: preemptible
diff --git a/charts/camunda-platform-8.9/test/ci-test-config.yaml b/charts/camunda-platform-8.9/test/ci-test-config.yaml
@@ -100,7 +100,6 @@ integration:
           auth: oidc
           flow: install,upgrade-minor
           skip-e2e: true  # OIDC auth incompatible with Keycloak-dependent smoke tests
-          skip-it: true   # OIDC ITs require Entra setup that returns 401
           infra-type:
             gke: distroci
             eks: preemptible
@@ -177,7 +176,6 @@ integration:
           exclude: []
           flow: install
           skip-e2e: true  # No Elasticsearch means no secondary storage for E2E tests
-          skip-it: true   # Integration tests require Elasticsearch
           identity: keycloak
           persistence: no-elasticsearch
           features: [no-secondary-storage]
diff --git a/scripts/deploy-camunda/cmd/matrix.go b/scripts/deploy-camunda/cmd/matrix.go
@@ -139,7 +139,6 @@ func newMatrixRunCommand() *cobra.Command {
 		repoRoot                 string
 		dryRun                   bool
 		coverage                 bool
-		testIT                   bool
 		testE2E                  bool
 		testAll                  bool
 		stopOnFailure            bool
@@ -265,7 +264,6 @@ This command calls deploy.Execute() for each matrix entry.`,
 					SkipDependencyUpdate: &skipDependencyUpdate,
 					HelmTimeout:          &helmTimeout,
 					// Tests
-					TestIT:  &testIT,
 					TestE2E: &testE2E,
 					TestAll: &testAll,
 					// Kube contexts
@@ -450,7 +448,6 @@ This command calls deploy.Execute() for each matrix entry.`,
 				NamespacePrefix:       namespacePrefix,
 				Platform:              platform,
 				MaxParallel:           maxParallel,
-				TestIT:                testIT,
 				TestE2E:               testE2E,
 				TestAll:               testAll,
 				RepoRoot:              repoRoot,
@@ -524,9 +521,8 @@ This command calls deploy.Execute() for each matrix entry.`,
 	f.StringVar(&repoRoot, "repo-root", "", "Repository root path (or set repoRoot in config)")
 	f.BoolVar(&dryRun, "dry-run", false, "Log what would be deployed without actually deploying")
 	f.BoolVar(&coverage, "coverage", false, "Show a layer-breakdown report of what is tested in the matrix (no deployment)")
-	f.BoolVar(&testIT, "test-it", false, "Run integration tests after each deployment")
 	f.BoolVar(&testE2E, "test-e2e", false, "Run e2e tests after each deployment")
-	f.BoolVar(&testAll, "test-all", false, "Run both integration and e2e tests after each deployment")
+	f.BoolVar(&testAll, "test-all", false, "Run all e2e tests after each deployment")
 	f.BoolVar(&stopOnFailure, "stop-on-failure", false, "Stop the run on the first failure")
 	f.StringVar(&namespacePrefix, "namespace-prefix", "matrix", "Prefix for generated namespaces")
 	f.BoolVar(&cleanup, "cleanup", false, "Delete each entry's namespace after its deployment and tests complete")
diff --git a/scripts/deploy-camunda/cmd/root.go b/scripts/deploy-camunda/cmd/root.go
@@ -233,9 +233,8 @@ func NewRootCommand() *cobra.Command {
 	f.StringVar(&flags.Test.OutputTestEnvPath, "output-test-env-path", ".env.test", "Path for the test .env file output (for multi-scenario: used as base, e.g., .env.test.{scenario})")
 
 	// Test execution flags
-	f.BoolVar(&flags.Test.RunIntegrationTests, "test-it", false, "Run integration tests after deployment")
 	f.BoolVar(&flags.Test.RunE2ETests, "test-e2e", false, "Run e2e tests after deployment")
-	f.BoolVar(&flags.Test.RunAllTests, "test-all", false, "Run both integration and e2e tests after deployment")
+	f.BoolVar(&flags.Test.RunAllTests, "test-all", false, "Run all e2e tests after deployment")
 	f.StringVar(&flags.Test.KubeContext, "kube-context", "", "Kubernetes context to use for deployment")
 	f.StringVar(&flags.Test.TestExclude, "test-exclude", "", "Pipe-separated regex of test suites to exclude (passed as --grep-invert to Playwright)")
 	f.BoolVar(&flags.Secrets.UseVaultBackedSecrets, "use-vault-backed-secrets", false, "Use vault-backed external secrets (selects -vault.yaml suffix files)")
diff --git a/scripts/deploy-camunda/config/config.go b/scripts/deploy-camunda/config/config.go
@@ -89,7 +89,6 @@ type DeploySpecConfig struct {
 	ExtraValues              []string `mapstructure:"extraValues" yaml:"extraValues,omitempty"`
 	ScenarioRoot             string   `mapstructure:"scenarioRoot" yaml:"scenarioRoot,omitempty"`
 	ValuesPreset             string   `mapstructure:"valuesPreset" yaml:"valuesPreset,omitempty"`
-	RunIntegrationTests      *bool    `mapstructure:"runIntegrationTests" yaml:"runIntegrationTests,omitempty"`
 	RunE2ETests              *bool    `mapstructure:"runE2ETests" yaml:"runE2ETests,omitempty"`
 
 	// Selection + composition model fields (alternative to Scenario)
@@ -126,7 +125,6 @@ type MatrixConfig struct {
 	HelmTimeout   *int  `mapstructure:"helmTimeout" yaml:"helmTimeout,omitempty"`
 
 	// Tests
-	TestIT  *bool `mapstructure:"testIT" yaml:"testIT,omitempty"`
 	TestE2E *bool `mapstructure:"testE2E" yaml:"testE2E,omitempty"`
 	TestAll *bool `mapstructure:"testAll" yaml:"testAll,omitempty"`
 
@@ -470,10 +468,6 @@ func applyMatrixEnvOverrides(m *MatrixConfig, get func(string) string) {
 	if v := get("CAMUNDA_MATRIX_UPGRADE_FROM_VERSION"); v != "" {
 		m.UpgradeFromVersion = v
 	}
-	if v := get("CAMUNDA_MATRIX_TEST_IT"); v != "" {
-		b := parseBool(v)
-		m.TestIT = &b
-	}
 	if v := get("CAMUNDA_MATRIX_TEST_E2E"); v != "" {
 		b := parseBool(v)
 		m.TestE2E = &b
diff --git a/scripts/deploy-camunda/config/matrix_merge.go b/scripts/deploy-camunda/config/matrix_merge.go
@@ -91,7 +91,6 @@ type MatrixRunFlags struct {
 	HelmTimeout          *int
 
 	// Tests
-	TestIT  *bool
 	TestE2E *bool
 	TestAll *bool
 
@@ -175,7 +174,6 @@ func ApplyMatrixRunConfig(rc *RootConfig, changedFlags map[string]bool, f *Matri
 	MergeStringField(f.LogLevel, m.LogLevel, rc.LogLevel, changedFlags, "log-level")
 
 	// --- Tests ---
-	MergeBoolField(f.TestIT, m.TestIT, nil, changedFlags, "test-it")
 	MergeBoolField(f.TestE2E, m.TestE2E, nil, changedFlags, "test-e2e")
 	MergeBoolField(f.TestAll, m.TestAll, nil, changedFlags, "test-all")
 
diff --git a/scripts/deploy-camunda/config/merge.go b/scripts/deploy-camunda/config/merge.go
@@ -111,13 +111,12 @@ type DebugFlags struct {
 
 // TestFlags holds test execution configuration.
 type TestFlags struct {
-	RunIntegrationTests bool   // Run integration tests after deployment
-	RunE2ETests         bool   // Run e2e tests after deployment
-	RunAllTests         bool   // Run both integration and e2e tests after deployment
-	TestExclude         string // Pipe-separated regex for test suites to exclude (passed as --grep-invert to Playwright)
-	OutputTestEnv       bool   // Generate .env file for E2E tests after deployment
-	OutputTestEnvPath   string // Path for the test .env file output
-	KubeContext         string
+	RunE2ETests   bool   // Run e2e tests after deployment
+	RunAllTests   bool   // Run all e2e tests after deployment
+	TestExclude   string // Pipe-separated regex for test suites to exclude (passed as --grep-invert to Playwright)
+	OutputTestEnv bool   // Generate .env file for E2E tests after deployment
+	OutputTestEnvPath string // Path for the test .env file output
+	KubeContext   string
 }
 
 // SelectionFlags holds selection + composition model flags.
@@ -215,10 +214,6 @@ type RuntimeFlags struct {
 	// show fine-grained progress. Nil disables the callback.
 	OnPhase func(phase string)
 
-	// ITOutputWriter, when non-nil, replaces os.Stdout/os.Stderr for
-	// integration test script output. Used by the matrix runner to redirect
-	// IT output to a per-entry log file instead of polluting the terminal.
-	ITOutputWriter io.Writer
 	// E2EOutputWriter, when non-nil, replaces os.Stdout/os.Stderr for
 	// e2e test script output. Used by the matrix runner to redirect
 	// e2e output to a per-entry log file instead of polluting the terminal.
@@ -331,7 +326,6 @@ func ApplyActiveDeployment(rc *RootConfig, active string, flags *RuntimeFlags) e
 	MergeBoolField(&flags.Deployment.RenderTemplates, dep.RenderTemplates, rc.RenderTemplates, changed, "render-templates")
 
 	// Test execution flags
-	MergeBoolField(&flags.Test.RunIntegrationTests, dep.RunIntegrationTests, rc.RunIntegrationTests, changed, "test-it")
 	MergeBoolField(&flags.Test.RunE2ETests, dep.RunE2ETests, rc.RunE2ETests, changed, "test-e2e")
 
 	// Selection + composition model fields
@@ -412,7 +406,6 @@ func applyRootDefaults(rc *RootConfig, flags *RuntimeFlags) error {
 	MergeBoolField(&flags.Deployment.RenderTemplates, nil, rc.RenderTemplates, changed, "render-templates")
 
 	// Test execution flags
-	MergeBoolField(&flags.Test.RunIntegrationTests, nil, rc.RunIntegrationTests, changed, "test-it")
 	MergeBoolField(&flags.Test.RunE2ETests, nil, rc.RunE2ETests, changed, "test-e2e")
 
 	// Selection + composition model fields
diff --git a/scripts/deploy-camunda/deploy/test.go b/scripts/deploy-camunda/deploy/test.go
@@ -33,13 +33,12 @@ func (e *TestError) Unwrap() error {
 
 // TestResult holds the result of a test execution.
 type TestResult struct {
-	Type   string // "integration" or "e2e"
+	Type   string // "e2e"
 	Error  error
 	Output string // Captured stdout+stderr from the test script.
 }
 
 // RunTests executes tests after deployment based on flags.
-// Tests are run in parallel if both --test-it and --test-e2e (or --test-all) are specified.
 //
 // On failure, the returned error is a *TestError containing the captured output
 // from the test scripts. Callers can use errors.As to extract it.
@@ -61,7 +60,7 @@ func RunTests(ctx context.Context, flags *config.RuntimeFlags, namespace string)
 
 	// Bound total post-deployment test runtime so matrix entries cannot hang
 	// indefinitely after Helm has already completed.
-	// Keep this well above Helm timeout because integration tests (DNS + ingress
+	// Keep this well above Helm timeout because e2e tests (DNS + ingress
 	// readiness + Playwright retries) can legitimately run much longer on
 	// upgrade-minor flows for 8.9.
 	testTimeout := 30 * time.Minute
@@ -280,7 +279,7 @@ func findRepoRoot(chartPath string) string {
 		}
 
 		// Check for scripts directory (specific to this repo)
-		if _, err := os.Stat(filepath.Join(dir, "scripts", "run-integration-tests.sh")); err == nil {
+		if _, err := os.Stat(filepath.Join(dir, "scripts", "run-e2e-tests.sh")); err == nil {
 			return dir
 		}
 
diff --git a/scripts/deploy-camunda/matrix/config.go b/scripts/deploy-camunda/matrix/config.go
@@ -92,7 +92,6 @@ type CIScenario struct {
 	// When set, these prevent the corresponding test types from running for this scenario,
 	// replacing hardcoded shortname-based skip logic in both the Go CLI and GHA workflows.
 	SkipE2E bool `yaml:"skip-e2e,omitempty"`
-	SkipIT  bool `yaml:"skip-it,omitempty"`
 }
 
 // LoadCITestConfig reads and parses the ci-test-config.yaml for a given chart directory.
diff --git a/scripts/deploy-camunda/matrix/matrix.go b/scripts/deploy-camunda/matrix/matrix.go
@@ -37,7 +37,6 @@ type Entry struct {
 
 	// Test skip flags — declarative controls from ci-test-config.yaml.
 	SkipE2E bool `json:"skipE2E,omitempty"`
-	SkipIT  bool `json:"skipIT,omitempty"`
 }
 
 // GenerateOptions controls matrix generation.
@@ -173,7 +172,6 @@ func Generate(repoRoot string, opts GenerateOptions) ([]Entry, error) {
 						Upgrade:     scenario.Upgrade,
 						Enterprise:  scenario.Enterprise,
 						SkipE2E:     scenario.SkipE2E,
-						SkipIT:      scenario.SkipIT,
 					})
 				}
 			}
diff --git a/scripts/deploy-camunda/matrix/runner.go b/scripts/deploy-camunda/matrix/runner.go
@@ -65,11 +65,9 @@ type RunOptions struct {
 	// 0 or 1 means sequential execution (default). Values > 1 enable parallel execution
 	// with at most MaxParallel entries running simultaneously.
 	MaxParallel int
-	// TestIT runs integration tests after each deployment.
-	TestIT bool
 	// TestE2E runs e2e tests after each deployment.
 	TestE2E bool
-	// TestAll runs both integration and e2e tests after each deployment.
+	// TestAll runs all e2e tests after each deployment.
 	TestAll bool
 	// RepoRoot is the repository root path.
 	RepoRoot string
@@ -1467,14 +1465,13 @@ func executeEntry(ctx context.Context, entry Entry, opts RunOptions, entryIndex
 			UseVaultBackedSecrets: useVault,
 		},
 		Test: config.TestFlags{
-			KubeContext:         kubeCtx,
-			TestExclude:         testExclude,
-			RunIntegrationTests: (opts.TestIT || opts.TestAll) && !entry.SkipIT,
-			RunE2ETests:         (opts.TestE2E || opts.TestAll) && !entry.SkipE2E,
-			// Do NOT propagate RunAllTests here — RunE2ETests/RunIntegrationTests already
-			// encode the full decision (including skip-e2e/skip-it from ci-test-config.yaml).
-			// Setting RunAllTests would bypass the skip logic in deploy/test.go which ORs
-			// RunAllTests with each individual flag.
+			KubeContext: kubeCtx,
+			TestExclude: testExclude,
+			RunE2ETests: (opts.TestE2E || opts.TestAll) && !entry.SkipE2E,
+			// Do NOT propagate RunAllTests here — RunE2ETests already encodes
+			// the full decision (including skip-e2e from ci-test-config.yaml).
+			// Setting RunAllTests would bypass the skip logic in deploy/test.go
+			// which ORs RunAllTests with RunE2ETests.
 			RunAllTests: false,
 		},
 		// Selection + Composition: pass explicit layer overrides from ci-test-config.yaml.
@@ -1505,12 +1502,6 @@ func executeEntry(ctx context.Context, entry Entry, opts RunOptions, entryIndex
 	// This keeps output out of the terminal so the status table stays clean.
 	if opts.LogDir != "" {
 		baseName := entryLogFileName(entry)
-		if itFile, err := os.Create(filepath.Join(opts.LogDir, baseName+".it.log")); err != nil {
-			logging.Logger.Warn().Err(err).Msg("Failed to create IT log file, output will go to terminal")
-		} else {
-			defer itFile.Close()
-			flags.ITOutputWriter = itFile
-		}
 		if e2eFile, err := os.Create(filepath.Join(opts.LogDir, baseName+".e2e.log")); err != nil {
 			logging.Logger.Warn().Err(err).Msg("Failed to create e2e log file, output will go to terminal")
 		} else {
@@ -1883,8 +1874,7 @@ func executeTwoStepUpgrade(ctx context.Context, entry Entry, flags *config.Runti
 	step1Flags.Selection.UpgradeFlow = false     // Step 1 is a fresh install, no base-upgrade.yaml.
 	step1Flags.Chart.ChartRootOverlays = nil     // Step 1 installs old version from repo — no chart-root overlays.
 	step1Flags.Chart.SkipDependencyUpdate = true // Repo charts don't need local dep update.
-	step1Flags.Test.RunIntegrationTests = false  // Don't run tests after Step 1.
-	step1Flags.Test.RunE2ETests = false
+	step1Flags.Test.RunE2ETests = false          // Don't run tests after Step 1.
 	step1Flags.Test.RunAllTests = false
 	step1Flags.Deployment.DeleteNamespaceFirst = flags.Deployment.DeleteNamespaceFirst // Only delete on Step 1.
 
diff --git a/scripts/generate-chart-matrix.sh b/scripts/generate-chart-matrix.sh
@@ -213,9 +213,7 @@ write_matrix_entry() {
         echo "    qa: ${qa}" >> matrix_versions.txt
         echo "    upgrade: ${upgrade}" >> matrix_versions.txt
         skip_e2e=$(echo "$prScenario" | yq e -r '.skip-e2e // false' -)
-        skip_it=$(echo "$prScenario" | yq e -r '.skip-it // false' -)
         echo "    skipE2E: ${skip_e2e}" >> matrix_versions.txt
-        echo "    skipIT: ${skip_it}" >> matrix_versions.txt
       done
     done
     sed -i -e '$s/,$/]\n/' matrix_versions.txt
