Only do vcs after building image

This commit is contained in:
Ingo Lütkebohle 2019-07-05 12:09:43 +00:00
parent 13a3cabc2e
commit 91a3deacec

View file

@ -8,12 +8,15 @@ variables:
services: services:
- docker:dind - docker:dind
before_script: stage:
- vcs import < instrumentation.repos - deps
- build
build_enabled: build_enabled:
image: $base_image_id image: $base_image_id
stage: build
script: script:
- vcs import < instrumentation.repos
- lttng-sessiond --daemonize - lttng-sessiond --daemonize
- . /root/ws/install/local_setup.sh - . /root/ws/install/local_setup.sh
- colcon build --symlink-install --cmake-args " -DWITH_LTTNG=ON" --packages-up-to $PACKAGES_LIST - colcon build --symlink-install --cmake-args " -DWITH_LTTNG=ON" --packages-up-to $PACKAGES_LIST
@ -33,6 +36,7 @@ build_enabled:
- /.*docker.*/ - /.*docker.*/
ci_base_image: ci_base_image:
stage: deps
image: docker:stable image: docker:stable
script: script:
- docker build --tag $base_image_id -f docker-ci-base/Dockerfile . - docker build --tag $base_image_id -f docker-ci-base/Dockerfile .