Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions .github/workflows/e2e-reusable-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -421,18 +421,18 @@ jobs:
d8vscp "${DEFAULT_USER}@${nested_master}.$NAMESPACE:/var/log/cloud-init*.log" "./${{ env.SETUP_CLUSTER_TYPE_PATH }}/tmp/"

- name: Prepare artifact
if: always() && steps.dhctl-bootstrap.outcome == 'success'
if: success() || failure()
run: |
sudo chown -fR 1001:1001 ${{ env.SETUP_CLUSTER_TYPE_PATH }}
yq e '.deckhouse.registryDockerCfg = "None"' -i ./${{ env.SETUP_CLUSTER_TYPE_PATH }}/values.yaml
sudo chown -fR 1001:1001 ${{ env.SETUP_CLUSTER_TYPE_PATH }} || true
yq e '.deckhouse.registryDockerCfg = "None"' -i ./${{ env.SETUP_CLUSTER_TYPE_PATH }}/values.yaml || true
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"
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"
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"
echo "${{ steps.generate-kubeconfig.outputs.kubeconfig }}" | base64 -d | base64 -d > ./${{ env.SETUP_CLUSTER_TYPE_PATH }}/kube-config
echo "${{ steps.generate-kubeconfig.outputs.kubeconfig }}" | base64 -d | base64 -d > ./${{ env.SETUP_CLUSTER_TYPE_PATH }}/kube-config || echo "kubeconfig not available, skipping"

- name: Upload generated files
uses: actions/upload-artifact@v4
if: always() && steps.dhctl-bootstrap.outcome == 'success'
if: success() || failure()
with:
name: ${{ inputs.storage_type }}-generated-files-${{ inputs.date_start }}
path: |
Expand Down Expand Up @@ -1270,6 +1270,7 @@ jobs:
DATE=$(date +"%Y-%m-%d")
START_TIME=$(date +"%H:%M:%S")
summary_file_name_junit="e2e_summary_${CSI}_${DATE}.xml"
ginkgo_json_report="e2e_summary_${CSI}_${DATE}-ginkgo-report.json"
summary_file_name_json="e2e_summary_${CSI}_${DATE}.json"

cp -a legacy/testdata /tmp/testdata
Expand All @@ -1280,10 +1281,12 @@ jobs:
go tool ginkgo \
--focus="$FOCUS" \
-v --race --timeout=$TIMEOUT \
--json-report=$ginkgo_json_report \
--junit-report=$summary_file_name_junit | tee $GINKGO_RESULT
else
go tool ginkgo \
-v --race --timeout=$TIMEOUT \
--json-report=$ginkgo_json_report \
--junit-report=$summary_file_name_junit | tee $GINKGO_RESULT
fi
GINKGO_EXIT_CODE=$?
Expand Down
Loading