Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into quinteros
Browse files Browse the repository at this point in the history
  • Loading branch information
Fryguy committed Oct 26, 2023
2 parents 3d2fe79 + 896e28e commit 64bc4a0
Show file tree
Hide file tree
Showing 29 changed files with 60 additions and 3,291 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build_rpms.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
if: github.repository_owner == 'ManageIQ'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up registry credentials
run: |
echo "REGISTRY_USERNAME=${{ secrets.DOCKER_REGISTRY_USERNAME }}" >> $GITHUB_ENV
Expand All @@ -22,7 +22,7 @@ jobs:
if: github.repository_owner == 'ManageIQ'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up registry credentials
run: |
echo "REGISTRY_USERNAME=${{ secrets.DOCKER_REGISTRY_USERNAME }}" >> $GITHUB_ENV
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
ruby-version:
- '3.0'
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
Expand All @@ -27,6 +27,6 @@ jobs:
needs: ci
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Build RPM build image
run: bin/build_container_image
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/17-quinteros/el8/noarch/manageiq-release-17.0-1.el8.noarch.rpm && \
https://rpm.manageiq.org/release/18-radjabov/el8/noarch/manageiq-release-18.0-1.el8.noarch.rpm && \
dnf -y module enable ruby:3.0 && \
dnf -y module enable nodejs:18 && \
dnf -y module disable virt:rhel && \
Expand Down
13 changes: 6 additions & 7 deletions config/options.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ repos:
version:
release:
rpm:
version: 17.0.0
version: 18.0.0
release: 0
repo_name:
org_name: manageiq
Expand All @@ -36,26 +36,25 @@ rpm_repository:
- s390x
- x86_64
:content:
:17-quinteros:
:18-radjabov:
:targets:
- el8
- el9
:rpms:
:ansible: !ruby/regexp /.+-5\.4.+/
:kafka: !ruby/regexp /.+-3\.3.+/
:manageiq: !ruby/regexp /.+-17\.\d\.\d-(alpha|beta|rc)?\d(\.\d)?\.el.+/
:manageiq-release: !ruby/regexp /.+-17\.0.+/
:postgresql: !ruby/regexp /.+-10\.21.+/
:manageiq: !ruby/regexp /.+-18\.\d\.\d-(alpha|beta|rc)?\d(\.\d)?\.el.+/
:manageiq-release: !ruby/regexp /.+-18\.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.+/
:17-quinteros-nightly:
:18-radjabov-nightly:
:targets:
- el8
- el9
:rpms:
:manageiq-nightly: !ruby/regexp /.+-17\.\d\.\d-(\d\.\d\.)?\d{14,}+\.el.+/
:manageiq-nightly: !ruby/regexp /.+-18\.\d\.\d-(\d\.\d\.)?\d{14,}+\.el.+/
41 changes: 0 additions & 41 deletions packages/manageiq-release/manageiq-17-quinteros.repo

This file was deleted.

41 changes: 41 additions & 0 deletions packages/manageiq-release/manageiq-18-radjabov.repo
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
[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
7 changes: 5 additions & 2 deletions packages/manageiq-release/manageiq-release.spec
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
Name: manageiq-release
Version: 17.0
Version: 18.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-17-quinteros.repo
Source1: manageiq-18-radjabov.repo
BuildArch: noarch

%description
Expand Down Expand Up @@ -36,6 +36,9 @@ 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.

Expand Down
69 changes: 0 additions & 69 deletions packages/postgresql/Makefile.regress

This file was deleted.

58 changes: 0 additions & 58 deletions packages/postgresql/generate-pdf.sh

This file was deleted.

12 changes: 0 additions & 12 deletions packages/postgresql/generate-sources.sh

This file was deleted.

Loading

0 comments on commit 64bc4a0

Please sign in to comment.