Skip to content

Commit f815e87

Browse files
committed
fix
1 parent 832c2fa commit f815e87

File tree

3 files changed

+12
-9
lines changed

3 files changed

+12
-9
lines changed

ci/defs/job_configs.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ class JobConfigs:
1414
],
1515
),
1616
command="python3 ./tests/ci/docker_images_check.py --suffix aarch64",
17-
post_hooks=["python3 ./ci/jobs/scripts/job_hooks/build_post_hook.py"],
1817
)
1918
docker_build_amd = Job.Config(
2019
name=JobNames.DOCKER_BUILDS_AMD,
@@ -27,7 +26,6 @@ class JobConfigs:
2726
),
2827
command="python3 ./tests/ci/docker_images_check.py --suffix amd64 --multiarch-manifest",
2928
requires=[JobNames.DOCKER_BUILDS_ARM],
30-
post_hooks=["python3 ./ci/jobs/scripts/job_hooks/docker_clean_up_hook.py"],
3129
)
3230
style_check = Job.Config(
3331
name=JobNames.STYLE_CHECK,
@@ -906,6 +904,7 @@ class JobConfigs:
906904
],
907905
),
908906
requires=["Build (amd_release)", "Build (arm_release)"],
907+
post_hooks=["python3 ./ci/jobs/scripts/job_hooks/docker_clean_up_hook.py"],
909908
)
910909
docker_keeper = Job.Config(
911910
name=JobNames.DOCKER_KEEPER,
@@ -920,6 +919,7 @@ class JobConfigs:
920919
],
921920
),
922921
requires=["Build (amd_release)", "Build (arm_release)"],
922+
post_hooks=["python3 ./ci/jobs/scripts/job_hooks/docker_clean_up_hook.py"],
923923
)
924924
sqlancer_master_jobs = Job.Config(
925925
name=JobNames.SQLANCER,

ci/jobs/scripts/job_hooks/docker_clean_up_hook.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@ def check():
99

1010
print("Clean up non-latest images per each Repository")
1111
Shell.check(
12-
"docker images --format '{{.Repository}} {{.Tag}} {{.ID}}' "
13-
" | sort -u -k1,1 | awk '{print $3}' "
14-
" | xargs -r -I {} docker images --filter 'before={}' --quiet "
15-
" | sort -u | xargs -r docker rmi",
12+
"docker images --format '{{.Repository}} {{.ID}} {{.CreatedAt}}' "
13+
" | sort -k1,1 -k3,3M -k4,4n -k5,5n "
14+
" | tac "
15+
" | awk '!seen[$1]++ {next} {print $2}' "
16+
" | xargs -r docker rmi",
1617
verbose=True,
1718
)
1819
return True

ci/praktika/json.html

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -564,7 +564,7 @@
564564
const chartWrapper = document.createElement("div");
565565
chartWrapper.className = 'status-widget';
566566

567-
const stats = persistentStorage.statisticsObject?.[jobName]?.["7d"];
567+
const stats = persistentStorage.statisticsObject?.[jobName]?.["3d"];
568568
if (!stats) {
569569
console.warn(`No stats found for job: ${jobName}`);
570570
return;
@@ -1418,7 +1418,9 @@
14181418
let statusWidget = addStatusWidget(result.name, result.status, result.start_time, result.duration);
14191419
if (nameParams.length > 1) {
14201420
addFileLinksWidget(result.links);
1421-
addStatisticsWidget(nameParams[1], result.duration * 1000)
1421+
if (nameParams.length === 2) {
1422+
addStatisticsWidget(nameParams[1], result.duration * 1000)
1423+
}
14221424
} else {
14231425
addTimeTraceWidget(result.results, statusWidget, originalWorkflowDetails);
14241426
}
@@ -1457,7 +1459,7 @@
14571459
!persistentStorage.updatedAt ||
14581460
now > persistentStorage.updatedAt + HALF_DAY
14591461
) {
1460-
const url = `https://s3.amazonaws.com/${bucketName}/statistics/${name.toLowerCase()}.json.gz`;
1462+
const url = `https://s3.amazonaws.com/${bucketName}/statistics/statistics.json.gz`;
14611463

14621464
try {
14631465
const response = await fetch(url);

0 commit comments

Comments
 (0)