Skip to content

Commit cc636db

Browse files
committed
revert disabled test cases
1 parent 2fb114d commit cc636db

2 files changed

Lines changed: 30 additions & 23 deletions

File tree

.github/workflows/multi tenancy_Integration.yml

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ jobs:
1919
integration-test:
2020
environment: dev
2121
runs-on: ubuntu-latest
22-
if: false # TEMPORARILY DISABLED — only active-entity-test runs
2322
strategy:
2423
fail-fast: false
2524
matrix:
@@ -355,6 +354,7 @@ jobs:
355354
active-entity-test:
356355
environment: dev
357356
runs-on: ubuntu-latest
357+
needs: integration-test
358358
strategy:
359359
fail-fast: false
360360
matrix:
@@ -666,7 +666,6 @@ jobs:
666666
environment: dev
667667
runs-on: ubuntu-latest
668668
needs: active-entity-test
669-
if: false # TEMPORARILY DISABLED — only active-entity-test runs
670669
steps:
671670
- name: Cache CF CLI 📦
672671
id: cache-cf-cli
@@ -745,7 +744,6 @@ jobs:
745744
environment: dev
746745
runs-on: ubuntu-latest
747746
needs: versioned-setup
748-
if: false # TEMPORARILY DISABLED — only active-entity-test runs
749747
strategy:
750748
fail-fast: false
751749
matrix:
@@ -1010,7 +1008,6 @@ jobs:
10101008
environment: dev
10111009
runs-on: ubuntu-latest
10121010
needs: versioned-test
1013-
if: false # TEMPORARILY DISABLED — only active-entity-test runs
10141011
steps:
10151012
- name: Cache CF CLI 📦
10161013
id: cache-cf-cli
@@ -1089,7 +1086,6 @@ jobs:
10891086
environment: dev
10901087
runs-on: ubuntu-latest
10911088
needs: virusscan-setup
1092-
if: false # TEMPORARILY DISABLED — only active-entity-test runs
10931089
strategy:
10941090
fail-fast: false
10951091
matrix:
@@ -1367,7 +1363,7 @@ jobs:
13671363
environment: dev
13681364
runs-on: ubuntu-latest
13691365
needs: [versioned-setup, versioned-test, virusscan-setup, virusscan-test]
1370-
if: false # TEMPORARILY DISABLED — only active-entity-test runs
1366+
if: always() && (needs.versioned-setup.result != 'skipped' || needs.virusscan-setup.result != 'skipped')
13711367
steps:
13721368
- name: Cache CF CLI 📦
13731369
id: cache-cf-cli
@@ -1706,7 +1702,6 @@ jobs:
17061702
environment: dev
17071703
runs-on: ubuntu-latest
17081704
needs: [virusscan-test, virusscan-cleanup]
1709-
if: false # TEMPORARILY DISABLED — only active-entity-test runs
17101705
strategy:
17111706
fail-fast: false
17121707
max-parallel: 1
@@ -2007,16 +2002,24 @@ jobs:
20072002
test-summary:
20082003
environment: dev
20092004
runs-on: ubuntu-latest
2010-
needs: [active-entity-test]
2005+
needs: [integration-test, active-entity-test, versioned-test, virusscan-test, virusscan-cleanup, repospecific-test, subscription-test]
20112006
if: "!cancelled()"
20122007
steps:
20132008
- name: Check test results 📋
20142009
run: |
2010+
echo "Integration test: ${{ needs.integration-test.result }}"
20152011
echo "Active entity test: ${{ needs.active-entity-test.result }}"
2016-
echo "(Other suites temporarily disabled — only active-entity-test runs)"
2017-
if [ "${{ needs.active-entity-test.result }}" == "success" ]; then
2018-
echo "✅ Active-entity integration tests passed!"
2012+
echo "Versioned test: ${{ needs.versioned-test.result }}"
2013+
echo "Virus scan test: ${{ needs.virusscan-test.result }}"
2014+
echo "Repo-specific test: ${{ needs.repospecific-test.result }} (disabled is OK)"
2015+
echo "Subscription test: ${{ needs.subscription-test.result }}"
2016+
if [ "${{ needs.integration-test.result }}" == "success" ] && \
2017+
[ "${{ needs.active-entity-test.result }}" == "success" ] && \
2018+
[ "${{ needs.versioned-test.result }}" == "success" ] && \
2019+
[ "${{ needs.virusscan-test.result }}" == "success" ] && \
2020+
[ "${{ needs.subscription-test.result }}" == "success" ]; then
2021+
echo "✅ All enabled integration tests passed!"
20192022
else
2020-
echo "❌ Active-entity integration tests failed. Check individual job results for details."
2023+
echo "❌ Some integration tests failed. Check individual job results for details."
20212024
exit 1
20222025
fi

.github/workflows/singleTenant_integration_test.yml

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ jobs:
1515
integration-test:
1616
environment: dev
1717
runs-on: ubuntu-latest
18-
if: false # TEMPORARILY DISABLED — only active-entity-test runs
1918
strategy:
2019
fail-fast: false
2120
matrix:
@@ -279,6 +278,7 @@ jobs:
279278
active-entity-test:
280279
environment: dev
281280
runs-on: ubuntu-latest
281+
needs: integration-test
282282
strategy:
283283
fail-fast: false
284284
matrix:
@@ -530,7 +530,6 @@ jobs:
530530
environment: dev
531531
runs-on: ubuntu-latest
532532
needs: active-entity-test
533-
if: false # TEMPORARILY DISABLED — only active-entity-test runs
534533
steps:
535534
- name: Cache CF CLI 📦
536535
id: cache-cf-cli
@@ -609,7 +608,6 @@ jobs:
609608
environment: dev
610609
runs-on: ubuntu-latest
611610
needs: versioned-setup
612-
if: false # TEMPORARILY DISABLED — only active-entity-test runs
613611
strategy:
614612
fail-fast: false
615613
matrix:
@@ -829,7 +827,6 @@ jobs:
829827
environment: dev
830828
runs-on: ubuntu-latest
831829
needs: versioned-test
832-
if: false # TEMPORARILY DISABLED — only active-entity-test runs
833830
steps:
834831
- name: Cache CF CLI 📦
835832
id: cache-cf-cli
@@ -908,7 +905,6 @@ jobs:
908905
environment: dev
909906
runs-on: ubuntu-latest
910907
needs: virusscan-setup
911-
if: false # TEMPORARILY DISABLED — only active-entity-test runs
912908
strategy:
913909
fail-fast: false
914910
matrix:
@@ -1141,7 +1137,7 @@ jobs:
11411137
environment: dev
11421138
runs-on: ubuntu-latest
11431139
needs: [versioned-setup, versioned-test, virusscan-setup, virusscan-test]
1144-
if: false # TEMPORARILY DISABLED — only active-entity-test runs
1140+
if: always() && (needs.versioned-setup.result != 'skipped' || needs.virusscan-setup.result != 'skipped')
11451141
steps:
11461142
- name: Cache CF CLI 📦
11471143
id: cache-cf-cli
@@ -1433,16 +1429,24 @@ jobs:
14331429
test-summary:
14341430
environment: dev
14351431
runs-on: ubuntu-latest
1436-
needs: [active-entity-test]
1432+
needs: [integration-test, active-entity-test, versioned-test, virusscan-test, virusscan-cleanup, repospecific-test]
14371433
if: "!cancelled()"
14381434
steps:
14391435
- name: Check test results 📋
14401436
run: |
1437+
echo "Integration test: ${{ needs.integration-test.result }}"
14411438
echo "Active entity test: ${{ needs.active-entity-test.result }}"
1442-
echo "(Other suites temporarily disabled — only active-entity-test runs)"
1443-
if [ "${{ needs.active-entity-test.result }}" == "success" ]; then
1444-
echo "✅ Active-entity integration tests passed!"
1439+
echo "Versioned test: ${{ needs.versioned-test.result }}"
1440+
echo "Virus scan test: ${{ needs.virusscan-test.result }}"
1441+
echo "Virusscan cleanup: ${{ needs.virusscan-cleanup.result }}"
1442+
echo "Repo-specific test: ${{ needs.repospecific-test.result }} (disabled is OK)"
1443+
if [ "${{ needs.integration-test.result }}" == "success" ] && \
1444+
[ "${{ needs.active-entity-test.result }}" == "success" ] && \
1445+
[ "${{ needs.versioned-test.result }}" == "success" ] && \
1446+
[ "${{ needs.virusscan-test.result }}" == "success" ] && \
1447+
[ "${{ needs.virusscan-cleanup.result }}" == "success" ]; then
1448+
echo "✅ All enabled integration tests passed!"
14451449
else
1446-
echo "❌ Active-entity integration tests failed. Check individual job results for details."
1450+
echo "❌ Some integration tests failed. Check individual job results for details."
14471451
exit 1
14481452
fi

0 commit comments

Comments
 (0)