Merge branch 'fix-master' into 'master'

[ci] Fix master

See merge request ogs/ogs!3143

container-maker @ ada9862a

-Subproject commit dd01b38f400a7e3dbfa85a3d7eeeddaa9bdd8c8f
+Subproject commit ada9862a5db500ed31b2c80c3d660ccdb6c016c3

scripts/ci/extends/container-maker-setup.yml

 .container-maker-setup:
   before_script:
     - git submodule update --init ThirdParty/container-maker
-    - virtualenv .venv
-    - source .venv/bin/activate
-    - pip install -r ThirdParty/container-maker/requirements.txt
-    - export PYTHONPATH="${PYTHONPATH}:${PWD}/ThirdParty/container-maker"
+    - cd ThirdParty/container-maker
+    - poetry install

scripts/ci/jobs/build_image.yml

@@ -9,13 +9,13 @@ build container images:
   extends: .container-maker-setup
   script:
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-    - python ThirdParty/container-maker/ogscm/cli.py --build --ogs off
+    - poetry run ogscm --build --ogs off
       --pm system --cvode --cppcheck --docs --gcovr --tfel --ccache
       --tag $CONTAINER_GCC_IMAGE --upload
-    - python ThirdParty/container-maker/ogscm/cli.py --build --ogs off
+    - poetry run ogscm --build --ogs off
       --pm system --cvode --cppcheck --docs --gcovr --gui --ccache
       --tag $CONTAINER_GCC_GUI_IMAGE --upload
-    - python ThirdParty/container-maker/ogscm/cli.py --build --ogs off
+    - poetry run ogscm --build --ogs off
       --compiler clang --compiler_version 9 --ccache
       --tag $CONTAINER_CLANG_IMAGE --upload
 

scripts/ci/jobs/check-header.yml

@@ -3,7 +3,7 @@ check header:
   allow_failure: true
   extends:
     - .rules-master-manual
-  dependencies: [meta_container]
+  dependencies: [meta, meta_container]
   variables:
     BUILD_DIR: "build-check-header"
     CMAKE_ARGS: "-DOGS_CHECK_HEADER_COMPILATION=ON -DOGS_BUILD_UTILS=ON -DOGS_BUILD_GUI=ON -DOGS_USE_PYTHON=ON -DBUILD_SHARED_LIBS=ON"

scripts/ci/jobs/container.yml

@@ -9,18 +9,18 @@ container:
     - .container-maker-setup
   script:
     - >
-      python ThirdParty/container-maker/ogscm/cli.py -B -C -R --ogs .
+      poetry run ogscm -B -C -R --ogs ../..
       --build_args ' --progress=plain'
       --pm system --cvode --ccache
       --cmake_args ' -DBUILD_TESTING=OFF'
     - >
-      python ThirdParty/container-maker/ogscm/cli.py -B -C -R --ogs .
+      poetry run ogscm -B -C -R --ogs ../..
       --build_args ' --progress=plain'
       --pm system --cvode --ccache
       --cmake_args ' -DBUILD_TESTING=OFF'
       --ompi 4.0.4 --insitu --mpi_benchmarks
     - >
-      python ThirdParty/container-maker/ogscm/cli.py -B -C -R --ogs .
+      poetry run ogscm -B -C -R --ogs ../..
       --build_args ' --progress=plain'
       --pm system --cvode --ccache
       --cmake_args ' -DBUILD_TESTING=OFF'
@@ -28,4 +28,4 @@ container:
   artifacts:
     name: container
     paths:
-      - _out/images/*.sif
+      - ThirdParty/container-maker/_out/images/*.sif

web/data/versions.json

@@ -17,7 +17,7 @@
     "vtk": "8.1.2",
     "petsc": "3.11.2",
     "qt": "5.12.4",
-    "python": "3.7"
+    "python": "3.6"
   },
   "tested_version": {
     "vtk": "8.2.0",