From baf3bed076951fa129f11afb6a20e80cf37a36dd Mon Sep 17 00:00:00 2001 From: Trial97 Date: Wed, 4 Mar 2020 11:24:51 +0200 Subject: [PATCH] Updated ansible scripts --- data/ansible/deb_packages/main.yaml | 7 ++-- data/ansible/rpm_packages/cgrates.spec.j2 | 7 ++-- data/ansible/rpm_packages/main.yaml | 43 ++++++++++++++++------- 3 files changed, 40 insertions(+), 17 deletions(-) diff --git a/data/ansible/deb_packages/main.yaml b/data/ansible/deb_packages/main.yaml index c399b7820..bf2b60c4f 100644 --- a/data/ansible/deb_packages/main.yaml +++ b/data/ansible/deb_packages/main.yaml @@ -243,11 +243,14 @@ - name: Move the new package to /var/packages/deb become: yes - shell: "sudo mv /tmp/{{ item}} /var/packages/deb/{{ cgrates_distribution }}/" + shell: "mv /tmp/{{ item}} /var/packages/deb/{{ cgrates_distribution }}/" with_items: "{{ hostvars['apt']['debFileName']['stdout_lines'] }}" - name: Create the new symlink cgrates_current_amd64.deb become: yes - shell: "sudo ln -s /var/packages/deb/{{ cgrates_distribution }}/{{ item }} /var/packages/deb/{{ cgrates_distribution }}/cgrates_current_amd64.deb" + file: + src: /var/packages/deb/{{ cgrates_distribution }}/{{ item }} + dest: /var/packages/deb/{{ cgrates_distribution }}/cgrates_current_amd64.deb + state: link with_items: "{{ hostvars['apt']['debFileName']['stdout_lines'] }}" when : cgrates_distribution == "nightly" or hostvars['apt']['gitTagVar'].stdout_lines|length > 0 diff --git a/data/ansible/rpm_packages/cgrates.spec.j2 b/data/ansible/rpm_packages/cgrates.spec.j2 index 0c1af4dbf..660fafb6a 100644 --- a/data/ansible/rpm_packages/cgrates.spec.j2 +++ b/data/ansible/rpm_packages/cgrates.spec.j2 @@ -1,5 +1,6 @@ {{ ansible_managed | comment }} %global version 0.11.0~dev +%global branch {{ cgrates_version }} %global git_commit {{ gitVersion.stdout_lines[0] }} %global git_short_commit {{ gitShortVersion.stdout_lines[0] }} @@ -10,11 +11,11 @@ Name: cgrates Version: %{version} -Release: {{ gitDate.stdout_lines[0] }}+%{git_short_commit} +Release: {{ releaseTag }} Summary: Carrier Grade Real-time Charging System License: GPLv3 URL: https://github.com/cgrates/cgrates -Source0: https://github.com/cgrates/cgrates/archive/%{git_commit}.tar.gz +Source0: https://github.com/cgrates/cgrates/archive/%{branch}/%{git_commit}.tar.gz %if 0%{?fedora} > 16 || 0%{?rhel} > 6 Requires(pre): shadow-utils @@ -33,7 +34,7 @@ CGRateS is a very fast and easy scalable real-time charging system for Telecom e %prep %setup -q -n %{name}-%{version} -c mkdir -p src/github.com/cgrates -ln -sf ../../../%{name}-%{git_commit} src/github.com/cgrates/cgrates +ln -sf ../../../%{name}-%{branch} src/github.com/cgrates/cgrates %pre getent group %{name} >/dev/null || groupadd -r %{name} diff --git a/data/ansible/rpm_packages/main.yaml b/data/ansible/rpm_packages/main.yaml index 02ff839cf..2f86090a9 100644 --- a/data/ansible/rpm_packages/main.yaml +++ b/data/ansible/rpm_packages/main.yaml @@ -85,10 +85,6 @@ - name: Install dependencies become: yes apt: name={{ dependencies }} state=present - - - name: set cgrates cgrates_version - set_fact: - cgrates_version: "{{ cgrates_version }}" ########################################################################################################################### ########################################################################################################################### # Prepare for configuration @@ -204,6 +200,21 @@ src: "{{ cgrates_dir }}/data" dest: "/usr/share/cgrates" state: link + + - name: get git tag + shell: "git tag -l --points-at HEAD" + args: + chdir: '{{ cgrates_dir }}' + register: gitTagVar + + - name: Compose the ReleaseTag + set_fact: + releaseTag: "" + + - name: Compose the ReleaseTag with values + set_fact: + releaseTag: "{{ gitDate.stdout_lines[0] }}+{{ gitShortVersion.stdout_lines[0] }}" + when : gitTagVar.stdout_lines|length == 0 ########################################################################################################################### ########################################################################################################################### # Generate package @@ -221,7 +232,7 @@ - name: Download the tar.gz for the last commit become: yes - shell: wget https://github.com/cgrates/cgrates/archive/{{ gitVersion.stdout_lines[0] }}.tar.gz + shell: wget https://github.com/cgrates/cgrates/archive/{{ cgrates_version }}/{{ gitVersion.stdout_lines[0] }}.tar.gz args: chdir: cgr_build/SOURCES @@ -250,26 +261,29 @@ - name: Sign with rpm --addsign the .rpm file become: yes shell: 'sudo rpm --addsign cgr_build/RPMS/x86_64/{{ rmpFileName.stdout_lines[0] }}' - + when : cgrates_version == "master" or gitTagVar.stdout_lines|length > 0 + - name: Check if is something in /var/packages/yum/{{ cgrates_distribution }} become: yes shell : "ls /var/packages/yum/{{ cgrates_distribution }}/" register: yumFiles - + when : cgrates_version == "master" or gitTagVar.stdout_lines|length > 0 + # Clean the folder - name: Clean the incoming folder become: yes shell: "sudo rm -rf /var/packages/yum/{{ cgrates_distribution }}/*" - when: yumFiles.stdout_lines|length > 1 + when: (cgrates_version == "master" or gitTagVar.stdout_lines|length > 0) and yumFiles.stdout_lines|length > 1 - name: Move the files to /var/packages/yum/{{ cgrates_distribution }} become: yes command: mv cgr_build/RPMS/x86_64/{{ rmpFileName.stdout_lines[0] }} /var/packages/yum/{{ cgrates_distribution }}/ - when : rmpFileName.stdout_lines|length > 0 - + when: (cgrates_version == "master" or gitTagVar.stdout_lines|length > 0) and rmpFileName.stdout_lines|length > 0 + - name: Include the package with createrepo become: yes shell: createrepo /var/packages/yum/{{ cgrates_distribution }} + when : cgrates_version == "master" or gitTagVar.stdout_lines|length > 0 - hosts: pkg remote_user: '{{ gouser }}' @@ -293,9 +307,14 @@ - name: Move the new package to /var/packages/rpm become: yes - shell: "sudo mv /tmp/{{ hostvars['yum']['rmpFileName']['stdout_lines'][0] }} /var/packages/rpm/{{ cgrates_distribution }}/" + shell: "mv /tmp/{{ item }} /var/packages/rpm/{{ cgrates_distribution }}/" + with_items: "{{ hostvars['yum']['rmpFileName']['stdout_lines'] }}" - name: Create the new symlink cgrates_current.rpm become: yes - shell: "sudo ln -s /var/packages/rpm/{{ cgrates_distribution }}/{{ hostvars['yum']['rmpFileName']['stdout_lines'][0] }} /var/packages/rpm/{{ cgrates_distribution }}/cgrates_current.rpm" + file: + src: /var/packages/rpm/{{ cgrates_distribution }}/{{ item }} + dest: /var/packages/rpm/{{ cgrates_distribution }}/cgrates_current.rpm" + state: link + with_items: "{{ hostvars['yum']['rmpFileName']['stdout_lines'] }}" when : cgrates_distribution == "nightly" or hostvars['yum']['gitTagVar'].stdout_lines|length > 0