tests for the rests

This commit is contained in:
Blair Vanderlugt 2021-08-19 11:41:49 -04:00
parent fc19d0b709
commit 8ea77cff6b
4 changed files with 78 additions and 106 deletions

View File

@ -1,21 +1,21 @@
.cic_eth_variables: .cic_eth_variables:
variables: variables:
APP_NAME: cic-eth APP_NAME: cic-eth
DOCKERFILE_PATH: docker/Dockerfile_ci
CONTEXT: apps/$APP_NAME
build-mr-cic-eth: #build-mr-cic-eth:
extends: # extends:
- .cic_eth_variables # - .cic_eth_variables
- .py_build_target_dev # - .py_build_target_dev
rules: # rules:
- if: $CI_PIPELINE_SOURCE == "merge_request_event" # - if: $CI_PIPELINE_SOURCE == "merge_request_event"
changes: # changes:
- apps/cic-eth/**/* # - apps/cic-eth/**/*
when: always # when: always
test-mr-cic-eth: test-mr-cic-eth:
stage: test stage: test
tags:
- integration
extends: extends:
- .cic_eth_variables - .cic_eth_variables
cache: cache:
@ -24,7 +24,7 @@ test-mr-cic-eth:
- test_requirements.txt - test_requirements.txt
paths: paths:
- /root/.cache/pip - /root/.cache/pip
image: $MR_IMAGE_TAG image: registry.gitlab.com/grassrootseconomics/cic-internal-integration/$APP_NAME:$MR_IMAGE_TAG
script: script:
- cd apps/$APP_NAME/ - cd apps/$APP_NAME/
- > - >
@ -34,19 +34,20 @@ test-mr-cic-eth:
-r services_requirements.txt -r services_requirements.txt
-r test_requirements.txt -r test_requirements.txt
- export PYTHONPATH=. && pytest -x --cov=cic_eth --cov-fail-under=90 --cov-report term-missing tests - export PYTHONPATH=. && pytest -x --cov=cic_eth --cov-fail-under=90 --cov-report term-missing tests
needs: ["build-mr-cic-eth"] allow_failure: true
needs: ["build-merge-request"]
rules: rules:
- if: $CI_PIPELINE_SOURCE == "merge_request_event" - if: $CI_PIPELINE_SOURCE == "merge_request_event"
changes: changes:
- apps/cic-eth/**/* - apps/$APP_NAME/**/*
when: always when: always
build-push-cic-eth: #build-push-cic-eth:
extends: # extends:
- .py_build_push # - .py_build_push
- .cic_eth_variables # - .cic_eth_variables
rules: # rules:
- if: $CI_COMMIT_BRANCH == "master" # - if: $CI_COMMIT_BRANCH == "master"
changes: # changes:
- apps/cic-eth/**/* # - apps/cic-eth/**/*
when: always # when: always

View File

@ -5,39 +5,32 @@
DOCKERFILE_PATH: docker/Dockerfile_ci DOCKERFILE_PATH: docker/Dockerfile_ci
CONTEXT: apps/$APP_NAME CONTEXT: apps/$APP_NAME
build-mr-cic-meta: #build-mr-cic-meta:
extends: # extends:
- .py_build_merge_request # - .py_build_merge_request
- .cic_meta_variables # - .cic_meta_variables
rules: # rules:
- if: $CI_PIPELINE_SOURCE == "merge_request_event" # - if: $CI_PIPELINE_SOURCE == "merge_request_event"
changes: # changes:
- apps/cic-meta/**/* # - apps/cic-meta/**/*
when: always # when: always
test-mr-cic-meta: test-mr-cic-meta:
stage: test
tags:
- integration
extends: extends:
- .cic_meta_variables - .cic_meta_variables
stage: test image: registry.gitlab.com/grassrootseconomics/cic-internal-integration/$APP_NAME:$MR_IMAGE_TAG
image: $MR_IMAGE_TAG
script: script:
- cd /root - cd /root
- npm install --dev - npm install --dev
- npm run test - npm run test
- npm run test:coverage - npm run test:coverage
needs: ["build-mr-cic-meta"] allow_failure: true
needs: ["build-merge-request"]
rules: rules:
- if: $CI_PIPELINE_SOURCE == "merge_request_event" - if: $CI_PIPELINE_SOURCE == "merge_request_event"
changes: changes:
- apps/cic-meta/**/* - apps/$APP_NAME/**/*
when: always
build-push-cic-meta:
extends:
- .py_build_push
- .cic_meta_variables
rules:
- if: $CI_COMMIT_BRANCH == "master"
changes:
- apps/cic-meta/**/*
when: always when: always

View File

@ -1,21 +1,21 @@
.cic_notify_variables: .cic_notify_variables:
variables: variables:
APP_NAME: cic-notify APP_NAME: cic-notify
DOCKERFILE_PATH: docker/Dockerfile_ci
CONTEXT: apps/$APP_NAME
build-mr-cic-notify: #build-mr-cic-notify:
extends: # extends:
- .py_build_merge_request # - .py_build_merge_request
- .cic_notify_variables # - .cic_notify_variables
rules: # rules:
- if: $CI_PIPELINE_SOURCE == "merge_request_event" # - if: $CI_PIPELINE_SOURCE == "merge_request_event"
changes: # changes:
- apps/cic-notify/**/* # - apps/cic-notify/**/*
when: always # when: always
test-mr-cic-notify: test-mr-cic-notify:
stage: test stage: test
tags:
- integration
extends: extends:
- .cic_notify_variables - .cic_notify_variables
cache: cache:
@ -24,7 +24,7 @@ test-mr-cic-notify:
- test_requirements.txt - test_requirements.txt
paths: paths:
- /root/.cache/pip - /root/.cache/pip
image: $MR_IMAGE_TAG image: registry.gitlab.com/grassrootseconomics/cic-internal-integration/$APP_NAME:$MR_IMAGE_TAG
script: script:
- cd apps/$APP_NAME/ - cd apps/$APP_NAME/
- > - >
@ -32,21 +32,10 @@ test-mr-cic-notify:
--extra-index-url https://gitlab.com/api/v4/projects/27624814/packages/pypi/simple --extra-index-url https://gitlab.com/api/v4/projects/27624814/packages/pypi/simple
-r test_requirements.txt -r test_requirements.txt
- export PYTHONPATH=. && pytest -x --cov=cic_notify --cov-fail-under=90 --cov-report term-missing tests - export PYTHONPATH=. && pytest -x --cov=cic_notify --cov-fail-under=90 --cov-report term-missing tests
needs: ["build-mr-cic-notify"] allow_failure: true
needs: ["build-merge-request"]
rules: rules:
- if: $CI_PIPELINE_SOURCE == "merge_request_event" - if: $CI_PIPELINE_SOURCE == "merge_request_event"
changes: changes:
- apps/$APP_NAME/**/* - apps/$APP_NAME/**/*
when: always when: always
build-push-cic-notify:
extends:
- .py_build_push
- .cic_notify_variables
rules:
- if: $CI_COMMIT_BRANCH == "master"
changes:
- apps/cic-notify/**/*
when: always

View File

@ -1,21 +1,21 @@
.cic_ussd_variables: .cic_ussd_variables:
variables: variables:
APP_NAME: cic-ussd APP_NAME: cic-ussd
DOCKERFILE_PATH: docker/Dockerfile_ci
CONTEXT: apps/$APP_NAME
build-mr-cic-ussd: #build-mr-cic-ussd:
extends: # extends:
- .py_build_merge_request # - .py_build_merge_request
- .cic_ussd_variables # - .cic_ussd_variables
rules: # rules:
- if: $CI_PIPELINE_SOURCE == "merge_request_event" # - if: $CI_PIPELINE_SOURCE == "merge_request_event"
changes: # changes:
- apps/cic-ussd/**/* # - apps/cic-ussd/**/*
when: always # when: always
test-mr-cic-ussd: test-mr-cic-ussd:
stage: test stage: test
tags:
- integration
extends: extends:
- .cic_ussd_variables - .cic_ussd_variables
cache: cache:
@ -24,7 +24,7 @@ test-mr-cic-ussd:
- test_requirements.txt - test_requirements.txt
paths: paths:
- /root/.cache/pip - /root/.cache/pip
image: $MR_IMAGE_TAG image: registry.gitlab.com/grassrootseconomics/cic-internal-integration/$APP_NAME:$MR_IMAGE_TAG
script: script:
- cd apps/$APP_NAME/ - cd apps/$APP_NAME/
- > - >
@ -32,21 +32,10 @@ test-mr-cic-ussd:
--extra-index-url https://gitlab.com/api/v4/projects/27624814/packages/pypi/simple --extra-index-url https://gitlab.com/api/v4/projects/27624814/packages/pypi/simple
-r test_requirements.txt -r test_requirements.txt
- export PYTHONPATH=. && pytest -x --cov=cic_ussd --cov-fail-under=90 --cov-report term-missing tests/cic_ussd - export PYTHONPATH=. && pytest -x --cov=cic_ussd --cov-fail-under=90 --cov-report term-missing tests/cic_ussd
needs: ["build-mr-cic-ussd"] allow_failure: true
needs: ["build-merge-request"]
rules: rules:
- if: $CI_PIPELINE_SOURCE == "merge_request_event" - if: $CI_PIPELINE_SOURCE == "merge_request_event"
changes: changes:
- apps/$APP_NAME/**/* - apps/$APP_NAME/**/*
when: always when: always
build-push-cic-ussd:
extends:
- .py_build_push
- .cic_ussd_variables
rules:
- if: $CI_COMMIT_BRANCH == "master"
changes:
- apps/cic-ussd/**/*
when: always