Skip to content

Commit

Permalink
Merge commit for 4.0.0 release
Browse files Browse the repository at this point in the history
  • Loading branch information
Kaian committed Feb 14, 2024
2 parents d4c64dc + 2d67e6d commit dd4287e
Show file tree
Hide file tree
Showing 802 changed files with 12,680 additions and 12,705 deletions.
290 changes: 163 additions & 127 deletions ChangeLog

Large diffs are not rendered by default.

63 changes: 62 additions & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ pipeline {
SYMFONY_PHPUNIT_DIR = "/opt/phpunit/"
SYMFONY_PHPUNIT_VERSION = "9.5.3"
DOCKER_IMAGE_TAG = getDockerImageTag()
JIRA_TICKET = getJiraTicket()
}

stages {
Expand Down Expand Up @@ -75,7 +76,7 @@ pipeline {
}
stage('test-backend') {
parallel {
stage('app-console') {
stage('app-generic') {
agent {
docker {
image "ironartemis/ivozprovider-testing-base:${env.DOCKER_IMAGE_TAG}"
Expand All @@ -85,6 +86,7 @@ pipeline {
}
steps {
sh '/opt/irontec/ivozprovider/library/bin/test-app-console'
sh '/opt/irontec/ivozprovider/library/bin/test-app-dependencies'
}
post {
success { notifySuccessGithub() }
Expand Down Expand Up @@ -472,6 +474,47 @@ pipeline {
}
}
}
// --------------------------------------------------------------------
// Functional Testing stage
// --------------------------------------------------------------------
stage('functional') {
steps {
script {
if (!env.JIRA_TICKET) {
echo "No ticket associated."
return
}

def issue = jiraGetIssue site: 'irontec.atlassian.net', idOrKey: env.JIRA_TICKET

// Functional Reviewer - 10105
if (issue.data.fields.customfield_10105) {
println "Functional Reviewer: ${issue.data.fields.customfield_10105.displayName}"
} else {
println "No functional reviewer assigned."
}

// Link issue Pull Request field with current branch
// customfield_10126 - Pull Request
def fields = [fields: [customfield_10126: env.JOB_BASE_NAME]]
jiraEditIssue site: 'irontec.atlassian.net', idOrKey: env.JIRA_TICKET, issue: fields

// Validated - 10325
def status = issue.data.fields.status
println "Issue Status: ${status.name} (${status.id})"

// For Issues with Functional reviewer and not validated
if (issue.data.fields.customfield_10105 && status.id != "10325") {
unstable "Functional approval required."
}
}
}
post {
success { notifySuccessGithub() }
failure { notifyFailureGithub() }
unstable { notifyUnstableGithub() }
}
}
}

// ------------------------------------------------------------------------
Expand All @@ -480,13 +523,23 @@ pipeline {
post {
failure { notifyFailureMattermost() }
fixed { notifyFixedMattermost() }
unstable { script { currentBuild.result = 'ABORTED' } }
cleanup { cleanWs() }
}
}

// -----------------------------------------------------------------------------
// Helper Functions
// -----------------------------------------------------------------------------
void getJiraTicket() {
def matcher = "${env.CHANGE_BRANCH}" =~ /^(?<jira>\w+-\d+)-.*$/
if (matcher.matches()) {
return matcher.group("jira")
} else {
return ""
}
}

boolean hasLabel(String label) {
return env.CHANGE_ID && pullRequest.labels.contains(label)
}
Expand Down Expand Up @@ -518,6 +571,14 @@ void notifyFailureGithub() {
])
}

void notifyUnstableGithub() {
githubNotify([
context: "ivozprovider-testing-${STAGE_NAME}",
description: "Cancelled",
status: "ERROR"
])
}

void notifyFailureMattermost() {
if (env.GIT_BRANCH == 'bleeding' || env.GIT_BRANCH == 'halliday') {
mattermostSend([
Expand Down
21 changes: 10 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<img src="web/admin/public/images/logoprovider.png" width="350"> ![stable](https://raster.shields.io/badge/stable-2.23-blue.png) ![release](https://raster.shields.io/badge/release-artemis-14b9bc.png)
<img src="web/admin/public/images/logoprovider.png" width="350"> ![stable](https://raster.shields.io/badge/stable-3.4-blue.png) ![release](https://raster.shields.io/badge/release-halliday-14b9bc.png)

Ivoz Provider is a multitenant solution for VoIP telephony providers designed for horizontal scaling and load balancing.

Expand All @@ -17,17 +17,15 @@ From its beginning, IvozProvider was designed to be installed distributed betwee
* Proxy:
- Provides **SIP communication** with Providers and Users terminals
- Provides **media relay** between endpoints
- Powered by [Kamailo SIP Server 5.6](https://www.kamailio.org/w/)
- Powered by [Kamailo SIP Server 5.7](https://www.kamailio.org/w/)

* Portal:
- Provides **Web interfaces** for all platform roles
- Access to all Bussiness data and shared files through **Rest API** services
- Management interfaces powered by [Klear Framework](https://www.irontec.com/internet/klear)
- User interface powered by [AngularJS](https://angularjs.org/)

* Application Server:
- Provides **PBX features** and runs configured logics
- Powered by [Asterisk 18 LTS](http://www.asterisk.org/) with [PJSIP](http://www.pjsip.org/) channel driver
- Powered by [Asterisk 20 LTS](http://www.asterisk.org/) with [PJSIP](http://www.pjsip.org/) channel driver
- Logics implemented in PHP using fastagi AGI

* Data:
Expand All @@ -48,11 +46,12 @@ There are [several ways](https://irontec.github.io/ivozprovider/en/artemis/basic
If you want to test an [standalone](https://irontec.github.io/ivozprovider/en/artemis/basic_concepts/installation/install_types.html#standalone-install) installation, we recommend using one of auto-install CDs based on Debian Stretch 9.4 amd64.


| Version | 64 bits | 32 bits |
|--------------------------|:---------------------------------------------------------------------------------------------------------------------------------------:|:-------:|
| oldstable (oasis 1.7) | [![iso http](web/admin/public/images/iso-http-green.png)](https://packages.irontec.com/isos/ivozprovider-1.7.1-oasis-amd64.iso) | [![iso http](web/admin/public/images/iso-http-green.png)](https://packages.irontec.com/isos/ivozprovider-1.7.1-oasis-i386.iso)|
| stable (artemis 2.23.0) | [![iso http](web/admin/public/images/iso-http-green.png)](https://packages.irontec.com/isos/ivozprovider-2.23~2.23.0-artemis-amd64.iso) | |
| testing (halliday 3.4.0) | [![iso http](web/admin/public/images/iso-http-green.png)](https://packages.irontec.com/isos/ivozprovider-3.4~3.4.0-halliday-amd64.iso) | |
| Version | 64 bits | 32 bits |
|----------------------------|:---------------------------------------------------------------------------------------------------------------------------------------:|:-------:|
| oldoldstable (oasis 1.7) | [![iso http](web/admin/public/images/iso-http-green.png)](https://packages.irontec.com/isos/ivozprovider-1.7.1-oasis-amd64.iso) | [![iso http](web/admin/public/images/iso-http-green.png)](https://packages.irontec.com/isos/ivozprovider-1.7.1-oasis-i386.iso)|
| oldstable (artemis 2.23.0) | [![iso http](web/admin/public/images/iso-http-green.png)](https://packages.irontec.com/isos/ivozprovider-2.23~2.23.0-artemis-amd64.iso) | |
| stable (halliday 3.4.1) | [![iso http](web/admin/public/images/iso-http-green.png)](https://packages.irontec.com/isos/ivozprovider-3.4~3.4.1-halliday-amd64.iso) | |
| testing (tempest 4.0.0) | [![iso http](web/admin/public/images/iso-http-green.png)](https://packages.irontec.com/isos/ivozprovider-4.0~4.0.0-tempest-amd64.iso) | |


You can read about differences between releases [here](https://github.com/irontec/ivozprovider/blob/bleeding/FAQ.md#what-release-should-i-use).
Expand Down Expand Up @@ -81,7 +80,7 @@ Don't hesitate to [contact us](https://www.irontec.com/contacto) for support if

## License
Ivoz Provider - Multitenant solution for VoIP telephony providers
Copyright (C) 2014-2018 Irontec S.L.
Copyright (C) 2014-2024 Irontec S.L.

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
3 changes: 3 additions & 0 deletions asterisk/agi/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@
},
"platform": {
"php": "8.0.9"
},
"allow-plugins": {
"symfony/flex": true
}
},
"require": {
Expand Down
Loading

0 comments on commit dd4287e

Please sign in to comment.