Skip to content

Commit 9e50265

Browse files
committed
ensure helm-install always runs regardless of customer secret
- Always create cluster for helm deployment testing - Only skip customer registry login when WG_EASY_CUSTOMER_EMAIL secret missing - Use default helmfile environment when customer secret unavailable - Helm install step now validates deployment in all scenarios - Provides test-license fallback for REPLICATED_LICENSE_ID
1 parent 81e3d73 commit 9e50265

File tree

1 file changed

+10
-11
lines changed

1 file changed

+10
-11
lines changed

.github/workflows/wg-easy-pr-validation.yaml

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ jobs:
189189
working-directory: ${{ env.APP_DIR }}
190190
outputs:
191191
license-id: ${{ steps.license.outputs.license-id }}
192-
skip-customer-test: ${{ steps.prereqs.outputs.skip-customer-test }}
192+
skip-customer-registry: ${{ steps.prereqs.outputs.skip-customer-registry }}
193193

194194
steps:
195195
- name: Checkout code
@@ -199,22 +199,21 @@ jobs:
199199
id: prereqs
200200
run: |
201201
if [ -z "${{ secrets.WG_EASY_CUSTOMER_EMAIL }}" ]; then
202-
echo "::warning::WG_EASY_CUSTOMER_EMAIL secret not found - skipping customer deployment test"
203-
echo "skip-customer-test=true" >> $GITHUB_OUTPUT
202+
echo "::warning::WG_EASY_CUSTOMER_EMAIL secret not found - skipping customer registry login"
203+
echo "skip-customer-registry=true" >> $GITHUB_OUTPUT
204204
else
205-
echo "skip-customer-test=false" >> $GITHUB_OUTPUT
205+
echo "skip-customer-registry=false" >> $GITHUB_OUTPUT
206206
fi
207207
208208
- name: Setup tools
209209
uses: ./.github/actions/setup-tools
210210

211211
- name: Create customer
212-
if: steps.prereqs.outputs.skip-customer-test == 'false'
212+
if: steps.prereqs.outputs.skip-customer-registry == 'false'
213213
run: task customer-create CUSTOMER_NAME="${{ needs.setup.outputs.branch-name }}" RELEASE_CHANNEL="${{ needs.setup.outputs.channel-name }}"
214214
timeout-minutes: 5
215215

216216
- name: Create cluster with retry
217-
if: steps.prereqs.outputs.skip-customer-test == 'false'
218217
uses: nick-fields/[email protected]
219218
with:
220219
timeout_minutes: 20
@@ -225,7 +224,7 @@ jobs:
225224
task cluster-create CLUSTER_NAME="${{ needs.setup.outputs.branch-name }}"
226225
227226
- name: Get customer license ID
228-
if: steps.prereqs.outputs.skip-customer-test == 'false'
227+
if: steps.prereqs.outputs.skip-customer-registry == 'false'
229228
id: license
230229
run: |
231230
LICENSE_ID=$(task utils:get-customer-license CUSTOMER_NAME="${{ needs.setup.outputs.branch-name }}" --silent | tail -1)
@@ -235,7 +234,6 @@ jobs:
235234
helm-install-test:
236235
runs-on: ubuntu-22.04
237236
needs: [setup, create-customer-and-cluster]
238-
if: needs.create-customer-and-cluster.outputs.skip-customer-test == 'false'
239237
defaults:
240238
run:
241239
working-directory: ${{ env.APP_DIR }}
@@ -250,17 +248,18 @@ jobs:
250248
helm-version: ${{ env.HELM_VERSION }}
251249

252250
- name: Helm registry login
251+
if: needs.create-customer-and-cluster.outputs.skip-customer-registry == 'false'
253252
run: |
254253
helm registry login registry.replicated.com --username "${{ secrets.WG_EASY_CUSTOMER_EMAIL }}" --password "${{ needs.create-customer-and-cluster.outputs.license-id }}"
255254
timeout-minutes: 5
256255

257-
- name: Helm install as customer
256+
- name: Helm install
258257
run: task helm-install
259258
timeout-minutes: 20
260259
env:
261260
CHANNEL: ${{ needs.setup.outputs.channel-name }}
262-
REPLICATED_LICENSE_ID: ${{ needs.create-customer-and-cluster.outputs.license-id }}
263-
HELM_ENV: replicated
261+
REPLICATED_LICENSE_ID: ${{ needs.create-customer-and-cluster.outputs.license-id || 'test-license' }}
262+
HELM_ENV: ${{ needs.create-customer-and-cluster.outputs.skip-customer-registry == 'true' && 'default' || 'replicated' }}
264263

265264
- name: Upload debug logs
266265
if: failure()

0 commit comments

Comments
 (0)