Skip to content

Commit 32324ee

Browse files
chore(ci): gather logs when bootstrap success or failed (#2286)
Description Ensure the reusable E2E pipeline always prepares and uploads bootstrap artifacts, even when dhctl-bootstrap fails before generating the full set of files. --------- Signed-off-by: Nikita Korolev <nikita.korolev@flant.com>
1 parent 153393c commit 32324ee

1 file changed

Lines changed: 8 additions & 5 deletions

File tree

.github/workflows/e2e-reusable-pipeline.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -421,18 +421,18 @@ jobs:
421421
d8vscp "${DEFAULT_USER}@${nested_master}.$NAMESPACE:/var/log/cloud-init*.log" "./${{ env.SETUP_CLUSTER_TYPE_PATH }}/tmp/"
422422
423423
- name: Prepare artifact
424-
if: always() && steps.dhctl-bootstrap.outcome == 'success'
424+
if: success() || failure()
425425
run: |
426-
sudo chown -fR 1001:1001 ${{ env.SETUP_CLUSTER_TYPE_PATH }}
427-
yq e '.deckhouse.registryDockerCfg = "None"' -i ./${{ env.SETUP_CLUSTER_TYPE_PATH }}/values.yaml
426+
sudo chown -fR 1001:1001 ${{ env.SETUP_CLUSTER_TYPE_PATH }} || true
427+
yq e '.deckhouse.registryDockerCfg = "None"' -i ./${{ env.SETUP_CLUSTER_TYPE_PATH }}/values.yaml || true
428428
yq e 'select(.kind == "InitConfiguration").deckhouse.registryDockerCfg = "None"' -i ./${{ env.SETUP_CLUSTER_TYPE_PATH }}/tmp/config.yaml || echo "The config.yaml file is not generated, skipping"
429429
yq e '.discovered.registry_url = "None"' -i ./${{ env.SETUP_CLUSTER_TYPE_PATH }}/tmp/discovered-values.yaml || echo "The discovered-values.yaml file is not generated, skipping editing registry_url"
430430
yq e '.discovered.registry_auth = "None"' -i ./${{ env.SETUP_CLUSTER_TYPE_PATH }}/tmp/discovered-values.yaml || echo "The discovered-values.yaml file is not generated, skipping editing registry_auth"
431-
echo "${{ steps.generate-kubeconfig.outputs.kubeconfig }}" | base64 -d | base64 -d > ./${{ env.SETUP_CLUSTER_TYPE_PATH }}/kube-config
431+
echo "${{ steps.generate-kubeconfig.outputs.kubeconfig }}" | base64 -d | base64 -d > ./${{ env.SETUP_CLUSTER_TYPE_PATH }}/kube-config || echo "kubeconfig not available, skipping"
432432
433433
- name: Upload generated files
434434
uses: actions/upload-artifact@v4
435-
if: always() && steps.dhctl-bootstrap.outcome == 'success'
435+
if: success() || failure()
436436
with:
437437
name: ${{ inputs.storage_type }}-generated-files-${{ inputs.date_start }}
438438
path: |
@@ -1270,6 +1270,7 @@ jobs:
12701270
DATE=$(date +"%Y-%m-%d")
12711271
START_TIME=$(date +"%H:%M:%S")
12721272
summary_file_name_junit="e2e_summary_${CSI}_${DATE}.xml"
1273+
ginkgo_json_report="e2e_summary_${CSI}_${DATE}-ginkgo-report.json"
12731274
summary_file_name_json="e2e_summary_${CSI}_${DATE}.json"
12741275
12751276
cp -a legacy/testdata /tmp/testdata
@@ -1280,10 +1281,12 @@ jobs:
12801281
go tool ginkgo \
12811282
--focus="$FOCUS" \
12821283
-v --race --timeout=$TIMEOUT \
1284+
--json-report=$ginkgo_json_report \
12831285
--junit-report=$summary_file_name_junit | tee $GINKGO_RESULT
12841286
else
12851287
go tool ginkgo \
12861288
-v --race --timeout=$TIMEOUT \
1289+
--json-report=$ginkgo_json_report \
12871290
--junit-report=$summary_file_name_junit | tee $GINKGO_RESULT
12881291
fi
12891292
GINKGO_EXIT_CODE=$?

0 commit comments

Comments
 (0)