diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ff4d0f751acee91cdec5294505b49a7eeb66cc36..41881fb18837aa49a123a90ca43c521d79fac545 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,6 +8,8 @@ variables: CRC_BOOK_TMP: /tmp/crc_book_tests_tmp DOCKER_BUILDKIT: 1 DOCKER_DRIVER: overlay2 + CACHE_IMAGE_BASE: $CI_REGISTRY_IMAGE:otbtf-base + CACHE_IMAGE_BUILDER: $CI_REGISTRY_IMAGE:builder workflow: rules: @@ -33,47 +35,33 @@ docker image: - echo -n $CI_REGISTRY_PASSWORD | docker login -u $CI_REGISTRY_USER --password-stdin $CI_REGISTRY timeout: 10 hours script: - - docker pull $CI_REGISTRY_IMAGE:otbtf-base-$CI_COMMIT_REF_NAME || - - docker pull $CI_REGISTRY_IMAGE:builder-$CI_COMMIT_REF_NAME || - - docker pull $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME || - - docker pull $CI_REGISTRY_IMAGE:otbtf-base-cpu-basic-test || - - docker pull $CI_REGISTRY_IMAGE:builder-cpu-basic-test || - - docker pull $CI_REGISTRY_IMAGE:cpu-basic-test || - > docker build --target otbtf-base --network="host" - --cache-from $CI_REGISTRY_IMAGE:otbtf-base-cpu-basic-test - --cache-from $CI_REGISTRY_IMAGE:otbtf-base-$CI_COMMIT_REF_NAME - --tag $CI_REGISTRY_IMAGE:otbtf-base-$CI_COMMIT_REF_NAME + --cache-from $CACHE_IMAGE_BASE + --tag $CACHE_IMAGE_BASE --build-arg BASE_IMG="ubuntu:20.04" --build-arg BUILDKIT_INLINE_CACHE=1 - . - - docker push $CI_REGISTRY_IMAGE:otbtf-base-$CI_COMMIT_REF_NAME + "." - > docker build --target builder --network="host" - --cache-from $CI_REGISTRY_IMAGE:otbtf-base-cpu-basic-test - --cache-from $CI_REGISTRY_IMAGE:otbtf-base-$CI_COMMIT_REF_NAME - --cache-from $CI_REGISTRY_IMAGE:builder-cpu-basic-test - --cache-from $CI_REGISTRY_IMAGE:builder-$CI_COMMIT_REF_NAME - --tag $CI_REGISTRY_IMAGE:builder-$CI_COMMIT_REF_NAME + --cache-from $CACHE_IMAGE_BASE + --cache-from $CACHE_IMAGE_BUILDER + --tag $CACHE_IMAGE_BUILDER --build-arg OTBTESTS="true" --build-arg KEEP_SRC_OTB="true" --build-arg BZL_CONFIGS="" --build-arg BASE_IMG="ubuntu:20.04" --build-arg BUILDKIT_INLINE_CACHE=1 - . - - docker push $CI_REGISTRY_IMAGE:builder-$CI_COMMIT_REF_NAME + "." - > docker build --network="host" - --cache-from $CI_REGISTRY_IMAGE:otbtf-base-cpu-basic-test - --cache-from $CI_REGISTRY_IMAGE:otbtf-base-$CI_COMMIT_REF_NAME - --cache-from $CI_REGISTRY_IMAGE:builder-cpu-basic-test - --cache-from $CI_REGISTRY_IMAGE:builder-$CI_COMMIT_REF_NAME - --cache-from $CI_REGISTRY_IMAGE:cpu-basic-test + --cache-from $CACHE_IMAGE_BASE + --cache-from $CACHE_IMAGE_BUILDER --cache-from $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME --tag $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME --build-arg OTBTESTS="true" @@ -81,15 +69,11 @@ docker image: --build-arg BZL_CONFIGS="" --build-arg BASE_IMG="ubuntu:20.04" --build-arg BUILDKIT_INLINE_CACHE=1 - . - - docker push $CI_REGISTRY_IMAGE:builder-$CI_COMMIT_REF_NAME + "." after_script: - - docker tag $CI_REGISTRY_IMAGE:otbtf-base-$CI_COMMIT_REF_NAME $CI_REGISTRY_IMAGE:otbtf-base-cpu-basic-test - - docker tag $CI_REGISTRY_IMAGE:builder-$CI_COMMIT_REF_NAME $CI_REGISTRY_IMAGE:builder-cpu-basic-test - - docker tag $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME $CI_REGISTRY_IMAGE:cpu-basic-test - - docker push $CI_REGISTRY_IMAGE:otbtf-base-cpu-basic-test - - docker push $CI_REGISTRY_IMAGE:builder-cpu-basic-test - - docker push $CI_REGISTRY_IMAGE:cpu-basic-test + - docker push $CACHE_IMAGE_BASE + - docker push $CACHE_IMAGE_BUILDER + - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME .static_analysis_base: stage: Static Analysis @@ -172,12 +156,6 @@ deploy: - develop script: - echo "Shippping!" - - docker pull $CI_REGISTRY_IMAGE:otbtf-base-$CI_COMMIT_REF_NAME - - docker pull $CI_REGISTRY_IMAGE:builder-$CI_COMMIT_REF_NAME - docker pull $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME - - docker tag $CI_REGISTRY_IMAGE:otbtf-base-$CI_COMMIT_REF_NAME $CI_REGISTRY_IMAGE:otbtf-base-cpu-basic-test - - docker tag $CI_REGISTRY_IMAGE:builder-$CI_COMMIT_REF_NAME $CI_REGISTRY_IMAGE:builder-cpu-basic-test - docker tag $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME $CI_REGISTRY_IMAGE:cpu-basic-test - - docker push $CI_REGISTRY_IMAGE:otbtf-base-cpu-basic-test - - docker push $CI_REGISTRY_IMAGE:builder-cpu-basic-test - docker push $CI_REGISTRY_IMAGE:cpu-basic-test