Merge pull request #424 from Fryguy/fix_quinteros_merge

Fix issues with RPM versioning after merge of master into quinteros

Dockerfile

@@ -15,7 +15,7 @@ RUN ARCH=$(uname -m) && \
       http://mirror.centos.org/centos/8-stream/BaseOS/${ARCH}/os/Packages/centos-gpg-keys-8-2.el8.noarch.rpm ; fi && \
     dnf -y install \
       https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm \
-      https://rpm.manageiq.org/release/18-radjabov/el8/noarch/manageiq-release-18.0-1.el8.noarch.rpm && \
+      https://rpm.manageiq.org/release/17-quinteros/el8/noarch/manageiq-release-17.0-1.el8.noarch.rpm && \
     dnf -y module enable ruby:3.0 && \
     dnf -y module enable nodejs:18 && \
     dnf -y module disable virt:rhel && \

config/options.yml

@@ -14,7 +14,7 @@ repos:
 version:
 release:
 rpm:
-  version: 18.0.0
+  version: 17.1.0
   release: 0
   repo_name:
   org_name: manageiq
@@ -36,25 +36,25 @@ rpm_repository:
   - s390x
   - x86_64
   :content:
-    :18-radjabov:
+    :17-quinteros:
       :targets:
       - el8
       - el9
       :rpms:
         :ansible: !ruby/regexp /.+-5\.4.+/
         :kafka: !ruby/regexp /.+-3\.3.+/
-        :manageiq: !ruby/regexp /.+-18\.\d\.\d-(alpha|beta|rc)?\d(\.\d)?\.el.+/
-        :manageiq-release: !ruby/regexp /.+-18\.0.+/
+        :manageiq: !ruby/regexp /.+-17\.\d\.\d-(alpha|beta|rc)?\d(\.\d)?\.el.+/
+        :manageiq-release: !ruby/regexp /.+-17\.0.+/
         :python-bambou: !ruby/regexp /.+-3\.1\.1.+/
         :python-pylxca: !ruby/regexp /.+-2\.1\.1.+/
         :python-unittest2: !ruby/regexp /.+-1\.1\.0.+/
         :python-vspk: !ruby/regexp /.+-5\.3\.2.+/
         :qpid-proton: !ruby/regexp /.+-0\.30\.0.+/
         :repmgr13: !ruby/regexp /.+-5\.2\.1.+/
         :wmi: !ruby/regexp /.+-1\.3\.14.+/
-    :18-radjabov-nightly:
+    :17-quinteros-nightly:
       :targets:
       - el8
       - el9
       :rpms:
-        :manageiq-nightly: !ruby/regexp /.+-18\.\d\.\d-(\d\.\d\.)?\d{14,}+\.el.+/
+        :manageiq-nightly: !ruby/regexp /.+-17\.\d\.\d-(\d\.\d\.)?\d{14,}+\.el.+/

packages/manageiq-release/manageiq-17-quinteros.repo

@@ -0,0 +1,42 @@
+[manageiq-17-quinteros]
+name=ManageIQ 17 (Quinteros) Release - $basearch
+baseurl=https://rpm.manageiq.org/release/17-quinteros/el$releasever/$basearch
+enabled=1
+gpgcheck=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MANAGEIQ
+
+[manageiq-17-quinteros-noarch]
+name=ManageIQ 17 (Quinteros) Release - noarch
+baseurl=https://rpm.manageiq.org/release/17-quinteros/el$releasever/noarch
+enabled=1
+gpgcheck=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MANAGEIQ
+
+[manageiq-17-quinteros-source]
+name=ManageIQ 17 (Quinteros) Release - source
+baseurl=https://rpm.manageiq.org/release/17-quinteros/el$releasever/src
+enabled=0
+gpgcheck=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MANAGEIQ
+
+[manageiq-17-quinteros-nightly]
+name=ManageIQ 17 (Quinteros) Nightly - $basearch
+baseurl=https://rpm.manageiq.org/release/17-quinteros-nightly/el$releasever/$basearch
+enabled=0
+gpgcheck=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MANAGEIQ
+
+[manageiq-17-quinteros-nightly-noarch]
+name=ManageIQ 17 (Quinteros) Nightly - noarch
+baseurl=https://rpm.manageiq.org/release/17-quinteros-nightly/el$releasever/noarch
+enabled=0
+gpgcheck=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MANAGEIQ
+
+[manageiq-17-quinteros-nightly-source]
+name=ManageIQ 17 (Quinteros) Nightly - source
+baseurl=https://rpm.manageiq.org/release/17-quinteros-nightly/el$releasever/src
+enabled=0
+gpgcheck=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MANAGEIQ
+

packages/manageiq-release/manageiq-release.spec

@@ -1,11 +1,11 @@
 Name:      manageiq-release
-Version:   18.0
+Version:   17.0
 Release:   1%{dist}
 Summary:   ManageIQ RPM repository configuration
 License:   Apache-2.0
 URL:       https://rpm.manageiq.org/release/
 Source0:   RPM-GPG-KEY-MANAGEIQ
-Source1:   manageiq-18-radjabov.repo
+Source1:   manageiq-17-quinteros.repo
 BuildArch: noarch
 
 %description
@@ -36,9 +36,6 @@ rm -rf $RPM_BUILD_ROOT
 /etc/pki/rpm-gpg/*
 
 %changelog
-* Sat Aug 12 2023 Jason Frey <[email protected]> - 18.0-1%{dist}
-- Initial build of manageiq-release for Radjabov.
-
 * Thu Feb 16 2023 Jason Frey <[email protected]> - 17.0-1%{dist}
 - Initial build of manageiq-release for Quinteros.
 

rpm_spec/changelog

@@ -1,6 +1,6 @@
 %changelog
-* Sat Aug 12 2023 Jason Frey <[email protected]> - 18.0.0-1
-- Initial build of manageiq-release for Radjabov.
+* Thu Oct 30 2023 Jason Frey <[email protected]> - 17.1.0-1
+- Mid-release build of manageiq-release for Quinteros.
 
 * Thu Feb 16 2023 Jason Frey <[email protected]> - 17.0.0-1
 - Initial build of manageiq-release for Quinteros.