diff options
| author | Andrew Dolgov <[email protected]> | 2023-10-29 09:21:48 +0300 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2023-10-29 09:25:01 +0300 |
| commit | adf3985afa594d0107bbaba2a0d5c3871ebc8701 (patch) | |
| tree | aff1384fb301c0a892e6267881bbf55dfa21e4f4 | |
| parent | afaef667830bad008c4d64b812719992e7091b57 (diff) | |
fix circular dependency
| -rw-r--r-- | .gitlab-ci.yml | 22 | ||||
| -rw-r--r-- | tests/integration/ApiTest.php | 3 |
2 files changed, 12 insertions, 13 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0f1109dc6..b6a82636a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -61,6 +61,18 @@ phpdoc: chmod 0600 ~/.ssh/id_ed25519 - rsync -av -e 'ssh -o StrictHostKeyChecking=no' phpdoc/ ${PHPDOC_DEPLOY_HOST}:phpdoc/ +phpunit-integration: + image: ${PHP_IMAGE} + variables: + TEST_HELM_REPO: https://gitlab.tt-rss.org/tt-rss/helm-charts/tt-rss + extends: .integration-test + script: + - export K8S_NAMESPACE=$(kubectl get pods -o=custom-columns=NS:.metadata.namespace | tail -1) + - export API_URL="http://tt-rss-${CI_COMMIT_SHORT_SHA}-app.$K8S_NAMESPACE.svc.cluster.local/tt-rss/api/" + - php82 vendor/bin/phpunit --group integration + rules: + - if: $CI_COMMIT_BRANCH + selenium: image: ${SELENIUM_IMAGE} variables: @@ -75,16 +87,6 @@ selenium: needs: - job: phpunit-integration -phpunit-integration: - image: ${PHP_IMAGE} - extends: selenium - script: - - export K8S_NAMESPACE=$(kubectl get pods -o=custom-columns=NS:.metadata.namespace | tail -1) - - export API_URL="http://tt-rss-${CI_COMMIT_SHORT_SHA}-app.$K8S_NAMESPACE.svc.cluster.local/tt-rss/api/" - - php82 vendor/bin/phpunit --group integration - rules: - - if: $CI_COMMIT_BRANCH - ttrss-web-nginx:publish: stage: publish extends: .build-master diff --git a/tests/integration/ApiTest.php b/tests/integration/ApiTest.php index 8f0759e68..80f8af983 100644 --- a/tests/integration/ApiTest.php +++ b/tests/integration/ApiTest.php @@ -8,11 +8,8 @@ final class ApiTest extends TestCase { private $api_url; function __construct() { - $this->api_url = getenv('API_URL'); - print_r($this->api_url); - parent::__construct(); } |