Fix frontend ctest.

.gitlab-ci.yml

@@ -8,9 +8,10 @@ stages:
 
 variables:
   # Docker image names
-  CONTAINER_GCC_IMAGE: $CI_REGISTRY/ogs/$CI_PROJECT_NAME/$CI_PROJECT_NAMESPACE/gcc:$CI_COMMIT_REF_SLUG
-  CONTAINER_GCC_GUI_IMAGE: $CI_REGISTRY/ogs/$CI_PROJECT_NAME/$CI_PROJECT_NAMESPACE/gcc-gui:$CI_COMMIT_REF_SLUG
-  CONTAINER_CLANG_IMAGE: $CI_REGISTRY/ogs/$CI_PROJECT_NAME/$CI_PROJECT_NAMESPACE/clang:$CI_COMMIT_REF_SLUG
+  CONTAINER_GCC_IMAGE: $CI_REGISTRY/ogs/$CI_PROJECT_NAME/gcc
+  CONTAINER_GCC_GUI_IMAGE: $CI_REGISTRY/ogs/$CI_PROJECT_NAME/gcc-gui
+  CONTAINER_CLANG_IMAGE: $CI_REGISTRY/ogs/$CI_PROJECT_NAME/clang
+  CONTAINER_TAG: latest
   XUNIT_TO_JUNIT_IMAGE: $CI_REGISTRY/ogs/$CI_PROJECT_NAME/xunit-to-junit
   PRECOMMIT_IMAGE: $CI_REGISTRY/ogs/$CI_PROJECT_NAME/pre-commit
   WEB_IMAGE: $CI_REGISTRY/ogs/$CI_PROJECT_NAME/web

scripts/ci/jobs/build_image.yml

 build container images:
   stage: .pre
   rules:
-    - changes:
-      - ThirdParty/container-maker
-      - scripts/ci/jobs/build_image.yml
-      when: always
+    # TODO
+    # - changes:
+      # - ThirdParty/container-maker
+      # - scripts/ci/jobs/build_image.yml
+      # when: always
     - if: '$CI_COMMIT_BRANCH == "master"'
       when: always
   tags:
@@ -15,18 +16,18 @@ build container images:
   extends: .container-maker-setup
   script:
     - docker login -u $OGS_CI_REGISTRY_USER -p $OGS_CI_REGISTRY_PASSWORD $CI_REGISTRY
-    - docker pull registry.opengeosys.org/ogs/ogs/ogs/gcc:master || true
+    - docker pull registry.opengeosys.org/ogs/ogs/ogs/gcc || true
     - python ThirdParty/container-maker/ogscm/cli.py --build --ogs off
       --pm system --cvode --cppcheck --docs --gcovr
-      --tag $CONTAINER_GCC_IMAGE --upload
-    - docker pull registry.opengeosys.org/ogs/ogs/ogs/gcc-gui:master || true
+      --tag $CONTAINER_GCC_IMAGE:$CONTAINER_TAG --upload
+    - docker pull registry.opengeosys.org/ogs/ogs/ogs/gcc-gui || true
     - python ThirdParty/container-maker/ogscm/cli.py --build --ogs off
       --pm system --cvode --cppcheck --docs --gcovr --gui
-      --tag $CONTAINER_GCC_GUI_IMAGE --upload
-    - docker pull registry.opengeosys.org/ogs/ogs/ogs/clang:master || true
+      --tag $CONTAINER_GCC_GUI_IMAGE:$CONTAINER_TAG --upload
+    - docker pull registry.opengeosys.org/ogs/ogs/ogs/clang || true
     - python ThirdParty/container-maker/ogscm/cli.py --build --ogs off
       --compiler clang --compiler_version 9
-      --tag $CONTAINER_CLANG_IMAGE --upload
+      --tag $CONTAINER_CLANG_IMAGE:$CONTAINER_TAG --upload
 
 ### global project images ###
 build xunit-to-junit image:

scripts/cmake/test/AddTestTester.cmake

@@ -32,6 +32,9 @@ foreach(CMD ${TESTER_COMMAND})
                 "did not match any files!")
         endif()
         foreach(FILE ${FILES})
+            if("$ENV{HOSTNAME}" MATCHES "frontend.*")
+                string(REPLACE "gpfs1" ".." FILE ${FILE})
+            endif()
             execute_process(
                 COMMAND ${SELECTED_DIFF_TOOL_PATH} ${SOURCE_PATH}/${FILE} ${BINARY_PATH}/${FILE} -a ${NAME_A} -b ${NAME_B} --abs ${ABS_TOL} --rel ${REL_TOL}
                 WORKING_DIRECTORY ${SOURCE_PATH}