fix circular dependency

This commit is contained in:
Andrew Dolgov 2023-10-29 09:21:48 +03:00
parent afaef66783
commit adf3985afa
No known key found for this signature in database
GPG Key ID: 1A56B4FA25D4AF2A
2 changed files with 12 additions and 13 deletions

View File

@ -61,6 +61,18 @@ phpdoc:
chmod 0600 ~/.ssh/id_ed25519 chmod 0600 ~/.ssh/id_ed25519
- rsync -av -e 'ssh -o StrictHostKeyChecking=no' phpdoc/ ${PHPDOC_DEPLOY_HOST}:phpdoc/ - 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: selenium:
image: ${SELENIUM_IMAGE} image: ${SELENIUM_IMAGE}
variables: variables:
@ -75,16 +87,6 @@ selenium:
needs: needs:
- job: phpunit-integration - 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: ttrss-web-nginx:publish:
stage: publish stage: publish
extends: .build-master extends: .build-master

View File

@ -8,11 +8,8 @@ final class ApiTest extends TestCase {
private $api_url; private $api_url;
function __construct() { function __construct() {
$this->api_url = getenv('API_URL'); $this->api_url = getenv('API_URL');
print_r($this->api_url);
parent::__construct(); parent::__construct();
} }