build.rpms: Add support for custom vendor dist suffix

Like %{dist}, 'vendor_dist_suffix' environment variable is supposed
to contain the required delimiter i.e, dot('.') to get it meaningfully
added to the 'Release' tag.

Author: anoopcs9

Makefile

@@ -21,6 +21,10 @@ ifneq ($(ceph_repo_gpgkey),)
 	EXTRA_VARS += ceph_repo_gpgkey=$(ceph_repo_gpgkey)
 endif
 
+ifneq ($(vendor_dist_suffix),)
+	EXTRA_VARS += vendor_dist_suffix=$(vendor_dist_suffix)
+endif
+
 prep.dirs:
 	@ansible-playbook --inventory localhost, ./ansible/prep.dirs.yml
 

ansible/build.rpms.centos.yml

@@ -5,6 +5,7 @@
     refspec: "{{ refspec }}"
     os_vers: "{{ version | default('9') }}"
     os_arch: "{{ arch | default('x86_64') }}"
+    vendor_dist: "{{ vendor_dist_suffix | default('%{nil}') }}"
   vars_files:
     - vars.yml
   roles:

ansible/build.rpms.fedora.yml

@@ -5,6 +5,7 @@
     refspec: "{{ refspec }}"
     os_vers: "{{ version | default('42') }}"
     os_arch: "{{ arch | default('x86_64') }}"
+    vendor_dist: "{{ vendor_dist_suffix | default('%{nil}') }}"
   vars_files:
     - vars.yml
   roles:

ansible/build.rpms.rhel.yml

@@ -7,6 +7,7 @@
     os_arch: "{{ arch | default('x86_64') }}"
     org_id: "{{ lookup('env', 'ORG_ID', default=Undefined) }}"
     act_key: "{{ lookup('env', 'ACT_KEY', default=Undefined) }}"
+    vendor_dist: "{{ vendor_dist_suffix | default('%{nil}') }}"
   vars_files:
     - vars.yml
   roles:

ansible/roles/build.rpms.centos/tasks/main.yml

@@ -1,2 +1,2 @@
 - name: build centos {{ os_vers }} rpms
-  command: /usr/bin/mock --root {{ mock_dir }}/centos-stream+epel-next-{{ os_vers }}-{{ os_arch }}.cfg --resultdir {{ rpms_dir }}/{{ samba_major_version }}/centos/{{ os_vers }}/{{ os_arch }} --rebuild {{ srpm_dir }}/{{ samba_srpm }}
+  command: /usr/bin/mock --root {{ mock_dir }}/centos-stream+epel-next-{{ os_vers }}-{{ os_arch }}.cfg --resultdir {{ rpms_dir }}/{{ samba_major_version }}/centos/{{ os_vers }}/{{ os_arch }} --define "vendor_dist {{ vendor_dist }}" --rebuild {{ srpm_dir }}/{{ samba_srpm }}

ansible/roles/build.rpms.fedora/tasks/main.yml

@@ -1,2 +1,2 @@
 - name: build fedora {{ os_vers }} rpms
-  command: /usr/bin/mock --root {{ mock_dir }}/fedora-{{ os_vers }}-{{ os_arch }}.cfg --resultdir {{ rpms_dir }}/{{ samba_major_version }}/fedora/{{ os_vers }}/{{ os_arch }} --rebuild {{ srpm_dir }}/{{ samba_srpm }}
+  command: /usr/bin/mock --root {{ mock_dir }}/fedora-{{ os_vers }}-{{ os_arch }}.cfg --resultdir {{ rpms_dir }}/{{ samba_major_version }}/fedora/{{ os_vers }}/{{ os_arch }} --define "vendor_dist {{ vendor_dist }}" --rebuild {{ srpm_dir }}/{{ samba_srpm }}

ansible/roles/build.rpms.rhel/files/rpm-build.sh

@@ -8,6 +8,6 @@ dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-${OS_VE
 
 dnf -y install mock rpm-build
 
-mock --root "${MOCK_DIR}/rhel-${OS_VERS}-${OS_ARCH}.cfg" --resultdir "${RPMS_DIR}/${SAMBA_VERS}/rhel/${OS_VERS}/${OS_ARCH}" --rebuild "${SRPM_DIR}/${SAMBA_SRPM}"
+mock --root "${MOCK_DIR}/rhel-${OS_VERS}-${OS_ARCH}.cfg" --resultdir "${RPMS_DIR}/${SAMBA_VERS}/rhel/${OS_VERS}/${OS_ARCH}" --define "vendor_dist ${VENDOR_DIST}" --rebuild "${SRPM_DIR}/${SAMBA_SRPM}"
 
 subscription-manager unregister

ansible/roles/build.rpms.rhel/tasks/main.yml

@@ -1,7 +1,7 @@
 ---
 - name: Build rhel {{ os_vers }} rpms locally
   when: org_id is undefined or act_key is undefined
-  command: /usr/bin/mock --root {{ mock_dir }}/rhel-{{ os_vers }}-{{ os_arch }}.cfg --resultdir {{ rpms_dir }}/{{ samba_major_version }}/rhel/{{ os_vers }}/{{ os_arch }} --rebuild {{ srpm_dir }}/{{ samba_srpm }}
+  command: /usr/bin/mock --root {{ mock_dir }}/rhel-{{ os_vers }}-{{ os_arch }}.cfg --resultdir {{ rpms_dir }}/{{ samba_major_version }}/rhel/{{ os_vers }}/{{ os_arch }} --define "vendor_dist {{ vendor_dist }}" --rebuild {{ srpm_dir }}/{{ samba_srpm }}
 
 - name: Build rhel {{ os_vers }} rpms in a container
   when: org_id is defined and act_key is defined
@@ -25,3 +25,4 @@
       RPMS_DIR: "{{ rpms_dir }}"
       SAMBA_SRPM: "{{ samba_srpm }}"
       SAMBA_VERS: "{{ samba_major_version }}"
+      VENDOR_DIST: "{{ vendor_dist }}"

packaging/samba-4.21.spec.j2

@@ -112,7 +112,7 @@
 
 Name:           samba
 Version:        %{samba_version}
-Release:        %{samba_release}%{?dist}
+Release:        %{samba_release}%{?dist}%{?vendor_dist}
 
 %if 0%{?rhel}
 Epoch:          0

packaging/samba-4.22.spec.j2

@@ -112,7 +112,7 @@
 
 Name:           samba
 Version:        %{samba_version}
-Release:        %{samba_release}%{?dist}
+Release:        %{samba_release}%{?dist}%{?vendor_dist}
 
 %if 0%{?rhel}
 Epoch:          0