Commit bee5151a authored by Guilhem Saurel's avatar Guilhem Saurel
Browse files

[CI] use the same image for different branches

parent 29a92f16
Pipeline #12286 failed with stages
in 46 seconds
...@@ -74,33 +74,33 @@ variables: ...@@ -74,33 +74,33 @@ variables:
- workspace - workspace
stable-18.04-build: 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: only:
- stable - stable
<<: *build_definition <<: *build_definition
stable-16.04-build: 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 allow_failure: true
only: only:
- stable - stable
<<: *build_definition <<: *build_definition
devel-18.04-build: 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: only:
- devel - devel
<<: *build_definition <<: *build_definition
devel-16.04-build: 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 allow_failure: true
only: only:
- devel - devel
<<: *build_definition <<: *build_definition
stable-18.04-test: 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: dependencies:
- stable-18.04-build - stable-18.04-build
only: only:
...@@ -109,7 +109,7 @@ stable-18.04-test: ...@@ -109,7 +109,7 @@ stable-18.04-test:
stable-16.04-test: stable-16.04-test:
allow_failure: true 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: dependencies:
- stable-16.04-build - stable-16.04-build
only: only:
...@@ -118,7 +118,7 @@ stable-16.04-test: ...@@ -118,7 +118,7 @@ stable-16.04-test:
devel-18.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: dependencies:
- devel-18.04-build - devel-18.04-build
only: only:
...@@ -126,7 +126,7 @@ devel-18.04-test: ...@@ -126,7 +126,7 @@ devel-18.04-test:
<<: *test_definition <<: *test_definition
devel-16.04-test: 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 allow_failure: true
dependencies: dependencies:
- devel-16.04-build - devel-16.04-build
...@@ -135,7 +135,7 @@ devel-16.04-test: ...@@ -135,7 +135,7 @@ devel-16.04-test:
<<: *test_definition <<: *test_definition
stable-18.04-doc: 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: dependencies:
- stable-18.04-build - stable-18.04-build
only: only:
...@@ -143,7 +143,7 @@ stable-18.04-doc: ...@@ -143,7 +143,7 @@ stable-18.04-doc:
<<: *doc_definition <<: *doc_definition
stable-16.04-doc: 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 allow_failure: true
dependencies: dependencies:
- stable-16.04-build - stable-16.04-build
...@@ -152,7 +152,7 @@ stable-16.04-doc: ...@@ -152,7 +152,7 @@ stable-16.04-doc:
<<: *doc_definition <<: *doc_definition
devel-18.04-doc: 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: dependencies:
- devel-18.04-build - devel-18.04-build
only: only:
...@@ -160,7 +160,7 @@ devel-18.04-doc: ...@@ -160,7 +160,7 @@ devel-18.04-doc:
<<: *doc_definition <<: *doc_definition
devel-16.04-doc: 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 allow_failure: true
dependencies: dependencies:
- devel-16.04-build - devel-16.04-build
......
...@@ -26,13 +26,12 @@ You will find three files in the directory `${DEVEL_HPP_DIR}/tarball/`: ...@@ -26,13 +26,12 @@ You will find three files in the directory `${DEVEL_HPP_DIR}/tarball/`:
## Build docker images for CI ## Build docker images for CI
``` ```
branch=$(git branch --no-color | grep \* | cut -d' ' -f2)
for ubuntu in 16.04 18.04 for ubuntu in 16.04 18.04
do 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/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/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 done
``` ```
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment