Add Gitlab CI support

diff --git a/.gitignore b/.gitignore
index c8dd7299099199214d6cbbd8077c43c875eff857..f37d9719312943b514b71071697f2dfefa49b476 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
-config.cfg
-*.env
+/config.cfg
+/*.env
 *.sqlite
 .vscode
 custom.css

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644 (file)
index 0000000..c0d85bc
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,22 @@
+image: docker/compose
+services:
+  - docker:dind
+cache:
+  key: "$CI_COMMIT_REF_SLUG"
+  paths:
+    - /var/lib/docker
+
+# build:
+#   stage: build
+#   script:
+#     - cp utils/gitlabci/* .
+#     - docker-compose build
+
+UI_Test:
+  stage: test
+  script:
+    - cp utils/gitlabci/* .
+    - docker-compose up -d
+    - ./utils/run_migrations.sh
+    - ./utils/tests.sh
+    - docker-compose down

diff --git a/.pylintrc b/.pylintrc
new file mode 100644 (file)
index 0000000..d629e71
--- /dev/null
+++ b/.pylintrc
@@ -0,0 +1 @@
+ignored-classes=SQLObject,Registrant,scoped_session

diff --git a/app/tests/utils.py b/app/tests/utils.py
index 214630ec869111fd93cfb313bc1c0cc7281f3959..782bb1de62e706421e6fde7d5e2f8ed6df390c6d 100644 (file)
--- a/app/tests/utils.py
+++ b/app/tests/utils.py
@@ -16,6 +16,7 @@ def recreate_db():
        populate(db.session)
        db.session.commit()
 
+
 @pytest.fixture
 def client():
        app.config["TESTING"] = True

diff --git a/requirements.txt b/requirements.txt
index f840f58d3fd9de31d9a1d775104e990f7c58e79b..9473f9f809254b89b13d70bb2b3384d3716e99a3 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -23,3 +23,4 @@ redis~=3.3
 psycopg2~=2.7
 
 pytest ~= 5.3
+pytest-cov ~= 2.8

diff --git a/utils/bash.sh b/utils/bash.sh
index 8a3c6a0e39e6d76258bc7255703df632988ea2cf..e39e0627e47a0d346467b5a49b30c972ce4a55e7 100755 (executable)
--- a/utils/bash.sh
+++ b/utils/bash.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 # Open SSH to app instance
 

diff --git a/utils/create_migration.sh b/utils/create_migration.sh
index 910344c53e606eb377440d6408b67156d7638db1..4c739371dd4f29a8ac2f583f84da4fdad4d5aba7 100755 (executable)
--- a/utils/create_migration.sh
+++ b/utils/create_migration.sh
@@ -1,9 +1,9 @@
-#!/bin/bash
+#!/bin/sh
 
 # Create a database migration, and copy it back to the host.
 
-docker exec -it contentdb_app_1 sh -c "FLASK_CONFIG=../config.cfg FLASK_APP=app/__init__.py flask db migrate"
-docker exec -u root -it contentdb_app_1 sh -c "cp /home/cdb/migrations/versions/* /source/migrations/versions/"
+docker exec contentdb_app_1 sh -c "FLASK_CONFIG=../config.cfg FLASK_APP=app/__init__.py flask db migrate"
+docker exec -u root contentdb_app_1 sh -c "cp /home/cdb/migrations/versions/* /source/migrations/versions/"
 
 USER=$(whoami)
 sudo chown -R $USER:$USER migrations/versions

diff --git a/utils/db.sh b/utils/db.sh
index f7f6af293d538f2cb3c498cbc924bb78f1ca4da0..1ad5cc81e005b5a5faca47ede231b2dd128ed4b0 100755 (executable)
--- a/utils/db.sh
+++ b/utils/db.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 # Open SQL console for the database
 

diff --git a/utils/gitlabci/config.cfg b/utils/gitlabci/config.cfg
new file mode 100644 (file)
index 0000000..b34934f
--- /dev/null
+++ b/utils/gitlabci/config.cfg
@@ -0,0 +1,31 @@
+USER_APP_NAME="Content DB"
+SERVER_NAME="localhost:5123"
+BASE_URL="http://" + SERVER_NAME
+
+SECRET_KEY="changeme"
+WTF_CSRF_SECRET_KEY="changeme"
+
+SQLALCHEMY_DATABASE_URI = "postgres://contentdb:password@db:5432/contentdb"
+
+GITHUB_CLIENT_ID = ""
+GITHUB_CLIENT_SECRET = ""
+
+REDIS_URL='redis://redis:6379'
+CELERY_BROKER_URL='redis://redis:6379'
+CELERY_RESULT_BACKEND='redis://redis:6379'
+
+USER_ENABLE_USERNAME = True
+USER_ENABLE_REGISTER = False
+USER_ENABLE_CHANGE_USERNAME = False
+USER_ENABLE_EMAIL = False
+
+MAIL_UTILS_ERROR_SEND_TO = [""]
+
+UPLOAD_DIR="/var/cdb/uploads/"
+THUMBNAIL_DIR="/var/cdb/thumbnails/"
+
+TEMPLATES_AUTO_RELOAD = True
+
+LANGUAGES = {
+    'en': 'English',
+}

diff --git a/utils/gitlabci/config.env b/utils/gitlabci/config.env
new file mode 100644 (file)
index 0000000..925271c
--- /dev/null
+++ b/utils/gitlabci/config.env
@@ -0,0 +1,4 @@
+POSTGRES_USER=contentdb
+POSTGRES_PASSWORD=password
+POSTGRES_DB=contentdb
+FLASK_DEBUG=1

diff --git a/utils/reload.sh b/utils/reload.sh
index 2b21e799d0471907066bfffa9cce88a887e8d62c..5d2f2d11a3ff7fb1f831db2a5cdbdad4ed1961c9 100755 (executable)
--- a/utils/reload.sh
+++ b/utils/reload.sh
@@ -1,5 +1,5 @@
-#!/bin/bash
+#!/bin/sh
 
 # Hot/live reload - only works in debug mode
 
-docker exec -it contentdb_app_1 sh -c "cp -r /source/* ."
+docker exec contentdb_app_1 sh -c "cp -r /source/* ."

diff --git a/utils/run_migrations.sh b/utils/run_migrations.sh
index d2f0e7b458c14fd90825855a5d2556951d4edc47..64774af980c4637a97b7ec8518368a58015a8216 100755 (executable)
--- a/utils/run_migrations.sh
+++ b/utils/run_migrations.sh
@@ -1,5 +1,5 @@
-#!/bin/bash
+#!/bin/sh
 
 # Run all pending migrations
 
-docker exec -it contentdb_app_1 sh -c "FLASK_CONFIG=../config.cfg FLASK_APP=app/__init__.py flask db upgrade"
+docker exec contentdb_app_1 sh -c "FLASK_CONFIG=../config.cfg FLASK_APP=app/__init__.py flask db upgrade"

diff --git a/utils/tests.sh b/utils/tests.sh
index adedcf4a4aa9cc748039672be549540ed2529319..82df3d157bf32f65a2b5d595f27ff903948d1555 100755 (executable)
--- a/utils/tests.sh
+++ b/utils/tests.sh
@@ -1,3 +1,3 @@
-#!/bin/bash
+#!/bin/sh
 
-docker exec -it contentdb_app_1 sh -c "FLASK_CONFIG=../config.cfg FLASK_APP=app/__init__.py python -m pytest app/tests/ --disable-warnings"
+docker exec contentdb_app_1 sh -c "FLASK_CONFIG=../config.cfg FLASK_APP=app/__init__.py python -m pytest app/tests/ --cov=app --disable-warnings"