[CI] use the same image for different branches

.gitlab-ci.yml

@@ -74,33 +74,33 @@ variables:
         - workspace
 
 stable-18.04-build:
-    image: gitlab.laas.fr:4567/humanoid-path-planner/hpp-doc/stable-premade:18.04
+    image: gitlab.laas.fr:4567/humanoid-path-planner/hpp-doc/premade:18.04
     only:
       - stable
     <<: *build_definition
 
 stable-16.04-build:
-    image: gitlab.laas.fr:4567/humanoid-path-planner/hpp-doc/stable-premade:16.04
+    image: gitlab.laas.fr:4567/humanoid-path-planner/hpp-doc/premade:16.04
     allow_failure: true
     only:
       - stable
     <<: *build_definition
 
 devel-18.04-build:
-    image: gitlab.laas.fr:4567/humanoid-path-planner/hpp-doc/devel-premade:18.04
+    image: gitlab.laas.fr:4567/humanoid-path-planner/hpp-doc/premade:18.04
     only:
       -  devel
     <<: *build_definition
 
 devel-16.04-build:
-    image: gitlab.laas.fr:4567/humanoid-path-planner/hpp-doc/devel-premade:16.04
+    image: gitlab.laas.fr:4567/humanoid-path-planner/hpp-doc/premade:16.04
     allow_failure: true
     only:
       -  devel
     <<: *build_definition
 
 stable-18.04-test:
-    image: gitlab.laas.fr:4567/humanoid-path-planner/hpp-doc/stable-premade:18.04
+    image: gitlab.laas.fr:4567/humanoid-path-planner/hpp-doc/premade:18.04
     dependencies:
       - stable-18.04-build
     only:
@@ -109,7 +109,7 @@ stable-18.04-test:
 
 stable-16.04-test:
     allow_failure: true
-    image: gitlab.laas.fr:4567/humanoid-path-planner/hpp-doc/stable-premade:16.04
+    image: gitlab.laas.fr:4567/humanoid-path-planner/hpp-doc/premade:16.04
     dependencies:
       - stable-16.04-build
     only:
@@ -118,7 +118,7 @@ stable-16.04-test:
 
 
 devel-18.04-test:
-    image: gitlab.laas.fr:4567/humanoid-path-planner/hpp-doc/devel-premade:18.04
+    image: gitlab.laas.fr:4567/humanoid-path-planner/hpp-doc/premade:18.04
     dependencies:
       - devel-18.04-build
     only:
@@ -126,7 +126,7 @@ devel-18.04-test:
     <<: *test_definition
 
 devel-16.04-test:
-    image: gitlab.laas.fr:4567/humanoid-path-planner/hpp-doc/devel-premade:16.04
+    image: gitlab.laas.fr:4567/humanoid-path-planner/hpp-doc/premade:16.04
     allow_failure: true
     dependencies:
       - devel-16.04-build
@@ -135,7 +135,7 @@ devel-16.04-test:
     <<: *test_definition
 
 stable-18.04-doc:
-    image: gitlab.laas.fr:4567/humanoid-path-planner/hpp-doc/stable-premade:18.04
+    image: gitlab.laas.fr:4567/humanoid-path-planner/hpp-doc/premade:18.04
     dependencies:
       - stable-18.04-build
     only:
@@ -143,7 +143,7 @@ stable-18.04-doc:
     <<: *doc_definition
 
 stable-16.04-doc:
-    image: gitlab.laas.fr:4567/humanoid-path-planner/hpp-doc/stable-premade:16.04
+    image: gitlab.laas.fr:4567/humanoid-path-planner/hpp-doc/premade:16.04
     allow_failure: true
     dependencies:
       - stable-16.04-build
@@ -152,7 +152,7 @@ stable-16.04-doc:
     <<: *doc_definition
 
 devel-18.04-doc:
-    image: gitlab.laas.fr:4567/humanoid-path-planner/hpp-doc/devel-premade:18.04
+    image: gitlab.laas.fr:4567/humanoid-path-planner/hpp-doc/premade:18.04
     dependencies:
       - devel-18.04-build
     only:
@@ -160,7 +160,7 @@ devel-18.04-doc:
     <<: *doc_definition
 
 devel-16.04-doc:
-    image: gitlab.laas.fr:4567/humanoid-path-planner/hpp-doc/devel-premade:16.04
+    image: gitlab.laas.fr:4567/humanoid-path-planner/hpp-doc/premade:16.04
     allow_failure: true
     dependencies:
       - devel-16.04-build

scripts/README.md

@@ -26,13 +26,12 @@ You will find three files in the directory `${DEVEL_HPP_DIR}/tarball/`:
 ## Build docker images for CI
 
 ```
-branch=$(git branch --no-color | grep \* | cut -d' ' -f2)
 for ubuntu in 16.04 18.04
 do
     docker build -t gitlab.laas.fr:4567/humanoid-path-planner/hpp-doc/ubuntu:${ubuntu} -f .dockers/ubuntu-${ubuntu}/Dockerfile ./scripts
-    docker build -t gitlab.laas.fr:4567/humanoid-path-planner/hpp-doc/${branch}-premade:${ubuntu} -f .dockers/ubuntu-${ubuntu}/Dockerfile.premade ./scripts
+    docker build -t gitlab.laas.fr:4567/humanoid-path-planner/hpp-doc/premade:${ubuntu} -f .dockers/ubuntu-${ubuntu}/Dockerfile.premade ./scripts
     docker push gitlab.laas.fr:4567/humanoid-path-planner/hpp-doc/ubuntu:${ubuntu}
-    docker push gitlab.laas.fr:4567/humanoid-path-planner/hpp-doc/${branch}-premade:${ubuntu}
+    docker push gitlab.laas.fr:4567/humanoid-path-planner/hpp-doc/premade:${ubuntu}
 done
 ```