diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bcc9e130e2238e0a6025b73456696c8283c2c0ce..8a6b9273572106de9983bbd65662014781aa9535 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,10 +1,14 @@
-image: registry.edugit.org/teckids/team-sysadmin/docker-images/python-pimped:master
-
stages:
- test
- build
- deploy
+include:
+ - local: "/ci/test.yml"
+ - local: "/ci/build_dist.yml"
+ - local: "/ci/build_docker.yml"
+ - local: "/ci/deploy.yml"
+
variables:
GIT_SUBMODULE_STRATEGY: recursive
PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
@@ -18,105 +22,3 @@ cache:
paths:
- .cache/pip
- .tox
-
-test:
- stage: test
- services:
- - name: selenium/standalone-firefox
- alias: selenium
- before_script:
- - adduser --disabled-password --gecos "Test User" testuser
- - chown -R testuser .
- script:
- - sudo apt update
- - sudo apt install python3-ldap libldap2-dev libssl-dev libsasl2-dev python3.7-dev -y
- - sudo -u testuser
- env TEST_SELENIUM_HUB=http://selenium:4444/wd/hub
- TEST_SELENIUM_BROWSERS=firefox
- TEST_HOST=build
- tox -e selenium -- --junitxml=.tox/junit.xml
- artifacts:
- paths:
- - .tox/screenshots
- reports:
- junit: .tox/junit.xml
-
-lint:
- stage: test
- script:
- - tox -e lint,security
-
-build_dist:
- stage: build
- script:
- - tox -e build
- artifacts:
- paths:
- - dist/
-
-pages:
- stage: deploy
- before_script:
- - cp -r .tox/screenshots/firefox docs/screenshots
- script:
- - export LC_ALL=en_GB.utf8
- - tox -e docs -- BUILDDIR=../public/docs
- artifacts:
- paths:
- - public/
- only:
- - master
-
-build_docker:
- stage: build
- image:
- name: gcr.io/kaniko-project/executor:v0.22.0
- entrypoint: [""]
- script:
- - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" >/kaniko/.docker/config.json
- - /kaniko/executor
- --context $CI_PROJECT_DIR
- --dockerfile $CI_PROJECT_DIR/Dockerfile
- --destination $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME
- --cache=true
- --cleanup
- - /kaniko/executor
- --context $CI_PROJECT_DIR/docker/nginx
- --dockerfile $CI_PROJECT_DIR/docker/nginx/Dockerfile
- --destination $CI_REGISTRY_IMAGE/nginx:$CI_COMMIT_REF_NAME
- --cache=true
- --cleanup
- only:
- - master
- - tags
-
-deploy_demo-master:
- stage: deploy
- environment:
- name: demo/master
- url: http://demo-master.aleksis.org
- before_script:
- - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )'
- - eval $(ssh-agent -s)
- - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add -
- - mkdir -p ~/.ssh
- - chmod 700 ~/.ssh
- - echo "$SSH_KNOWN_HOSTS" >~/.ssh/known_hosts
- - chmod 644 ~/.ssh/known_hosts
- script:
- - grep -v "build:" docker-compose.yml | ssh root@demo-master.aleksis.org
- env ALEKSIS_IMAGE_TAG=${CI_COMMIT_REF_NAME}
- docker-compose
- -p aleksis-${CI_ENVIRONMENT_SLUG}
- -f /dev/stdin
- pull
- - grep -v "build:" docker-compose.yml | ssh root@demo-master.aleksis.org
- env ALEKSIS_IMAGE_TAG=${CI_COMMIT_REF_NAME}
- NGINX_HTTP_PORT=80
- ALEKSIS_maintenance__debug=true
- docker-compose
- -p aleksis-${CI_ENVIRONMENT_SLUG}
- -f /dev/stdin
- up -d
- only:
- - master
diff --git a/ci/build_dist.yml b/ci/build_dist.yml
new file mode 100644
index 0000000000000000000000000000000000000000..939cdf326decd7642edff67a62f84ff028f30d56
--- /dev/null
+++ b/ci/build_dist.yml
@@ -0,0 +1,7 @@
+build_dist:
+ stage: build
+ script:
+ - tox -e build
+ artifacts:
+ paths:
+ - dist/
diff --git a/ci/build_docker.yml b/ci/build_docker.yml
new file mode 100644
index 0000000000000000000000000000000000000000..83955938ce3f756d7947d18515cdf469a7bd92d8
--- /dev/null
+++ b/ci/build_docker.yml
@@ -0,0 +1,24 @@
+image: registry.edugit.org/teckids/team-sysadmin/docker-images/python-pimped:master
+
+build_docker:
+ stage: build
+ image:
+ name: gcr.io/kaniko-project/executor:v0.22.0
+ entrypoint: [""]
+ script:
+ - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" >/kaniko/.docker/config.json
+ - /kaniko/executor
+ --context $CI_PROJECT_DIR
+ --dockerfile $CI_PROJECT_DIR/Dockerfile
+ --destination $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME
+ --cache=true
+ --cleanup
+ - /kaniko/executor
+ --context $CI_PROJECT_DIR/docker/nginx
+ --dockerfile $CI_PROJECT_DIR/docker/nginx/Dockerfile
+ --destination $CI_REGISTRY_IMAGE/nginx:$CI_COMMIT_REF_NAME
+ --cache=true
+ --cleanup
+ only:
+ - master
+ - tags
diff --git a/ci/deploy.yml b/ci/deploy.yml
new file mode 100644
index 0000000000000000000000000000000000000000..d01e23e4f3436bc8dd4849d283038591157e9668
--- /dev/null
+++ b/ci/deploy.yml
@@ -0,0 +1,43 @@
+pages:
+ stage: deploy
+ before_script:
+ - cp -r .tox/screenshots/firefox docs/screenshots
+ script:
+ - export LC_ALL=en_GB.utf8
+ - tox -e docs -- BUILDDIR=../public/docs
+ artifacts:
+ paths:
+ - public/
+ only:
+ - master
+
+deploy_demo-master:
+ stage: deploy
+ environment:
+ name: demo/master
+ url: http://demo-master.aleksis.org
+ before_script:
+ - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )'
+ - eval $(ssh-agent -s)
+ - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add -
+ - mkdir -p ~/.ssh
+ - chmod 700 ~/.ssh
+ - echo "$SSH_KNOWN_HOSTS" >~/.ssh/known_hosts
+ - chmod 644 ~/.ssh/known_hosts
+ script:
+ - grep -v "build:" docker-compose.yml | ssh root@demo-master.aleksis.org
+ env ALEKSIS_IMAGE_TAG=${CI_COMMIT_REF_NAME}
+ docker-compose
+ -p aleksis-${CI_ENVIRONMENT_SLUG}
+ -f /dev/stdin
+ pull
+ - grep -v "build:" docker-compose.yml | ssh root@demo-master.aleksis.org
+ env ALEKSIS_IMAGE_TAG=${CI_COMMIT_REF_NAME}
+ NGINX_HTTP_PORT=80
+ ALEKSIS_maintenance__debug=true
+ docker-compose
+ -p aleksis-${CI_ENVIRONMENT_SLUG}
+ -f /dev/stdin
+ up -d
+ only:
+ - master
diff --git a/ci/test.yml b/ci/test.yml
new file mode 100644
index 0000000000000000000000000000000000000000..2ab64bc324536c8716c5cb8641d09d9c43dbf844
--- /dev/null
+++ b/ci/test.yml
@@ -0,0 +1,26 @@
+test:
+ stage: test
+ services:
+ - name: selenium/standalone-firefox
+ alias: selenium
+ before_script:
+ - adduser --disabled-password --gecos "Test User" testuser
+ - chown -R testuser .
+ script:
+ - sudo apt update
+ - sudo apt install python3-ldap libldap2-dev libssl-dev libsasl2-dev python3.7-dev -y
+ - sudo -u testuser
+ env TEST_SELENIUM_HUB=http://selenium:4444/wd/hub
+ TEST_SELENIUM_BROWSERS=firefox
+ TEST_HOST=build
+ tox -e selenium -- --junitxml=.tox/junit.xml
+ artifacts:
+ paths:
+ - .tox/screenshots
+ reports:
+ junit: .tox/junit.xml
+
+lint:
+ stage: test
+ script:
+ - tox -e lint,security