Skip to content

Commit de9cd70

Browse files
universal-itengineeruniversal-itengineer
committed
fix helm and yaml formatting
Signed-off-by: Nikita Korolev <nikita.korolev@flant.com>
1 parent 289e9df commit de9cd70

2 files changed

Lines changed: 90 additions & 117 deletions

File tree

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

Lines changed: 75 additions & 112 deletions
Original file line numberDiff line numberDiff line change
@@ -494,51 +494,14 @@ jobs:
494494
fi
495495
- name: Enable SDN
496496
run: |
497+
echo "[INFO] Enable SDN"
497498
d8 system module enable sdn
498-
499-
d8_queue_list() {
500-
d8 s queue list | grep -Po '([0-9]+)(?= active)' || echo "[WARNING] Failed to retrieve list queue"
501-
}
502-
503-
d8_queue() {
504-
local count=90
505-
local queue_count
506-
507-
for i in $(seq 1 $count) ; do
508-
queue_count=$(d8_queue_list)
509-
if [ -n "$queue_count" ] && [ "$queue_count" = "0" ]; then
510-
echo "[SUCCESS] Queue is clear"
511-
return 0
512-
fi
513-
514-
echo "[INFO] Wait until queues are empty ${i}/${count}"
515-
if (( i % 5 == 0 )); then
516-
echo "[INFO] Show queue list"
517-
d8 s queue list | head -n25 || echo "[WARNING] Failed to retrieve list queue"
518-
echo " "
519-
fi
520-
521-
if (( i % 10 == 0 )); then
522-
echo "[INFO] deckhouse logs"
523-
echo "::group::📝 deckhouse logs"
524-
d8 s logs | tail -n 100
525-
echo "::endgroup::"
526-
echo " "
527-
fi
528-
sleep 10
529-
done
530-
}
531-
532-
echo "[INFO] Wait 30s for reconsilation start for module sdn"
533-
sleep 30
534-
d8_queue
535-
536-
echo "[INFO] Wait for sdn modules to be ready"
499+
echo "[INFO] Wait for sdn modules to be ready, timeout: 300s"
537500
kubectl wait --for=jsonpath='{.status.phase}'=Ready modules sdn --timeout=300s
538-
echo "[INFO] Wait for sdn deployments to be ready"
539-
kubectl -n d8-sdn wait --for=condition=Available deploy --all --timeout 900s
540-
echo "[INFO] Wait for sdn daemonsets to be ready"
541-
kubectl -n d8-sdn wait --for=condition=Available daemonsets --all --timeout 900s
501+
echo "[INFO] Wait for sdn deployments to be ready, timeout: 300s"
502+
kubectl -n d8-sdn wait --for=condition=Available deploy --all --timeout 300s
503+
echo "[INFO] Wait for sdn daemonset agent to be ready, timeout: 300s"
504+
kubectl -n d8-sdn rollout status daemonset agent --timeout=300s
542505
echo "[SUCCESS] Done"
543506
544507
- name: Configure ClusterNetwork
@@ -566,7 +529,7 @@ jobs:
566529
567530
echo "[INFO] Wait for ClusterNetwork cn-${cnn}-for-e2e-test to be ready"
568531
# TODO: remove true before merge
569-
kubectl wait clusternetworks.network.deckhouse.io --for=condition=Ready cn-${cnn}-for-e2e-test --timeout 300s || true
532+
kubectl wait clusternetworks.network.deckhouse.io --for=condition=Ready cn-${cnn}-for-e2e-test --timeout 30s || true
570533
done
571534
572535
configure-storage:
@@ -1215,75 +1178,75 @@ jobs:
12151178
STORAGE_CLASS_NAME: ${{ inputs.nested_storageclass_name }}
12161179
working-directory: ./test/e2e/
12171180
run: |
1218-
GINKGO_RESULT=$(mktemp -p $RUNNER_TEMP)
1219-
DATE=$(date +"%Y-%m-%d")
1220-
START_TIME=$(date +"%H:%M:%S")
1221-
summary_file_name_junit="e2e_summary_${CSI}_${DATE}.xml"
1222-
summary_file_name_json="e2e_summary_${CSI}_${DATE}.json"
1223-
1224-
cp -a legacy/testdata /tmp/testdata
1225-
1226-
set +e
1227-
FOCUS="${{ inputs.e2e_focus_tests }}"
1228-
if [ -n "$FOCUS" ]; then
1229-
go tool ginkgo \
1230-
--focus="$FOCUS" \
1231-
-v --race --timeout=$TIMEOUT \
1232-
--junit-report=$summary_file_name_junit | tee $GINKGO_RESULT
1233-
else
1234-
go tool ginkgo \
1235-
-v --race --timeout=$TIMEOUT \
1236-
--junit-report=$summary_file_name_junit | tee $GINKGO_RESULT
1237-
fi
1238-
GINKGO_EXIT_CODE=$?
1239-
set -e
1240-
1241-
RESULT=$(sed -e "s/\x1b\[[0-9;]*m//g" $GINKGO_RESULT | grep --color=never -E "FAIL!|SUCCESS!")
1242-
if [[ $RESULT == FAIL!* ]]; then
1243-
RESULT_STATUS=":x: FAIL!"
1244-
elif [[ $RESULT == SUCCESS!* ]]; then
1245-
RESULT_STATUS=":white_check_mark: SUCCESS!"
1246-
else
1247-
RESULT_STATUS=":question: UNKNOWN"
1248-
fi
1249-
1250-
PASSED=$(echo "$RESULT" | grep -oP "\d+(?= Passed)")
1251-
FAILED=$(echo "$RESULT" | grep -oP "\d+(?= Failed)")
1252-
PENDING=$(echo "$RESULT" | grep -oP "\d+(?= Pending)")
1253-
SKIPPED=$(echo "$RESULT" | grep -oP "\d+(?= Skipped)")
1254-
1255-
SUMMARY=$(jq -n \
1256-
--arg csi "$CSI" \
1257-
--arg date "$DATE" \
1258-
--arg startTime "$START_TIME" \
1259-
--arg branch "${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" \
1260-
--arg status "$RESULT_STATUS" \
1261-
--argjson passed "$PASSED" \
1262-
--argjson failed "$FAILED" \
1263-
--argjson pending "$PENDING" \
1264-
--argjson skipped "$SKIPPED" \
1265-
--arg link "$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" \
1266-
'{
1267-
CSI: $csi,
1268-
Date: $date,
1269-
StartTime: $startTime,
1270-
Branch: $branch,
1271-
Status: $status,
1272-
Passed: $passed,
1273-
Failed: $failed,
1274-
Pending: $pending,
1275-
Skipped: $skipped,
1276-
Link: $link
1277-
}'
1278-
)
1279-
1280-
echo "$SUMMARY"
1281-
echo "summary=$(echo "$SUMMARY" | jq -c .)" >> $GITHUB_OUTPUT
1282-
echo $SUMMARY > "${summary_file_name_json}"
1283-
1284-
echo "[INFO] Exit code: $GINKGO_EXIT_CODE"
1181+
# GINKGO_RESULT=$(mktemp -p $RUNNER_TEMP)
1182+
# DATE=$(date +"%Y-%m-%d")
1183+
# START_TIME=$(date +"%H:%M:%S")
1184+
# summary_file_name_junit="e2e_summary_${CSI}_${DATE}.xml"
1185+
# summary_file_name_json="e2e_summary_${CSI}_${DATE}.json"
1186+
1187+
# cp -a legacy/testdata /tmp/testdata
1188+
1189+
# set +e
1190+
# FOCUS="${{ inputs.e2e_focus_tests }}"
1191+
# if [ -n "$FOCUS" ]; then
1192+
# go tool ginkgo \
1193+
# --focus="$FOCUS" \
1194+
# -v --race --timeout=$TIMEOUT \
1195+
# --junit-report=$summary_file_name_junit | tee $GINKGO_RESULT
1196+
# else
1197+
# go tool ginkgo \
1198+
# -v --race --timeout=$TIMEOUT \
1199+
# --junit-report=$summary_file_name_junit | tee $GINKGO_RESULT
1200+
# fi
1201+
# GINKGO_EXIT_CODE=$?
1202+
# set -e
1203+
1204+
# RESULT=$(sed -e "s/\x1b\[[0-9;]*m//g" $GINKGO_RESULT | grep --color=never -E "FAIL!|SUCCESS!")
1205+
# if [[ $RESULT == FAIL!* ]]; then
1206+
# RESULT_STATUS=":x: FAIL!"
1207+
# elif [[ $RESULT == SUCCESS!* ]]; then
1208+
# RESULT_STATUS=":white_check_mark: SUCCESS!"
1209+
# else
1210+
# RESULT_STATUS=":question: UNKNOWN"
1211+
# fi
1212+
1213+
# PASSED=$(echo "$RESULT" | grep -oP "\d+(?= Passed)")
1214+
# FAILED=$(echo "$RESULT" | grep -oP "\d+(?= Failed)")
1215+
# PENDING=$(echo "$RESULT" | grep -oP "\d+(?= Pending)")
1216+
# SKIPPED=$(echo "$RESULT" | grep -oP "\d+(?= Skipped)")
1217+
1218+
# SUMMARY=$(jq -n \
1219+
# --arg csi "$CSI" \
1220+
# --arg date "$DATE" \
1221+
# --arg startTime "$START_TIME" \
1222+
# --arg branch "${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" \
1223+
# --arg status "$RESULT_STATUS" \
1224+
# --argjson passed "$PASSED" \
1225+
# --argjson failed "$FAILED" \
1226+
# --argjson pending "$PENDING" \
1227+
# --argjson skipped "$SKIPPED" \
1228+
# --arg link "$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" \
1229+
# '{
1230+
# CSI: $csi,
1231+
# Date: $date,
1232+
# StartTime: $startTime,
1233+
# Branch: $branch,
1234+
# Status: $status,
1235+
# Passed: $passed,
1236+
# Failed: $failed,
1237+
# Pending: $pending,
1238+
# Skipped: $skipped,
1239+
# Link: $link
1240+
# }'
1241+
# )
1242+
1243+
# echo "$SUMMARY"
1244+
# echo "summary=$(echo "$SUMMARY" | jq -c .)" >> $GITHUB_OUTPUT
1245+
# echo $SUMMARY > "${summary_file_name_json}"
1246+
1247+
# echo "[INFO] Exit code: $GINKGO_EXIT_CODE"
12851248
# exit $GINKGO_EXIT_CODE
1286-
exit 0
1249+
exit 1
12871250
- name: Upload summary test results (junit/xml)
12881251
uses: actions/upload-artifact@v4
12891252
id: e2e-report-artifact

‎test/dvp-static-cluster/charts/infra/templates/_helpers.tpl‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,18 @@ spec:
5454
#cloud-config
5555
ssh_pwauth: true
5656
package_update: true
57-
network:
58-
version: 2
59-
ethernets:
60-
eno2:
61-
dhcp4: false
57+
write_files:
58+
- path: /etc/netplan/99-eno2.yaml
59+
content: |
60+
network:
61+
version: 2
62+
ethernets:
63+
eno2:
64+
dhcp4: false
65+
dhcp6: false
66+
addresses: []
67+
link-local: []
68+
optional: true
6269
packages:
6370
- qemu-guest-agent
6471
- jq
@@ -76,6 +83,8 @@ spec:
7683
- {{ $ctx.Values.discovered.publicSSHKey }}
7784

7885
runcmd:
86+
- netplan apply
87+
- ip link set eno2 up
7988
- systemctl enable --now qemu-guest-agent.service
8089
final_message: "\U0001F525\U0001F525\U0001F525 The system is finally up, after $UPTIME seconds \U0001F525\U0001F525\U0001F525"
8190
runPolicy: AlwaysOn
@@ -116,4 +125,5 @@ spec:
116125
{{- end }}
117126
{{- end }}
118127
{{- end }}
128+
{{- end }}
119129
{{- end }}

0 commit comments

Comments
 (0)