summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2023-10-21 19:55:15 +0300
committerAndrew Dolgov <[email protected]>2023-10-21 19:55:15 +0300
commitff818a75f0fa94bb64f5c9cdc2ba0574cba4a2e8 (patch)
treec731205533c46f81e5805919ec539426d0032500
parent03e956132d4a4b880d4e4533aeab725b0b2b5b52 (diff)
test stub
-rw-r--r--.gitlab-ci.yml15
1 files changed, 13 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f11fa7931..1e340107a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,7 @@
stages:
- lint
- build
+ - test
variables:
ESLINT_PATHS: js plugins
@@ -12,6 +13,9 @@ include:
- project: 'ci/ci-templates'
ref: master
file: .ci-lint-common.yml
+ - project: 'ci/ci-templates'
+ ref: master
+ file: .ci-integration-test.yml
phpunit:
extends: .phpunit
@@ -23,7 +27,7 @@ phpstan:
extends: .phpstan
ttrss-web-nginx:
- extends: .build-master
+ extends: .build-master-commit-only
variables:
DOCKERFILE: ${CI_PROJECT_DIR}/.docker/web-nginx/Dockerfile
@@ -33,7 +37,7 @@ ttrss-web-nginx:branch:
DOCKERFILE: ${CI_PROJECT_DIR}/.docker/web-nginx/Dockerfile
ttrss-fpm-pgsql-static:
- extends: .build-master
+ extends: .build-master-commit-only
variables:
DOCKERFILE: ${CI_PROJECT_DIR}/.docker/app/Dockerfile
@@ -57,3 +61,10 @@ phpdoc:
cp ${PHPDOC_DEPLOY_SSH_KEY} ~/.ssh/id_ed25519 &&
chmod 0600 ~/.ssh/id_ed25519
- rsync -av -e 'ssh -o StrictHostKeyChecking=no' phpdoc/ ${PHPDOC_DEPLOY_HOST}:phpdoc/
+
+integration-test:
+ variables:
+ TEST_HELM_REPO: https://gitlab.tt-rss.org/tt-rss/helm-charts/tt-rss
+ extends: .integration-test
+ rules:
+ - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH