uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-11 18:16:24 +05:00
Code Issues Packages Projects Releases Wiki Activity

Updated version

Browse Source
This commit is contained in:
Trial97
2020-02-07 12:27:13 +02:00
committed by Dan Christian Bogos
parent e221082fed
commit 783b6040d8
9 changed files with 54 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
data/ansible/packages/distributions.conf.j2
View File

@@ -1,4 +1,15 @@
{{ ansible_managed | comment }}
Origin: apt.cgrates.org
Label: apt.cgrates.org
Suite: stable
Codename: v0.10
Architectures: amd64
Components: main
Description: CGRateS v0.10 APT repository
SignWith: yes
DebOverride: override.testing
DscOverride: override.testing
Origin: apt.cgrates.org
Label: apt.cgrates.org
Suite: stable

14
data/ansible/packages/main.yaml
View File

@@ -205,16 +205,24 @@
- hosts: pkg
remote_user: '{{ gouser }}'
tasks:
- name: Creates directory
become: yes
file:
path: /var/packages/debian/master/
state: directory
- name: Remove symlink from current deb package
become: yes
shell: "sudo rm /var/packages/debian/cgrates_current_amd64.deb"
file:
path: /var/packages/debian/master/cgrates_current_amd64.deb
state: absent
- name: Move the new package to /var/packages/debian
become: yes
shell: "sudo mv /tmp/{{ item}} /var/packages/debian/"
shell: "sudo mv /tmp/{{ item}} /var/packages/debian/master/"
with_items: "{{ hostvars['apt']['debFileName']['stdout_lines'] }}"
- name: Create the new symlink cgrates_current_amd64.deb
become: yes
shell: "sudo ln -s /var/packages/debian/{{ item }} /var/packages/debian/cgrates_current_amd64.deb"
shell: "sudo ln -s /var/packages/debian/master/{{ item }} /var/packages/debian/master/cgrates_current_amd64.deb"
with_items: "{{ hostvars['apt']['debFileName']['stdout_lines'] }}"

4
docs/conf.py
View File

@@ -48,9 +48,9 @@ copyright = u'2012-2020, ITsysCOM GmbH'
# built documents.
#
# The short X.Y version.
version = '0.9.1'
version = '0.11.0'
# The full version, including alpha/beta/rc tags.
release = '0.9.1~rc8'
release = '0.11.0~dev'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.

4
docs/installation.rst
View File

@@ -57,8 +57,8 @@ Run the following commands:
::
wget http://pkg.cgrates.org/debian/cgrates_current_amd64.deb
dpkg -i cgrates_0.9.1~rc8_amd64.deb
wget http://pkg.cgrates.org/debian/master/cgrates_current_amd64.deb
dpkg -i cgrates_current_amd64.deb
As a side note on http://pkg.cgrates.org one can find an entire archive of CGRateS packages.

12
packages/debian/changelog
View File

@@ -1,3 +1,15 @@
cgrates (0.11.0~dev) UNRELEASED; urgency=medium
* Dev version.
-- DanB <danb@cgrates.org> Thu, 6 Feb 2020 12:05:00 +0200
cgrates (0.10.0) UNRELEASED; urgency=medium
* Creating first stable branch.
-- DanB <danb@cgrates.org> Thu, 6 Feb 2020 12:05:00 +0200
cgrates (0.9.1~rc8) UNRELEASED; urgency=medium
* RC8.

2
packages/debian/control
View File

@@ -9,6 +9,6 @@ Homepage: http://cgrates.org
Package: cgrates
Architecture: amd64
Suggests: git, redis-server, mysql-server
Version: 0.9.1-rc8
Version: 0.11.0-rc1
Description: Carrier Grade Real-time Charging System
CGRateS is a very fast and easy scalable real-time charging system for Telecom environments.

2
utils/consts.go
View File

@@ -136,7 +136,7 @@ var (
const (
CGRateS = "CGRateS"
VERSION = "v0.9.1~rc8"
VERSION = "v0.11.0~dev"
DIAMETER_FIRMWARE_REVISION = 918
REDIS_MAX_CONNS = 10
CGRATES = "cgrates"

2
utils/coreutils.go
View File

@@ -697,7 +697,7 @@ func GetCGRVersion() (vers string, err error) {
if commitHash == "" || commitDate.IsZero() {
return vers, fmt.Errorf("Cannot find commitHash or commitDate information")
}
//CGRateS@v0.9.1~rc8-20200110075344-7572e7b11e00
//CGRateS@v0.11.0~dev-20200110075344-7572e7b11e00
return fmt.Sprintf("%s@%s-%s-%s", CGRateS, VERSION, commitDate.UTC().Format("20060102150405"), commitHash[:12]), nil
}

26
utils/coreutils_test.go
View File

@@ -1091,7 +1091,7 @@ Date: Fri Dec 30 19:48:09 2016 +0100
Fixes for db driver to avoid returning new values in case of errors
`
eVers := "CGRateS@v0.9.1~rc8-20161230184809-73014daa0c1d"
eVers := "CGRateS@v0.11.0~dev-20161230184809-73014daa0c1d"
if vers, err := GetCGRVersion(); err != nil {
t.Error(err)
} else if vers != eVers {
@@ -1100,35 +1100,35 @@ Date: Fri Dec 30 19:48:09 2016 +0100
GitLastLog = ""
if vers, err := GetCGRVersion(); err != nil {
t.Error(err)
} else if vers != "CGRateS@v0.9.1~rc8" {
t.Errorf("Expecting: <CGRateS@v0.9.1~rc8>, received: <%s>", vers)
} else if vers != "CGRateS@v0.11.0~dev" {
t.Errorf("Expecting: <CGRateS@v0.11.0~dev>, received: <%s>", vers)
}
GitLastLog = "\n"
if vers, err := GetCGRVersion(); err == nil || err.Error() != "Building version - error: <EOF> reading line from file" {
t.Error(err)
} else if vers != "CGRateS@v0.9.1~rc8" {
t.Errorf("Expecting: <CGRateS@v0.9.1~rc8>, received: <%s>", vers)
} else if vers != "CGRateS@v0.11.0~dev" {
t.Errorf("Expecting: <CGRateS@v0.11.0~dev>, received: <%s>", vers)
}
GitLastLog = `commit . . .
`
if vers, err := GetCGRVersion(); err == nil || err.Error() != "Building version - cannot extract commit hash" {
t.Error(err)
} else if vers != "CGRateS@v0.9.1~rc8" {
t.Errorf("Expecting: <CGRateS@v0.9.1~rc8>, received: <%s>", vers)
} else if vers != "CGRateS@v0.11.0~dev" {
t.Errorf("Expecting: <CGRateS@v0.11.0~dev>, received: <%s>", vers)
}
GitLastLog = `Date: : :
`
if vers, err := GetCGRVersion(); err == nil || err.Error() != "Building version - cannot split commit date" {
t.Error(err)
} else if vers != "CGRateS@v0.9.1~rc8" {
t.Errorf("Expecting: <CGRateS@v0.9.1~rc8>, received: <%s>", vers)
} else if vers != "CGRateS@v0.11.0~dev" {
t.Errorf("Expecting: <CGRateS@v0.11.0~dev>, received: <%s>", vers)
}
GitLastLog = `Date: wrong format
`
if vers, err := GetCGRVersion(); err == nil || err.Error() != `Building version - error: <parsing time "wrong format" as "Mon Jan 2 15:04:05 2006 -0700": cannot parse "wrong format" as "Mon"> compiling commit date` {
t.Error(err)
} else if vers != "CGRateS@v0.9.1~rc8" {
t.Errorf("Expecting: <CGRateS@v0.9.1~rc8>, received: <%s>", vers)
} else if vers != "CGRateS@v0.11.0~dev" {
t.Errorf("Expecting: <CGRateS@v0.11.0~dev>, received: <%s>", vers)
}
GitLastLog = `ommit 73014daa0c1d7edcb532d5fe600b8a20d588cdf8
Author: DanB <danb@cgrates.org>
@@ -1138,8 +1138,8 @@ Date: Fri Dec 30 19:48:09 2016 +0100
`
if vers, err := GetCGRVersion(); err == nil || err.Error() != "Cannot find commitHash or commitDate information" {
t.Error(err)
} else if vers != "CGRateS@v0.9.1~rc8" {
t.Errorf("Expecting: <CGRateS@v0.9.1~rc8>, received: <%s>", vers)
} else if vers != "CGRateS@v0.11.0~dev" {
t.Errorf("Expecting: <CGRateS@v0.11.0~dev>, received: <%s>", vers)
}
}