From fc19d0b7094247fade8681d891e9d91ec1ad227c Mon Sep 17 00:00:00 2001
From: Blair Vanderlugt <blair.vanderlugt@gmail.com>
Date: Thu, 19 Aug 2021 11:13:03 -0400
Subject: [PATCH] finish cleaning up cache

---
 apps/cic-cache/.gitlab-ci.yml       | 55 ++++++++++++-----------------
 apps/cic-cache/docker/Dockerfile_ci | 37 -------------------
 2 files changed, 22 insertions(+), 70 deletions(-)
 delete mode 100644 apps/cic-cache/docker/Dockerfile_ci

diff --git a/apps/cic-cache/.gitlab-ci.yml b/apps/cic-cache/.gitlab-ci.yml
index 8d251cf2..4ff2ff3a 100644
--- a/apps/cic-cache/.gitlab-ci.yml
+++ b/apps/cic-cache/.gitlab-ci.yml
@@ -2,51 +2,40 @@
     variables:
         APP_NAME: cic-cache
 
-        #build-mr-cic-cache:
-        #    extends:
-        #        - .py_build_merge_request
-        #        - .cic_cache_variables
-        #    rules:
-        #    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-        #      changes:
-        #          - apps/cic-cache/**/*
-        #      when: always
+#build-mr-cic-cache:
+#    extends:
+#        - .py_build_merge_request
+#        - .cic_cache_variables
+#    rules:
+#    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+#      changes:
+#          - apps/cic-cache/**/*
+#      when: always
 
 test-mr-cic-cache:
     stage: test
     tags:
       - integration
     extends:
-        - .cic_cache_variables
+    - .cic_cache_variables
     cache:
-        key:
-            files:
-                - test_requirements.txt
-        paths:
-        - /root/.cache/pip
+      key:
+        files:
+        - test_requirements.txt
+      paths:
+      - /root/.cache/pip
     image: registry.gitlab.com/grassrootseconomics/cic-internal-integration/$APP_NAME:$MR_IMAGE_TAG
     script:
-        - cd apps/$APP_NAME/
-        - >
-          pip install --extra-index-url https://pip.grassrootseconomics.net:8433
-          --extra-index-url https://gitlab.com/api/v4/projects/27624814/packages/pypi/simple
-          -r test_requirements.txt 
-        - export PYTHONPATH=. && pytest -x --cov=cic_cache --cov-fail-under=90 --cov-report term-missing tests
+      - cd apps/$APP_NAME/
+      - >
+        pip install --extra-index-url https://pip.grassrootseconomics.net:8433
+        --extra-index-url https://gitlab.com/api/v4/projects/27624814/packages/pypi/simple
+        -r test_requirements.txt 
+      - export PYTHONPATH=. && pytest -x --cov=cic_cache --cov-fail-under=90 --cov-report term-missing tests
+    allow_failure: true
     needs: ["build-merge-request"]
     rules:
     - if: $CI_PIPELINE_SOURCE == "merge_request_event"
       changes:
           - apps/$APP_NAME/**/*
       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
-        
-
diff --git a/apps/cic-cache/docker/Dockerfile_ci b/apps/cic-cache/docker/Dockerfile_ci
deleted file mode 100644
index 9f49cac0..00000000
--- a/apps/cic-cache/docker/Dockerfile_ci
+++ /dev/null
@@ -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 []