mirror of
https://gitlab.linphone.org/BC/public/flexisip-account-manager.git
synced 2026-01-17 01:58:07 +00:00
Fix #37 Run tests under Rockylinux 8 and Debian 11
Log an error if the FlexisipPusher is used but not properly configured
This commit is contained in:
Timothée Jaussoin
parent
448e200a72
commit
668a7758c4
5 changed files with 66 additions and 27 deletions
|
|
@ -28,12 +28,12 @@ centos7-rpm:
|
|||
|
||||
rocky8-rpm:
|
||||
extends: .rpm
|
||||
image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-rocky8-php
|
||||
image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-rocky8-php:2022_10_18_fix_centos_eol_repository
|
||||
|
||||
centos7-rpm-test:
|
||||
tags: ["docker-centos7"]
|
||||
tags: ["docker"]
|
||||
image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-centos7-php
|
||||
dependencies:
|
||||
needs:
|
||||
- centos7-rpm
|
||||
|
||||
stage: test
|
||||
|
|
@ -51,6 +51,49 @@ centos7-rpm-test:
|
|||
when: always
|
||||
expire_in: 1 day
|
||||
|
||||
rocky8-rpm-test:
|
||||
tags: ["docker"]
|
||||
image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-rocky8-php:2022_10_18_fix_centos_eol_repository
|
||||
needs:
|
||||
- rocky8-rpm
|
||||
|
||||
stage: test
|
||||
script:
|
||||
- yum -y localinstall rpmbuild/x86_64/*.rpm
|
||||
- cd /opt/belledonne-communications/share/flexisip-account-manager/flexiapi
|
||||
- vendor/bin/phpcs
|
||||
- vendor/bin/phpmd . ansi phpmd.xml
|
||||
- php artisan key:generate
|
||||
- vendor/bin/phpunit --log-junit $CI_PROJECT_DIR/flexiapi_phpunit.log
|
||||
artifacts:
|
||||
paths:
|
||||
- $CI_PROJECT_DIR/flexiapi_phpunit.log
|
||||
- flexiapi/storage/logs/
|
||||
when: always
|
||||
expire_in: 1 day
|
||||
|
||||
debian11-deb-test:
|
||||
tags: ["docker"]
|
||||
image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian11-php:20221029_belledone_apt_repository
|
||||
needs:
|
||||
- debian11-deb
|
||||
|
||||
stage: test
|
||||
script:
|
||||
- sudo -s apt update
|
||||
- sudo -s apt -y install bc-flexisip-account-manager
|
||||
- cd /opt/belledonne-communications/share/flexisip-account-manager/flexiapi
|
||||
- vendor/bin/phpcs
|
||||
- vendor/bin/phpmd . ansi phpmd.xml
|
||||
- php artisan key:generate
|
||||
- vendor/bin/phpunit --log-junit $CI_PROJECT_DIR/flexiapi_phpunit.log
|
||||
artifacts:
|
||||
paths:
|
||||
- $CI_PROJECT_DIR/flexiapi_phpunit.log
|
||||
- flexiapi/storage/logs/
|
||||
when: always
|
||||
expire_in: 1 day
|
||||
|
||||
.package-deploy:
|
||||
before_script:
|
||||
- if ! [ -z ${SCP_PRIVATE_KEY+x} ]; then eval $(ssh-agent -s); fi
|
||||
|
|
@ -75,7 +118,7 @@ centos7-rpm-test:
|
|||
extends: .rpm-deploy
|
||||
tags: ["docker-centos7"]
|
||||
|
||||
dependencies:
|
||||
needs:
|
||||
- centos7-rpm
|
||||
|
||||
centos7-rpm-deploy-stable:
|
||||
|
|
@ -91,7 +134,7 @@ centos7-rpm-deploy-alpha:
|
|||
.rocky8-rpm-deploy:
|
||||
extends: .rpm-deploy
|
||||
tags: ["docker"]
|
||||
dependencies:
|
||||
needs:
|
||||
- rocky8-rpm
|
||||
|
||||
# rocky8-rpm-deploy-stable:
|
||||
|
|
@ -104,7 +147,7 @@ rocky8-rpm-deploy-alpha:
|
|||
variables:
|
||||
DEPLOY_DIRECTORY_STATE: $CENTOS8_DEPLOY_DIRECTORY_ALPHA
|
||||
|
||||
debian11-packaging:
|
||||
debian11-deb:
|
||||
tags: ["docker"]
|
||||
image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian11-php:20220413_flexiapi_packaging
|
||||
|
||||
|
|
@ -125,8 +168,8 @@ debian11-packaging:
|
|||
extends: .package-deploy
|
||||
tags: ["docker"]
|
||||
image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian11-php:20220413_flexiapi_packaging
|
||||
dependencies:
|
||||
- debian11-packaging
|
||||
needs:
|
||||
- debian11-deb
|
||||
variables:
|
||||
RELEASE: bullseye
|
||||
FREIGHT_PATH: $DEBIAN_FREIGHT_CONF_PATH
|
||||
|
|
|
|||
13
docker/bc-dev-debian11-php.docker
Normal file
13
docker/bc-dev-debian11-php.docker
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
FROM gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian11:2022_10_13_update_docker_image
|
||||
|
||||
MAINTAINER Peio Rigaux <peio.rigaux@belledonne-communications.com>
|
||||
|
||||
USER root
|
||||
|
||||
# Install dependencies
|
||||
RUN apt update && apt -y install php php-xml php-curl composer rsync
|
||||
|
||||
# Setup the Debian repository
|
||||
RUN apt install wget
|
||||
RUN wget https://linphone.org/snapshots/debian/keyring.gpg -O - | sudo apt-key add -
|
||||
RUN echo 'deb [arch=amd64] http://linphone.org/snapshots/debian '$(lsb_release -cs)' stable' > /etc/apt/sources.list.d/belledonne.list
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
FROM gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-centos8:20210217_python3
|
||||
FROM gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-centos8:2022_10_13_update_docker_image
|
||||
USER root
|
||||
|
||||
# Install dependencies
|
||||
|
|
|
|||
|
|
@ -1,17 +0,0 @@
|
|||
FROM centos/httpd-24-centos7
|
||||
MAINTAINER Jehan Monnier <jehan.monnier@linphone.org>
|
||||
|
||||
USER root
|
||||
|
||||
# Install dependencies
|
||||
RUN yum -y install epel-release
|
||||
COPY rpmbuild/x86_64/bc-flexisip-account-manager-*.rpm /
|
||||
# Install lime-server
|
||||
RUN yum -y localinstall /bc-flexisip-account-manager-*.rpm
|
||||
#bc-flexisip-account-manager
|
||||
|
||||
# Apache configuration
|
||||
# account manager is reachable on port 8082
|
||||
#RUN sed -i 's/8080/8082/g' /opt/rh/httpd24/root/etc/httpd/conf/httpd.conf
|
||||
# do not mess with ssl server from other containers
|
||||
#RUN sed -i 's/8443/9443/g' /opt/rh/httpd24/root/etc/httpd/conf.d/ssl.conf
|
||||
|
|
@ -40,7 +40,7 @@ return [
|
|||
* External interfaces
|
||||
*/
|
||||
'flexisip_proxy_pid' => env('APP_FLEXISIP_PROXY_PID', '/var/run/flexisip-proxy.pid'),
|
||||
'flexisip_pusher_path' => env('APP_FLEXISIP_PUSHER_PATH', ''),
|
||||
'flexisip_pusher_path' => env('APP_FLEXISIP_PUSHER_PATH', null),
|
||||
'linphone_daemon_unix_pipe' => env('APP_LINPHONE_DAEMON_UNIX_PATH', null),
|
||||
|
||||
/**
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue