diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 596bb59c45d17ae63d3faf40d6de065707adf92e..0a8cf8e653ff4653aff6558e2cd05dedf388645b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,22 +13,16 @@ build-tag: - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY script: - IMAGE_1="$CI_REGISTRY_IMAGE/pvs_core" - - docker pull "$IMAGE_1":latest || true - docker build --cache-from "$IMAGE_1":latest -t "$IMAGE_1":dev -t "$IMAGE_1":$CI_COMMIT_TAG core/ - IMAGE_2="$CI_REGISTRY_IMAGE/pvs_preprocessor" - - docker pull "$IMAGE_2":latest || true - docker build --cache-from "$IMAGE_2":latest -t "$IMAGE_2":dev -t "$IMAGE_2":$CI_COMMIT_TAG preprocessor/ - IMAGE_3="$CI_REGISTRY_IMAGE/pvs_client" - - docker pull "$IMAGE_3":latest || true - docker build --cache-from "$IMAGE_3":latest -t "$IMAGE_3":dev -t "$IMAGE_3":$CI_COMMIT_TAG client/ - IMAGE_4="$CI_REGISTRY_IMAGE/pvs_cache" - - docker pull "$IMAGE_4":latest || true - docker build --cache-from "$IMAGE_4":latest -t "$IMAGE_4":dev -t "$IMAGE_4":$CI_COMMIT_TAG cache/ - IMAGE_5="$CI_REGISTRY_IMAGE/fluentd" - - docker pull "$IMAGE_5":latest || true - docker build --cache-from "$IMAGE_5":latest -t "$IMAGE_5":dev -t "$IMAGE_5":$CI_COMMIT_TAG fluentd/ - IMAGE_6="$CI_REGISTRY_IMAGE/pvs_ingestor" - - docker pull "$IMAGE_6":latest || true - docker build --cache-from "$IMAGE_6":latest -t "$IMAGE_6":dev -t "$IMAGE_6":$CI_COMMIT_TAG ingestor/ - cd ./testing && ./gitlab_test.sh - if [ $? -ne 0 ]; then exit 1; fi # actually fail build