|
|
|
@ -24,7 +24,6 @@ build-job:
|
|
|
|
stage: build
|
|
|
|
stage: build
|
|
|
|
before_script:
|
|
|
|
before_script:
|
|
|
|
- sudo docker login -u $CI_DEPLOY_USER -p $CI_DEPLOY_PASSWORD $CI_REGISTRY
|
|
|
|
- sudo docker login -u $CI_DEPLOY_USER -p $CI_DEPLOY_PASSWORD $CI_REGISTRY
|
|
|
|
- cat docker-compose.test.yml
|
|
|
|
|
|
|
|
script:
|
|
|
|
script:
|
|
|
|
- sudo docker pull $IMAGE_NAME:latest || true
|
|
|
|
- sudo docker pull $IMAGE_NAME:latest || true
|
|
|
|
- sudo docker build --cache-from $IMAGE_NAME:latest --tag $IMAGE_NAME:$CI_COMMIT_SHORT_SHA --tag $IMAGE_NAME:latest .
|
|
|
|
- sudo docker build --cache-from $IMAGE_NAME:latest --tag $IMAGE_NAME:$CI_COMMIT_SHORT_SHA --tag $IMAGE_NAME:latest .
|
|
|
|
@ -56,7 +55,7 @@ deploy-test-job:
|
|
|
|
REMOTE_USER: $REMOTE_USER_TEST
|
|
|
|
REMOTE_USER: $REMOTE_USER_TEST
|
|
|
|
COMPOSE: docker-compose.test.yml
|
|
|
|
COMPOSE: docker-compose.test.yml
|
|
|
|
rules:
|
|
|
|
rules:
|
|
|
|
- if: $CI_COMMIT_BRANCH == 'ssst_main'
|
|
|
|
- if: $CI_COMMIT_BRANCH == 'sst_main'
|
|
|
|
|
|
|
|
|
|
|
|
pylint:
|
|
|
|
pylint:
|
|
|
|
<<: *use_cached_requirements
|
|
|
|
<<: *use_cached_requirements
|
|
|
|
|
Dmitry Titov
3 years ago