@@ -189,6 +189,7 @@ jobs:
189189 working-directory : ${{ env.APP_DIR }}
190190 outputs :
191191 license-id : ${{ steps.license.outputs.license-id }}
192+ customer-email : ${{ steps.customer.outputs.customer-email }}
192193 skip-customer-registry : ${{ steps.prereqs.outputs.skip-customer-registry }}
193194
194195 steps :
@@ -198,19 +199,20 @@ jobs:
198199 - name : Check prerequisites
199200 id : prereqs
200201 run : |
201- if [ -z "${{ secrets.WG_EASY_CUSTOMER_EMAIL }}" ]; then
202- echo "::warning::WG_EASY_CUSTOMER_EMAIL secret not found - skipping customer registry login"
203- echo "skip-customer-registry=true" >> $GITHUB_OUTPUT
204- else
205- echo "skip-customer-registry=false" >> $GITHUB_OUTPUT
206- fi
202+ echo "Prerequisites check complete"
203+ echo "skip-customer-registry=false" >> $GITHUB_OUTPUT
207204
208205 - name : Setup tools
209206 uses : ./.github/actions/setup-tools
210207
211208 - name : Create customer
212- if : steps.prereqs.outputs.skip-customer-registry == 'false'
213- run : task customer-create CUSTOMER_NAME="${{ needs.setup.outputs.branch-name }}" RELEASE_CHANNEL="${{ needs.setup.outputs.channel-name }}"
209+ id : customer
210+ run : |
211+ task customer-create CUSTOMER_NAME="${{ needs.setup.outputs.branch-name }}" RELEASE_CHANNEL="${{ needs.setup.outputs.channel-name }}"
212+ # Extract customer email from the task - using default from customer-create task
213+ CUSTOMER_EMAIL="[email protected] " 214+ echo "customer-email=$CUSTOMER_EMAIL" >> $GITHUB_OUTPUT
215+ echo "Customer email: $CUSTOMER_EMAIL"
214216 timeout-minutes : 5
215217
216218 - name : Create cluster with retry
@@ -224,7 +226,6 @@ jobs:
224226 task cluster-create CLUSTER_NAME="${{ needs.setup.outputs.branch-name }}"
225227
226228 - name : Get customer license ID
227- if : steps.prereqs.outputs.skip-customer-registry == 'false'
228229 id : license
229230 run : |
230231 LICENSE_ID=$(task utils:get-customer-license CUSTOMER_NAME="${{ needs.setup.outputs.branch-name }}" --silent | tail -1)
@@ -252,18 +253,17 @@ jobs:
252253 run : task dependencies-update
253254
254255 - name : Helm registry login
255- if : needs.create-customer-and-cluster.outputs.skip-customer-registry == 'false'
256256 run : |
257- helm registry login registry.replicated.com --username "${{ secrets.WG_EASY_CUSTOMER_EMAIL }}" --password "${{ needs.create-customer-and-cluster.outputs.license-id }}"
257+ helm registry login registry.replicated.com --username "${{ needs.create-customer-and-cluster.outputs.customer-email }}" --password "${{ needs.create-customer-and-cluster.outputs.license-id }}"
258258 timeout-minutes : 5
259259
260260 - name : Helm install
261261 run : task helm-install
262262 timeout-minutes : 20
263263 env :
264264 CHANNEL : ${{ needs.setup.outputs.channel-name }}
265- REPLICATED_LICENSE_ID : ${{ needs.create-customer-and-cluster.outputs.license-id || 'test-license' }}
266- HELM_ENV : ${{ needs.create-customer-and-cluster.outputs.skip-customer-registry == 'true' && 'default' || ' replicated' }}
265+ REPLICATED_LICENSE_ID : ${{ needs.create-customer-and-cluster.outputs.license-id }}
266+ HELM_ENV : replicated
267267
268268 - name : Upload debug logs
269269 if : failure()
0 commit comments