kamikazechaser/cic-internal-integration
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

clarity of build step names and remove unused code

Browse Source
This commit is contained in:
Blair Vanderlugt 2021-05-25 07:38:39 -07:00
parent d2ea3358c7
commit a82c5d1d10
2 changed files with 13 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
apps/cic-eth/.gitlab-ci.yml
View File

@ -3,35 +3,29 @@
APP_NAME: cic-eth APP_NAME: cic-eth
DOCKERFILE_PATH: $APP_NAME/docker/Dockerfile DOCKERFILE_PATH: $APP_NAME/docker/Dockerfile
# build-mr-cic-eth: .cic_eth_changes_target:
# extends:
# - .py_build_merge_request
# - .cic_eth_variables
build-mr-unittest-cic-eth:
extends:
- .cic_eth_variables
- .py_build_unittest_merge_request
rules: rules:
- if: $CI_PIPELINE_SOURCE == "merge_request_event" - if: $CI_PIPELINE_SOURCE == "merge_request_event"
# changes: changes:
# - $CONTEXT/$APP_NAME/**/* - $CONTEXT/$APP_NAME/**/*
when: always when: always
build-mr-cic-eth:
extends:
- .cic_eth_variables
- .cic_eth_changes_target
- .py_build_target_test
test-mr-cic-eth: test-mr-cic-eth:
extends: extends:
- .cic_eth_variables - .cic_eth_variables
- .cic_eth_changes_target
stage: test stage: test
image: $CI_REGISTRY_IMAGE/$APP_NAME-test:latest image: $CI_REGISTRY_IMAGE/$APP_NAME-test:latest
script: script:
- cd apps/$APP_NAME/ - cd apps/$APP_NAME/
- pytest tests/unit/ - pytest tests/unit/
rules:
- if: $CI_PIPELINE_SOURCE == "merge_request_event"
# changes:
# - $CONTEXT/$APP_NAME/**/*
when: always
build-push-cic-eth: build-push-cic-eth:
extends: extends:

16
ci_templates/.cic-template.yml
View File

@ -18,7 +18,7 @@ variables:
- if: $CI_PIPELINE_SOURCE == "merge_request_event" - if: $CI_PIPELINE_SOURCE == "merge_request_event"
when: always when: always
.py_build_unittest_merge_request: .py_build_target_test:
stage: build stage: build
variables: variables:
CI_DEBUG_TRACE: "true" CI_DEBUG_TRACE: "true"
@ -30,20 +30,6 @@ variables:
- if: $CI_PIPELINE_SOURCE == "merge_request_event" - if: $CI_PIPELINE_SOURCE == "merge_request_event"
when: always when: always
# .py_unittest_merge_request:
# stage: test
# image: $CI_REGISTRY_IMAGE/$APP_NAME-test:latest
# script:
# - ls
# - pwd
# - env
# - cd apps/$APP_NAME/
# - pytest
# rules:
# - if: $CI_PIPELINE_SOURCE == "merge_request_event"
# when: always
.py_build_push: .py_build_push:
stage: build stage: build
variables: variables: