From 1fa64e020af04589f22110a7ec665feb5b073d27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ole=20Sch=C3=BCtt?= <ole.schuett@cp2k.org>
Date: Mon, 17 Apr 2023 19:17:17 +0200
Subject: [PATCH] Dashboard: Rename test Python to Misc

---
 tools/dashboard/dashboard.conf                       |  6 +++---
 .../{Dockerfile.test_python => Dockerfile.test_misc} | 12 ++++++------
 tools/docker/cp2k-ci.conf                            |  6 +++---
 tools/docker/generate_dockerfiles.py                 |  2 +-
 .../scripts/{install_python.sh => install_misc.sh}   |  0
 .../docker/scripts/{test_python.sh => test_misc.sh}  |  2 +-
 6 files changed, 14 insertions(+), 14 deletions(-)
 rename tools/docker/{Dockerfile.test_python => Dockerfile.test_misc} (69%)
 rename tools/docker/scripts/{install_python.sh => install_misc.sh} (100%)
 rename tools/docker/scripts/{test_python.sh => test_misc.sh} (97%)

diff --git a/tools/dashboard/dashboard.conf b/tools/dashboard/dashboard.conf
index aa24180caa..83bf90e098 100644
--- a/tools/dashboard/dashboard.conf
+++ b/tools/dashboard/dashboard.conf
@@ -230,11 +230,11 @@ host:        GCP
 report_url:  https://storage.googleapis.com/cp2k-ci/dashboard_gromacs_report.txt
 info_url:    http://cp2k.org/tools:gromacs
 
-[python]
+[misc]
 sortkey:     620
-name:        Python Scripts
+name:        Misc
 host:        GCP
-report_url:  https://storage.googleapis.com/cp2k-ci/dashboard_python_report.txt
+report_url:  https://storage.googleapis.com/cp2k-ci/dashboard_misc_report.txt
 
 [cmake]
 sortkey:     625
diff --git a/tools/docker/Dockerfile.test_python b/tools/docker/Dockerfile.test_misc
similarity index 69%
rename from tools/docker/Dockerfile.test_python
rename to tools/docker/Dockerfile.test_misc
index d89b29a425..d966890233 100644
--- a/tools/docker/Dockerfile.test_python
+++ b/tools/docker/Dockerfile.test_misc
@@ -1,14 +1,14 @@
 #
 # This file was created by generate_dockerfiles.py.
-# Usage: docker build -f ./Dockerfile.test_python ../../
+# Usage: docker build -f ./Dockerfile.test_misc ../../
 #
 
 FROM ubuntu:22.04
 
 # Install dependencies.
 WORKDIR /opt/cp2k
-COPY ./tools/docker/scripts/install_python.sh .
-RUN ./install_python.sh
+COPY ./tools/docker/scripts/install_misc.sh .
+RUN ./install_misc.sh
 
 # Install sources.
 ARG GIT_COMMIT_SHA
@@ -20,9 +20,9 @@ COPY ./cmake ./cmake
 COPY ./Makefile .
 RUN bash -c "if [ -n "${GIT_COMMIT_SHA}" ] ; then echo "git:\${GIT_COMMIT_SHA::7}" > REVISION; fi"
 
-# Run test for python.
-COPY ./tools/docker/scripts/test_python.sh .
-RUN ./test_python.sh 2>&1 | tee report.log
+# Run test for misc.
+COPY ./tools/docker/scripts/test_misc.sh .
+RUN ./test_misc.sh 2>&1 | tee report.log
 
 # Output the report if the image is old and was therefore pulled from the build cache.
 CMD cat $(find ./report.log -mmin +10) | sed '/^Summary:/ s/$/ (cached)/'
diff --git a/tools/docker/cp2k-ci.conf b/tools/docker/cp2k-ci.conf
index dbbeef24b4..b4f7d5c010 100644
--- a/tools/docker/cp2k-ci.conf
+++ b/tools/docker/cp2k-ci.conf
@@ -5,12 +5,12 @@ nodepools:    pool-t2d-4
 build_path:   /
 dockerfile:   /tools/docker/Dockerfile.test_precommit
 
-[python]
-display_name: Python
+[misc]
+display_name: Misc
 cpu:          1
 nodepools:    pool-t2d-4
 build_path:   /
-dockerfile:   /tools/docker/Dockerfile.test_python
+dockerfile:   /tools/docker/Dockerfile.test_misc
 
 #-------------------------------------------------------------------------------
 
diff --git a/tools/docker/generate_dockerfiles.py b/tools/docker/generate_dockerfiles.py
index 1bf3081c0d..0d934146c3 100755
--- a/tools/docker/generate_dockerfiles.py
+++ b/tools/docker/generate_dockerfiles.py
@@ -115,7 +115,7 @@ def main() -> None:
         with OutputFile(f"Dockerfile.test_{name}", args.check) as f:
             f.write(toolchain_full() + test_3rd_party(name))
 
-    for name in "python", "doxygen":
+    for name in "misc", "doxygen":
         with OutputFile(f"Dockerfile.test_{name}", args.check) as f:
             f.write(test_without_build(name))
 
diff --git a/tools/docker/scripts/install_python.sh b/tools/docker/scripts/install_misc.sh
similarity index 100%
rename from tools/docker/scripts/install_python.sh
rename to tools/docker/scripts/install_misc.sh
diff --git a/tools/docker/scripts/test_python.sh b/tools/docker/scripts/test_misc.sh
similarity index 97%
rename from tools/docker/scripts/test_python.sh
rename to tools/docker/scripts/test_misc.sh
index 9869d17ca3..00720b5378 100755
--- a/tools/docker/scripts/test_python.sh
+++ b/tools/docker/scripts/test_misc.sh
@@ -54,7 +54,7 @@ run_test mypy --strict ./tools/conventions/analyze_gfortran_ast.py
 # done
 
 echo ""
-echo "Summary: Python tests passed"
+echo "Summary: Miscellaneous tests passed"
 echo "Status: OK"
 
 #EOF