From d8b263cc6b4f94274733a72e0900e8d1dbd9ef74 Mon Sep 17 00:00:00 2001 From: Jason Frey Date: Mon, 30 Oct 2023 11:42:34 -0400 Subject: [PATCH 1/2] Fix issues with RPM versioning after merge of master into quinteros --- Dockerfile | 2 +- config/options.yml | 12 +++--- .../manageiq-17-quinteros.repo | 42 +++++++++++++++++++ .../manageiq-18-radjabov.repo | 41 ------------------ .../manageiq-release/manageiq-release.spec | 7 +--- rpm_spec/changelog | 3 -- 6 files changed, 51 insertions(+), 56 deletions(-) create mode 100644 packages/manageiq-release/manageiq-17-quinteros.repo delete mode 100644 packages/manageiq-release/manageiq-18-radjabov.repo diff --git a/Dockerfile b/Dockerfile index 3e162f48..b6586b47 100644 --- a/Dockerfile +++ b/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 && \ diff --git a/config/options.yml b/config/options.yml index 89d9bfaf..e4d64c85 100644 --- a/config/options.yml +++ b/config/options.yml @@ -14,7 +14,7 @@ repos: version: release: rpm: - version: 18.0.0 + version: 17.0.0 release: 0 repo_name: org_name: manageiq @@ -36,15 +36,15 @@ 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.+/ @@ -52,9 +52,9 @@ rpm_repository: :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.+/ diff --git a/packages/manageiq-release/manageiq-17-quinteros.repo b/packages/manageiq-release/manageiq-17-quinteros.repo new file mode 100644 index 00000000..63d04896 --- /dev/null +++ b/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 + diff --git a/packages/manageiq-release/manageiq-18-radjabov.repo b/packages/manageiq-release/manageiq-18-radjabov.repo deleted file mode 100644 index 1f9ee48c..00000000 --- a/packages/manageiq-release/manageiq-18-radjabov.repo +++ /dev/null @@ -1,41 +0,0 @@ -[manageiq-18-radjabov] -name=ManageIQ 18 (Radjabov) Release - $basearch -baseurl=https://rpm.manageiq.org/release/18-radjabov/el$releasever/$basearch -enabled=1 -gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MANAGEIQ - -[manageiq-18-radjabov-noarch] -name=ManageIQ 18 (Radjabov) Release - noarch -baseurl=https://rpm.manageiq.org/release/18-radjabov/el$releasever/noarch -enabled=1 -gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MANAGEIQ - -[manageiq-18-radjabov-source] -name=ManageIQ 18 (Radjabov) Release - source -baseurl=https://rpm.manageiq.org/release/18-radjabov/el$releasever/src -enabled=0 -gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MANAGEIQ - -[manageiq-18-radjabov-nightly] -name=ManageIQ 18 (Radjabov) Nightly - $basearch -baseurl=https://rpm.manageiq.org/release/18-radjabov-nightly/el$releasever/$basearch -enabled=0 -gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MANAGEIQ - -[manageiq-18-radjabov-nightly-noarch] -name=ManageIQ 18 (Radjabov) Nightly - noarch -baseurl=https://rpm.manageiq.org/release/18-radjabov-nightly/el$releasever/noarch -enabled=0 -gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MANAGEIQ - -[manageiq-18-radjabov-nightly-source] -name=ManageIQ 18 (Radjabov) Nightly - source -baseurl=https://rpm.manageiq.org/release/18-radjabov-nightly/el$releasever/src -enabled=0 -gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MANAGEIQ diff --git a/packages/manageiq-release/manageiq-release.spec b/packages/manageiq-release/manageiq-release.spec index 0310c5b6..840018b6 100644 --- a/packages/manageiq-release/manageiq-release.spec +++ b/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 - 18.0-1%{dist} -- Initial build of manageiq-release for Radjabov. - * Thu Feb 16 2023 Jason Frey - 17.0-1%{dist} - Initial build of manageiq-release for Quinteros. diff --git a/rpm_spec/changelog b/rpm_spec/changelog index 54123944..c1a0a529 100644 --- a/rpm_spec/changelog +++ b/rpm_spec/changelog @@ -1,7 +1,4 @@ %changelog -* Sat Aug 12 2023 Jason Frey - 18.0.0-1 -- Initial build of manageiq-release for Radjabov. - * Thu Feb 16 2023 Jason Frey - 17.0.0-1 - Initial build of manageiq-release for Quinteros. From d67e4d2e05ecd02564b4f789db4c5cd3e03917ce Mon Sep 17 00:00:00 2001 From: Jason Frey Date: Fri, 27 Oct 2023 09:04:01 -0400 Subject: [PATCH 2/2] Bump rpm version to 17.1.0 --- config/options.yml | 2 +- rpm_spec/changelog | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/config/options.yml b/config/options.yml index e4d64c85..ed33f368 100644 --- a/config/options.yml +++ b/config/options.yml @@ -14,7 +14,7 @@ repos: version: release: rpm: - version: 17.0.0 + version: 17.1.0 release: 0 repo_name: org_name: manageiq diff --git a/rpm_spec/changelog b/rpm_spec/changelog index c1a0a529..3b77d7f6 100644 --- a/rpm_spec/changelog +++ b/rpm_spec/changelog @@ -1,4 +1,7 @@ %changelog +* Thu Oct 30 2023 Jason Frey - 17.1.0-1 +- Mid-release build of manageiq-release for Quinteros. + * Thu Feb 16 2023 Jason Frey - 17.0.0-1 - Initial build of manageiq-release for Quinteros.