PSMDB. Switch manual setup of PRO repo to percona-release (#422)

Author: sandraromanchenko

psmdb-initsync/playbooks/converge.yml

@@ -73,31 +73,12 @@
       command: percona-release enable {{ psmdb_to_test }} {{ repo }}
       when: pro_build != true
 
-    - name: Create yum repo for PRO build
-      blockinfile:
-        path: /etc/yum.repos.d/percona-pro.repo
-        mode: '0640'
-        create: true
-        block: |
-          [percona-pro]
-          name=[{{ psmdb_to_test }}-pro-{{ repo }}-{{ ansible_architecture }}]
-          baseurl=https://repo.percona.com/private/{{ client_id }}-{{ client_token }}/{{ psmdb_to_test }}-pro/yum/{{ repo }}/{{ ansible_distribution_major_version }}/RPMS/{{ ansible_architecture }}
-          enabled=1
-          gpgcheck=0
-          sslverify=0
+    - name: enable psmdb PRO repo
+      command: percona-release enable {{ psmdb_to_test }}-pro {{ repo }} --user_name={{ client_id }} --repo_token={{ client_token }}
       vars:
         client_id: "{{ lookup('env', 'USERNAME') }}"
         client_token: "{{ lookup('env', 'PASSWORD') }}"
-      when: ansible_os_family == "RedHat" and pro_build == true
-
-    - name: create apt repo for PRO build
-      apt_repository: repo='deb http://repo.percona.com/private/{{ client_id }}-{{ client_token }}/{{ psmdb_to_test }}-pro/apt/ {{ ansible_distribution_release }} {{ repo }}' state=present update_cache=yes
-      vars:
-        client_id: "{{ lookup('env', 'USERNAME') }}"
-        client_token: "{{ lookup('env', 'PASSWORD') }}"
-        deb_repo: "{{ 'main' if repo  == 'release' else repo }}"
-        version: "{{ lookup('env', 'PSMDB_VERSION') }}"
-      when: ansible_os_family == "Debian" and pro_build == true
+      when: pro_build == true
 
     - name: install psmdb deb packages
       apt:

psmdb/psmdb-upgrade/playbooks/side_effect.yml

@@ -113,34 +113,14 @@
 
     - name: enable new psmdb repo
       command: percona-release enable psmdb-{{ to_version.split('.')[0] }}{{ to_version.split('.')[1] }} {{ to_repo }}
+      when: pro_build != true
 
-    - name: Create yum repo for PRO build
-      blockinfile:
-        path: /etc/yum.repos.d/percona-pro.repo
-        mode: '0640'
-        create: true
-        block: |
-          [percona-pro]
-          name=[psmdb-{{ version.split('.')[0] }}{{ version.split('.')[1] }}-pro-{{ repo }}-x86_64]
-          baseurl=http://repo.percona.com/private/{{ client_id }}-{{ client_token }}/psmdb-{{ version.split('.')[0] }}{{ version.split('.')[1] }}-pro/yum/{{ repo }}/{{ ansible_distribution_major_version }}/RPMS/{{ ansible_architecture }}
-          enabled=1
-          gpgcheck=0
-          sslverify=0
+    - name: enable psmdb PRO repo
+      command: percona-release enable psmdb-{{ to_version.split('.')[0] }}{{ to_version.split('.')[1] }}-pro {{ to_repo }} --user_name={{ client_id }} --repo_token={{ client_token }}
       vars:
         client_id: "{{ lookup('env', 'USERNAME') }}"
         client_token: "{{ lookup('env', 'PASSWORD') }}"
-        repo: "{{ lookup('env', 'TO_REPO') }}"
-        version: "{{ lookup('env', 'TO_PSMDB_VERSION') }}"
-      when: ansible_os_family == "RedHat" and to_repo_pro == true
-
-    - name: create apt repo for PRO build
-      apt_repository: repo='deb http://repo.percona.com/private/{{ client_id }}-{{ client_token }}/psmdb-{{ version.split('.')[0] }}{{ version.split('.')[1] }}-pro/apt/ {{ ansible_distribution_release }} {{ repo }}' state=present update_cache=yes
-      vars:
-        client_id: "{{ lookup('env', 'USERNAME') }}"
-        client_token: "{{ lookup('env', 'PASSWORD') }}"
-        repo: "{{ 'main' if lookup('env', 'TO_REPO') == 'release' else lookup('env', 'TO_REPO') }}"
-        version: "{{ lookup('env', 'TO_PSMDB_VERSION') }}"
-      when: ansible_os_family == "Debian" and to_repo_pro == true
+      when: pro_build == true
 
     - name: Set extra suffix for pkg name
       set_fact:

psmdb/psmdb-upgrade/tasks/main.yml

@@ -30,34 +30,16 @@
   vars:
     repo: "{{ lookup('env', 'FROM_REPO') }}"
     version: "{{ lookup('env', 'FROM_PSMDB_VERSION') }}"
+  when: pro_build != true
 
-- name: Create yum repo for PRO build
-  blockinfile:
-    path: /etc/yum.repos.d/percona-pro.repo
-    mode: '0640'
-    create: true
-    block: |
-      [percona-pro]
-      name=[psmdb-{{ version.split('.')[0] }}{{ version.split('.')[1] }}-pro-{{ repo }}-x86_64]
-      baseurl=http://repo.percona.com/private/{{ client_id }}-{{ client_token }}/psmdb-{{ version.split('.')[0] }}{{ version.split('.')[1] }}-pro/yum/{{ repo }}/{{ ansible_distribution_major_version }}/RPMS/{{ ansible_architecture }}
-      enabled=1
-      gpgcheck=0
-      sslverify=0
+- name: enable psmdb PRO repo
+  command: percona-release enable psmdb-{{ version.split('.')[0] }}{{ version.split('.')[1] }}-pro {{ repo }} --user_name={{ client_id }} --repo_token={{ client_token }}
   vars:
-    client_id: "{{ lookup('env', 'USERNAME') }}"
-    client_token: "{{ lookup('env', 'PASSWORD') }}"
     repo: "{{ lookup('env', 'FROM_REPO') }}"
     version: "{{ lookup('env', 'FROM_PSMDB_VERSION') }}"
-  when: ansible_os_family == "RedHat" and from_repo_pro == true
-
-- name: create apt repo for PRO build
-  apt_repository: repo='deb http://repo.percona.com/private/{{ client_id }}-{{ client_token }}/psmdb-{{ version.split('.')[0] }}{{ version.split('.')[1] }}-pro/apt/ {{ ansible_distribution_release }} {{ repo }}' state=present update_cache=yes
-  vars:
     client_id: "{{ lookup('env', 'USERNAME') }}"
     client_token: "{{ lookup('env', 'PASSWORD') }}"
-    repo: "{{ 'main' if lookup('env', 'FROM_REPO') == 'release' else lookup('env', 'FROM_REPO') }}"
-    version: "{{ lookup('env', 'FROM_PSMDB_VERSION') }}"
-  when: ansible_os_family == "Debian" and from_repo_pro == true
+  when: pro_build == true
 
 - block:
     - name: include tasks for PSMDB install

psmdb/psmdb/tasks/main.yml

@@ -35,33 +35,14 @@
     version: "{{ lookup('env', 'PSMDB_VERSION') }}"
   when: pro_build != true
 
-- name: Create yum repo for PRO build
-  blockinfile:
-    path: /etc/yum.repos.d/percona-pro.repo
-    mode: '0640'
-    create: true
-    block: |
-      [percona-pro]
-      name=[psmdb-{{ version.split('.')[0] }}{{ version.split('.')[1] }}-pro-{{ repo }}-{{ ansible_architecture }}]
-      baseurl=http://repo.percona.com/private/{{ client_id }}-{{ client_token }}/psmdb-{{ version.split('.')[0] }}{{ version.split('.')[1] }}-pro/yum/{{ repo }}/{{ ansible_distribution_major_version }}/RPMS/{{ ansible_architecture }}
-      enabled=1
-      gpgcheck=0
-      sslverify=0
+- name: enable psmdb PRO repo
+  command: percona-release enable psmdb-{{ version.split('.')[0] }}{{ version.split('.')[1] }}-pro {{ repo }} --user_name={{ client_id }} --repo_token={{ client_token }}
   vars:
-    client_id: "{{ lookup('env', 'USERNAME') }}"
-    client_token: "{{ lookup('env', 'PASSWORD') }}"
     repo: "{{ lookup('env', 'REPO') }}"
     version: "{{ lookup('env', 'PSMDB_VERSION') }}"
-  when: ansible_os_family == "RedHat" and pro_build == true
-
-- name: create apt repo for PRO build
-  apt_repository: repo='deb http://repo.percona.com/private/{{ client_id }}-{{ client_token }}/psmdb-{{ version.split('.')[0] }}{{ version.split('.')[1] }}-pro/apt/ {{ ansible_distribution_release }} {{ repo }}' state=present update_cache=yes
-  vars:
     client_id: "{{ lookup('env', 'USERNAME') }}"
     client_token: "{{ lookup('env', 'PASSWORD') }}"
-    repo: "{{ 'main' if lookup('env', 'REPO') == 'release' else lookup('env', 'REPO') }}"
-    version: "{{ lookup('env', 'PSMDB_VERSION') }}"
-  when: ansible_os_family == "Debian" and pro_build == true
+  when: pro_build == true
 
 - block:
     - name: include tasks for PSMDB install