From 7df2db83b4fa991bad57dcb3ad5bc56b77ef118a Mon Sep 17 00:00:00 2001 From: Ankush Kumar Garg Date: Wed, 30 Sep 2026 14:50:46 +0530 Subject: [PATCH 1/5] fix --- .../test/java/integration/com/sap/cds/sdm/utils/cf-subscribe.sh | 2 +- .../java/integration/com/sap/cds/sdm/utils/cf-unsubscribe.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdm/src/test/java/integration/com/sap/cds/sdm/utils/cf-subscribe.sh b/sdm/src/test/java/integration/com/sap/cds/sdm/utils/cf-subscribe.sh index 7454d1a7..0ab6a7fc 100755 --- a/sdm/src/test/java/integration/com/sap/cds/sdm/utils/cf-subscribe.sh +++ b/sdm/src/test/java/integration/com/sap/cds/sdm/utils/cf-subscribe.sh @@ -28,7 +28,7 @@ load_props "$CONFIG_FILE" # --- Resolve tenant-specific subaccount via ACTIVE_TENANT env var (1 or 2) --- TENANT_SUFFIX="${ACTIVE_TENANT:-1}" SUBACCOUNT_VAR="consumerSubaccountIdMT${TENANT_SUFFIX}" -consumerSubaccountIdMT="${!SUBACCOUNT_VAR}" +consumerSubaccountIdMT="${!SUBACCOUNT_VAR:-}" # --- Resolve consumer credentials --- CONSUMER_USER="${username}" diff --git a/sdm/src/test/java/integration/com/sap/cds/sdm/utils/cf-unsubscribe.sh b/sdm/src/test/java/integration/com/sap/cds/sdm/utils/cf-unsubscribe.sh index bb17edc4..7f9bf20f 100755 --- a/sdm/src/test/java/integration/com/sap/cds/sdm/utils/cf-unsubscribe.sh +++ b/sdm/src/test/java/integration/com/sap/cds/sdm/utils/cf-unsubscribe.sh @@ -28,7 +28,7 @@ load_props "$CONFIG_FILE" # --- Resolve tenant-specific subaccount via ACTIVE_TENANT env var (1 or 2) --- TENANT_SUFFIX="${ACTIVE_TENANT:-1}" SUBACCOUNT_VAR="consumerSubaccountIdMT${TENANT_SUFFIX}" -consumerSubaccountIdMT="${!SUBACCOUNT_VAR}" +consumerSubaccountIdMT="${!SUBACCOUNT_VAR:-}" # --- Resolve consumer credentials --- CONSUMER_USER="${username}" From 6810ba5af88357351bfa738b01f2fb6b2deae3a9 Mon Sep 17 00:00:00 2001 From: Ankush Kumar Garg Date: Thu, 1 Oct 2026 10:13:44 +0530 Subject: [PATCH 2/5] Update multi tenancy_Integration.yml --- .../workflows/multi tenancy_Integration.yml | 27 +++++++++---------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/.github/workflows/multi tenancy_Integration.yml b/.github/workflows/multi tenancy_Integration.yml index 9320595f..cd9e9234 100644 --- a/.github/workflows/multi tenancy_Integration.yml +++ b/.github/workflows/multi tenancy_Integration.yml @@ -17,6 +17,7 @@ on: jobs: # Parallel integration tests using matrix strategy integration-test: + if: false environment: dev runs-on: ubuntu-latest strategy: @@ -352,6 +353,7 @@ jobs: # Active-entity tests run serially in their own slot AFTER integration-test to avoid # fixture-collision with sibling matrix entries (all touch the same Books/author='author' rows). active-entity-test: + if: false environment: dev runs-on: ubuntu-latest needs: integration-test @@ -663,6 +665,7 @@ jobs: # Single-job setup: switch CF app to versioned repo BEFORE matrix tests run. # Avoids race condition where parallel matrix entries try to restage the same app simultaneously. versioned-setup: + if: false environment: dev runs-on: ubuntu-latest needs: active-entity-test @@ -741,6 +744,7 @@ jobs: # Versioned tests run in parallel against the already-switched repo # Skipped if integration-test or versioned-setup fails versioned-test: + if: false environment: dev runs-on: ubuntu-latest needs: versioned-setup @@ -1005,6 +1009,7 @@ jobs: # Single-job setup: switch CF app to virus scan repo BEFORE matrix tests run. # Avoids race condition where parallel matrix entries try to restage the same app simultaneously. virusscan-setup: + if: false environment: dev runs-on: ubuntu-latest needs: versioned-test @@ -1083,6 +1088,7 @@ jobs: # Virus scan tests run in parallel against the already-switched repo # Skipped if versioned-test or virusscan-setup fails virusscan-test: + if: false environment: dev runs-on: ubuntu-latest needs: virusscan-setup @@ -1360,6 +1366,7 @@ jobs: # Revert repository to default after virus scan tests # Runs if either setup job actually switched the repo (i.e. didn't get skipped) virusscan-cleanup: + if: false environment: dev runs-on: ubuntu-latest needs: [versioned-setup, versioned-test, virusscan-setup, virusscan-test] @@ -1433,10 +1440,10 @@ jobs: # Repo-specific tests run one at a time (max-parallel: 1) so each shows individually in UI # DISABLED: set if to true to re-enable repospecific-test: + if: false environment: dev runs-on: ubuntu-latest needs: [virusscan-test, virusscan-cleanup] - if: false strategy: fail-fast: false max-parallel: 1 @@ -1701,7 +1708,6 @@ jobs: subscription-test: environment: dev runs-on: ubuntu-latest - needs: [virusscan-test, virusscan-cleanup] strategy: fail-fast: false max-parallel: 1 @@ -2002,24 +2008,15 @@ jobs: test-summary: environment: dev runs-on: ubuntu-latest - needs: [integration-test, active-entity-test, versioned-test, virusscan-test, virusscan-cleanup, repospecific-test, subscription-test] + needs: [subscription-test] if: "!cancelled()" steps: - name: Check test results 📋 run: | - echo "Integration test: ${{ needs.integration-test.result }}" - echo "Active entity test: ${{ needs.active-entity-test.result }}" - echo "Versioned test: ${{ needs.versioned-test.result }}" - echo "Virus scan test: ${{ needs.virusscan-test.result }}" - echo "Repo-specific test: ${{ needs.repospecific-test.result }} (disabled is OK)" echo "Subscription test: ${{ needs.subscription-test.result }}" - if [ "${{ needs.integration-test.result }}" == "success" ] && \ - [ "${{ needs.active-entity-test.result }}" == "success" ] && \ - [ "${{ needs.versioned-test.result }}" == "success" ] && \ - [ "${{ needs.virusscan-test.result }}" == "success" ] && \ - [ "${{ needs.subscription-test.result }}" == "success" ]; then - echo "✅ All enabled integration tests passed!" + if [ "${{ needs.subscription-test.result }}" == "success" ]; then + echo "✅ Subscription integration tests passed!" else - echo "❌ Some integration tests failed. Check individual job results for details." + echo "❌ Subscription integration tests failed." exit 1 fi From 7ac8cbf7d5b8f5d570b40c782f8167d9c18064cc Mon Sep 17 00:00:00 2001 From: Ankush Kumar Garg Date: Thu, 1 Oct 2026 10:15:11 +0530 Subject: [PATCH 3/5] Update multi tenancy_Integration.yml --- .github/workflows/multi tenancy_Integration.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/multi tenancy_Integration.yml b/.github/workflows/multi tenancy_Integration.yml index cd9e9234..494afb1b 100644 --- a/.github/workflows/multi tenancy_Integration.yml +++ b/.github/workflows/multi tenancy_Integration.yml @@ -1366,11 +1366,10 @@ jobs: # Revert repository to default after virus scan tests # Runs if either setup job actually switched the repo (i.e. didn't get skipped) virusscan-cleanup: - if: false environment: dev runs-on: ubuntu-latest needs: [versioned-setup, versioned-test, virusscan-setup, virusscan-test] - if: always() && (needs.versioned-setup.result != 'skipped' || needs.virusscan-setup.result != 'skipped') + if: false steps: - name: Cache CF CLI 📦 id: cache-cf-cli From fdbf83cc01e4bbf11a391dfb46c343b6b78c0f95 Mon Sep 17 00:00:00 2001 From: Ankush Kumar Garg Date: Thu, 1 Oct 2026 11:22:29 +0530 Subject: [PATCH 4/5] Revert "Update multi tenancy_Integration.yml" This reverts commit 7ac8cbf7d5b8f5d570b40c782f8167d9c18064cc. --- .github/workflows/multi tenancy_Integration.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/multi tenancy_Integration.yml b/.github/workflows/multi tenancy_Integration.yml index 494afb1b..cd9e9234 100644 --- a/.github/workflows/multi tenancy_Integration.yml +++ b/.github/workflows/multi tenancy_Integration.yml @@ -1366,10 +1366,11 @@ jobs: # Revert repository to default after virus scan tests # Runs if either setup job actually switched the repo (i.e. didn't get skipped) virusscan-cleanup: + if: false environment: dev runs-on: ubuntu-latest needs: [versioned-setup, versioned-test, virusscan-setup, virusscan-test] - if: false + if: always() && (needs.versioned-setup.result != 'skipped' || needs.virusscan-setup.result != 'skipped') steps: - name: Cache CF CLI 📦 id: cache-cf-cli From dbe8bd2d81e212354cca4759ea12fdefc431031f Mon Sep 17 00:00:00 2001 From: Ankush Kumar Garg Date: Thu, 1 Oct 2026 11:22:34 +0530 Subject: [PATCH 5/5] Revert "Update multi tenancy_Integration.yml" This reverts commit 6810ba5af88357351bfa738b01f2fb6b2deae3a9. --- .../workflows/multi tenancy_Integration.yml | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/.github/workflows/multi tenancy_Integration.yml b/.github/workflows/multi tenancy_Integration.yml index cd9e9234..9320595f 100644 --- a/.github/workflows/multi tenancy_Integration.yml +++ b/.github/workflows/multi tenancy_Integration.yml @@ -17,7 +17,6 @@ on: jobs: # Parallel integration tests using matrix strategy integration-test: - if: false environment: dev runs-on: ubuntu-latest strategy: @@ -353,7 +352,6 @@ jobs: # Active-entity tests run serially in their own slot AFTER integration-test to avoid # fixture-collision with sibling matrix entries (all touch the same Books/author='author' rows). active-entity-test: - if: false environment: dev runs-on: ubuntu-latest needs: integration-test @@ -665,7 +663,6 @@ jobs: # Single-job setup: switch CF app to versioned repo BEFORE matrix tests run. # Avoids race condition where parallel matrix entries try to restage the same app simultaneously. versioned-setup: - if: false environment: dev runs-on: ubuntu-latest needs: active-entity-test @@ -744,7 +741,6 @@ jobs: # Versioned tests run in parallel against the already-switched repo # Skipped if integration-test or versioned-setup fails versioned-test: - if: false environment: dev runs-on: ubuntu-latest needs: versioned-setup @@ -1009,7 +1005,6 @@ jobs: # Single-job setup: switch CF app to virus scan repo BEFORE matrix tests run. # Avoids race condition where parallel matrix entries try to restage the same app simultaneously. virusscan-setup: - if: false environment: dev runs-on: ubuntu-latest needs: versioned-test @@ -1088,7 +1083,6 @@ jobs: # Virus scan tests run in parallel against the already-switched repo # Skipped if versioned-test or virusscan-setup fails virusscan-test: - if: false environment: dev runs-on: ubuntu-latest needs: virusscan-setup @@ -1366,7 +1360,6 @@ jobs: # Revert repository to default after virus scan tests # Runs if either setup job actually switched the repo (i.e. didn't get skipped) virusscan-cleanup: - if: false environment: dev runs-on: ubuntu-latest needs: [versioned-setup, versioned-test, virusscan-setup, virusscan-test] @@ -1440,10 +1433,10 @@ jobs: # Repo-specific tests run one at a time (max-parallel: 1) so each shows individually in UI # DISABLED: set if to true to re-enable repospecific-test: - if: false environment: dev runs-on: ubuntu-latest needs: [virusscan-test, virusscan-cleanup] + if: false strategy: fail-fast: false max-parallel: 1 @@ -1708,6 +1701,7 @@ jobs: subscription-test: environment: dev runs-on: ubuntu-latest + needs: [virusscan-test, virusscan-cleanup] strategy: fail-fast: false max-parallel: 1 @@ -2008,15 +2002,24 @@ jobs: test-summary: environment: dev runs-on: ubuntu-latest - needs: [subscription-test] + needs: [integration-test, active-entity-test, versioned-test, virusscan-test, virusscan-cleanup, repospecific-test, subscription-test] if: "!cancelled()" steps: - name: Check test results 📋 run: | + echo "Integration test: ${{ needs.integration-test.result }}" + echo "Active entity test: ${{ needs.active-entity-test.result }}" + echo "Versioned test: ${{ needs.versioned-test.result }}" + echo "Virus scan test: ${{ needs.virusscan-test.result }}" + echo "Repo-specific test: ${{ needs.repospecific-test.result }} (disabled is OK)" echo "Subscription test: ${{ needs.subscription-test.result }}" - if [ "${{ needs.subscription-test.result }}" == "success" ]; then - echo "✅ Subscription integration tests passed!" + if [ "${{ needs.integration-test.result }}" == "success" ] && \ + [ "${{ needs.active-entity-test.result }}" == "success" ] && \ + [ "${{ needs.versioned-test.result }}" == "success" ] && \ + [ "${{ needs.virusscan-test.result }}" == "success" ] && \ + [ "${{ needs.subscription-test.result }}" == "success" ]; then + echo "✅ All enabled integration tests passed!" else - echo "❌ Subscription integration tests failed." + echo "❌ Some integration tests failed. Check individual job results for details." exit 1 fi