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

finish cleaning up cache

Browse Source
This commit is contained in:
Blair Vanderlugt 2021-08-19 11:13:03 -04:00
parent 5cd3924b92
commit fc19d0b709
2 changed files with 22 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
apps/cic-cache/.gitlab-ci.yml
View File

@ -2,51 +2,40 @@
variables: variables:
APP_NAME: cic-cache APP_NAME: cic-cache
#build-mr-cic-cache: #build-mr-cic-cache:
# extends: # extends:
# - .py_build_merge_request # - .py_build_merge_request
# - .cic_cache_variables # - .cic_cache_variables
# rules: # rules:
# - if: $CI_PIPELINE_SOURCE == "merge_request_event" # - if: $CI_PIPELINE_SOURCE == "merge_request_event"
# changes: # changes:
# - apps/cic-cache/**/* # - apps/cic-cache/**/*
# when: always # when: always
test-mr-cic-cache: test-mr-cic-cache:
stage: test stage: test
tags: tags:
- integration - integration
extends: extends:
- .cic_cache_variables - .cic_cache_variables
cache: cache:
key: key:
files: files:
- test_requirements.txt - test_requirements.txt
paths: paths:
- /root/.cache/pip - /root/.cache/pip
image: registry.gitlab.com/grassrootseconomics/cic-internal-integration/$APP_NAME:$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/
- > - >
pip install --extra-index-url https://pip.grassrootseconomics.net:8433 pip install --extra-index-url https://pip.grassrootseconomics.net:8433
--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_cache --cov-fail-under=90 --cov-report term-missing tests - export PYTHONPATH=. && pytest -x --cov=cic_cache --cov-fail-under=90 --cov-report term-missing tests
allow_failure: true
needs: ["build-merge-request"] 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-cache:
# extends:
# - .py_build_push
# - .cic_cache_variables
# rules:
# - if: $CI_COMMIT_BRANCH == "master"
# changes:
# - apps/cic-cache/**/*
# when: always

37
apps/cic-cache/docker/Dockerfile_ci
View File

@ -1,37 +0,0 @@
# syntax = docker/dockerfile:1.2
FROM registry.gitlab.com/grassrootseconomics/cic-base-images:python-3.8.6-dev-55da5f4e as dev
# RUN pip install $pip_extra_index_url_flag cic-base[full_graph]==0.1.2b9
COPY requirements.txt .
#RUN pip install $pip_extra_index_url_flag -r test_requirements.txt
#RUN pip install $pip_extra_index_url_flag .
#RUN pip install .[server]
ARG EXTRA_INDEX_URL="https://pip.grassrootseconomics.net:8433"
ARG GITLAB_PYTHON_REGISTRY="https://gitlab.com/api/v4/projects/27624814/packages/pypi/simple"
RUN pip install --index-url https://pypi.org/simple \
--extra-index-url $GITLAB_PYTHON_REGISTRY --extra-index-url $EXTRA_INDEX_URL \
-r requirements.txt
COPY . .
RUN python setup.py install
# ini files in config directory defines the configurable parameters for the application
# they can all be overridden by environment variables
# to generate a list of environment variables from configuration, use: confini-dump -z <dir> (executable provided by confini package)
COPY config/ /usr/local/etc/cic-cache/
# for db migrations
RUN git clone https://github.com/vishnubob/wait-for-it.git /usr/local/bin/wait-for-it/
COPY cic_cache/db/migrations/ /usr/local/share/cic-cache/alembic/
COPY /docker/start_tracker.sh ./start_tracker.sh
COPY /docker/db.sh ./db.sh
RUN chmod 755 ./*.sh
# Tracker
# ENTRYPOINT ["/usr/local/bin/cic-cache-tracker", "-vv"]
# Server
# ENTRYPOINT [ "/usr/local/bin/uwsgi", "--wsgi-file", "/usr/local/lib/python3.8/site-packages/cic_cache/runnable/server.py", "--http", ":80", "--pyargv", "-vv" ]
ENTRYPOINT []