Ubuntu 18: switch Python2 to Python3

espressomd · May 14, 2019 · ea71ab1 · ea71ab1
1 parent 3d76fcb
commit ea71ab1
Showing 1 changed file with 3 additions and 15 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: gitlab.icp.uni-stuttgart.de:4567/espressomd/docker/ubuntu:18.04
+image: gitlab.icp.uni-stuttgart.de:4567/espressomd/docker/ubuntu-python3:18.04
 
 stages:
   - permission
@@ -71,7 +71,7 @@ default:
   <<: *global_job_definition
   stage: build
   script:
-    - export with_cuda=false myconfig=default with_coverage=true
+    - export with_cuda=false myconfig=default with_coverage=true python_version=3
     - bash maintainer/CI/build_cmake.sh
   tags:
     - docker
@@ -80,28 +80,16 @@ default:
 maxset:
   <<: *global_job_definition
   stage: build
-  script:
-    - export with_cuda=false myconfig=maxset with_coverage=true
-    - bash maintainer/CI/build_cmake.sh
-  tags:
-    - docker
-    - linux
-
-maxset-python3:
-  <<: *global_job_definition
-  stage: build
-  image: gitlab.icp.uni-stuttgart.de:4567/espressomd/docker/ubuntu-python3:18.04
   script:
     - export myconfig=maxset with_coverage=true python_version=3
     - bash maintainer/CI/build_cmake.sh
   tags:
     - docker
     - linux
 
-no_rotation-python3:
+no_rotation:
   <<: *global_job_definition
   stage: build
-  image: gitlab.icp.uni-stuttgart.de:4567/espressomd/docker/ubuntu-python3:18.04
   script:
     - export myconfig=no_rotation with_coverage=true python_version=3
     - bash maintainer/CI/build_cmake.sh