Skip to content

Commit c1fa787

Browse files
committed
Revert "ci(testing-only): skip helm tests, publish pre-release charts anyway"
This reverts commit e1a095d.
1 parent 3928205 commit c1fa787

1 file changed

Lines changed: 5 additions & 9 deletions

File tree

.github/workflows/pr.yml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -58,17 +58,15 @@ jobs:
5858

5959
helm-integration:
6060
needs: modified-files
61-
# TESTING ONLY — do not merge: force-skip so charts publish without tests
62-
if: ${{ needs.modified-files.outputs.helm-integration-required == 'never' }}
61+
if: ${{ needs.modified-files.outputs.helm-integration-required == 'true' }}
6362
uses: ./.github/workflows/test-integration-helm.yml
6463
secrets:
6564
ORG_RO_ALOHA_GITHUB_WORKFLOWS_FG_PAT: ${{ secrets.ORG_RO_ALOHA_GITHUB_WORKFLOWS_FG_PAT }}
6665
REPO_GOOGLE_WORKLOAD_IDP: ${{ secrets.REPO_GOOGLE_WORKLOAD_IDP }}
6766

6867
helm-unit:
6968
needs: modified-files
70-
# TESTING ONLY — do not merge: force-skip so charts publish without tests
71-
if: ${{ needs.modified-files.outputs.helm-unit-required == 'never' }}
69+
if: ${{ needs.modified-files.outputs.helm-unit-required == 'true' }}
7270
uses: ./.github/workflows/test-helm.yml
7371
secrets:
7472
ORG_RO_ALOHA_GITHUB_WORKFLOWS_FG_PAT: ${{ secrets.ORG_RO_ALOHA_GITHUB_WORKFLOWS_FG_PAT }}
@@ -90,13 +88,11 @@ jobs:
9088

9189
helm-pre-release:
9290
needs: [all-tests, helm-unit, helm-integration, validate-chart-version]
93-
# TESTING ONLY — do not merge: accept skipped helm tests so the chart
94-
# still publishes
9591
if: |
9692
always() &&
97-
(needs.helm-unit.result == 'success' || needs.helm-unit.result == 'skipped') &&
98-
(needs.helm-integration.result == 'success' || needs.helm-integration.result == 'skipped') &&
99-
(needs.validate-chart-version.result == 'success')
93+
(needs.helm-unit.result == 'success' &&
94+
needs.helm-integration.result == 'success' &&
95+
needs.validate-chart-version.result == 'success')
10096
uses: ./.github/workflows/pre-release-internal-env.yml
10197
secrets:
10298
REPO_GOOGLE_WORKLOAD_IDP: ${{ secrets.REPO_GOOGLE_WORKLOAD_IDP }}

0 commit comments

Comments
 (0)