Skip to content

Commit

Permalink
Set CI source URLs for prerelease packages
Browse files Browse the repository at this point in the history
This allows regular tools, like spectool, to retrieve the sources which
makes development easier. Once the build changes to rc1 or actual
releases the old URL is used automatically.
  • Loading branch information
ekohl committed Aug 27, 2022
1 parent 70a95a8 commit cdb14a2
Show file tree
Hide file tree
Showing 9 changed files with 39 additions and 2 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,6 @@ downloaded_rpms

SRPMs/
mock_builds/

*-develop.tar.bz2
*.pre.master.gem
4 changes: 4 additions & 0 deletions packages/foreman/foreman-installer/foreman-installer.spec
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,11 @@ Summary: Puppet-based installer for The Foreman
Group: Applications/System
License: GPLv3+ and ASL 2.0
URL: https://theforeman.org
%if "%{prereleasesource}" == "develop"
Source0: https://ci.theforeman.org/job/%{name}-%{prereleasesource}-source-release/lastSuccessfulBuild/artifact/pkg/%{name}-%{version}%{?prerelease:-}%{?prerelease}.tar.bz2
%else
Source0: https://downloads.theforeman.org/%{name}/%{name}-%{version}%{?prerelease:-}%{?prerelease}.tar.bz2
%endif

BuildArch: noarch

Expand Down
4 changes: 4 additions & 0 deletions packages/foreman/foreman-proxy/foreman-proxy.spec
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,11 @@ Summary: Restful Proxy for DNS, DHCP, TFTP, PuppetCA and Puppet
Group: Applications/System
License: GPLv3+
URL: https://theforeman.org/projects/smart-proxy
%if "%{prereleasesource}" == "develop"
Source0: https://ci.theforeman.org/job/smart-proxy-%{prereleasesource}-source-release/lastSuccessfulBuild/artifact/pkg/%{name}-%{version}%{?prerelease:-}%{?prerelease}.tar.bz2
%else
Source0: https://downloads.theforeman.org/%{name}/%{name}-%{version}%{?prerelease:-}%{?prerelease}.tar.bz2
%endif
Source1: %{name}.tmpfiles
Source2: logrotate.conf

Expand Down
4 changes: 4 additions & 0 deletions packages/foreman/foreman-selinux/foreman-selinux.spec
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,11 @@ Summary: SELinux policy module for Foreman
Group: System Environment/Base
License: GPLv3+
URL: https://theforeman.org
%if "%{prereleasesource}" == "develop"
Source0: https://ci.theforeman.org/job/%{name}-%{prereleasesource}-source-release/lastSuccessfulBuild/artifact/pkg/%{name}-%{version}%{?prerelease:-}%{?prerelease}.tar.bz2
%else
Source0: https://downloads.theforeman.org/%{name}/%{name}-%{version}%{?prerelease:-}%{?prerelease}.tar.bz2
%endif

BuildRequires: checkpolicy
BuildRequires: selinux-policy-devel
Expand Down
4 changes: 4 additions & 0 deletions packages/foreman/foreman/foreman.spec
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,11 @@ Summary: Systems Management web application
Group: Applications/System
License: GPLv3+ with exceptions
URL: https://theforeman.org
%if "%{prereleasesource}" == "develop"
Source0: https://ci.theforeman.org/job/%{name}-%{prereleasesource}-source-release/lastSuccessfulBuild/artifact/pkg/%{name}-%{version}%{?prerelease:-}%{?prerelease}.tar.bz2
%else
Source0: https://downloads.theforeman.org/%{name}/%{name}-%{version}%{?prerelease:-}%{?prerelease}.tar.bz2
%endif
Source3: %{name}.logrotate
Source4: %{name}.cron.d
Source5: %{name}.tmpfiles
Expand Down
4 changes: 4 additions & 0 deletions packages/foreman/rubygem-hammer_cli/rubygem-hammer_cli.spec
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,11 @@ Summary: Universal command-line interface
Group: Development/Languages
License: GPLv3
URL: https://github.com/theforeman/hammer-cli
%if "%{prereleasesource}" == "pre.develop"
Source0: https://ci.theforeman.org/job/hammer-cli-master-source-release/lastSuccessfulBuild/artifact/pkg/%{gem_name}-%{version}%{?prerelease}.gem
%else
Source0: https://rubygems.org/gems/%{gem_name}-%{version}%{?prerelease}.gem
%endif

# start specfile generated dependencies
Requires: %{?scl_prefix_ruby}ruby(release)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,11 @@ Summary: Foreman commands for Hammer
Group: Development/Languages
License: GPLv3+
URL: https://github.com/theforeman/hammer-cli-foreman
%if "%{prereleasesource}" == "pre.develop"
Source0: https://ci.theforeman.org/job/hammer-cli-foreman-master-source-release/lastSuccessfulBuild/artifact/pkg/%{gem_name}-%{version}%{?prerelease}.gem
%else
Source0: https://rubygems.org/gems/%{gem_name}-%{version}%{?prerelease}.gem
%endif

# start specfile generated dependencies
Requires: %{?scl_prefix_ruby}ruby(release)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
%global plugin_name katello

%global release 1
%global prereleasesource pre.master
%global git_branch master
%global prereleasesource pre.%{git_branch}
%global prerelease %{?prereleasesource:.}%{?prereleasesource}

%{!?_root_sysconfdir:%global _root_sysconfdir %{_sysconfdir}}
Expand All @@ -19,7 +20,11 @@ Summary: Katello commands for Hammer
Group: Development/Languages
License: GPLv3
URL: https://github.com/Katello/hammer-cli-katello
%if "%{prereleasesource}" == "pre.%{git_branch}"
Source0: https://ci.theforeman.org/job/hammer-cli-katello-%{git_branch}-source-release/lastSuccessfulBuild/artifact/%{gem_name}-%{version}%{?prerelease}.gem
%else
Source0: https://rubygems.org/gems/%{gem_name}-%{version}%{?prerelease}.gem
%endif

# start specfile generated dependencies
Requires: %{?scl_prefix_ruby}ruby(release)
Expand Down
7 changes: 6 additions & 1 deletion packages/katello/rubygem-katello/rubygem-katello.spec
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
%global foreman_max_version 3.6
%global plugin_name katello
%global gem_name katello
%global prereleasesource pre.master
%global git_branch master
%global prereleasesource pre.%{git_branch}
%global prerelease %{?prereleasesource:.}%{?prereleasesource}
%global mainver 4.7.0
%global release 3
Expand All @@ -19,7 +20,11 @@ Release: %{?prerelease:0.}%{release}%{?prerelease}%{?nightly}%{?dist}
Group: Applications/Systems
License: GPLv2
URL: https://theforeman.org/plugins/katello
%if "%{prereleasesource}" == "pre.%{git_branch}"
Source0: https://ci.theforeman.org/job/%{gem_name}-%{git_branch}-source-release/lastSuccessfulBuild/artifact/%{gem_name}-%{version}%{?prerelease}.gem
%else
Source0: https://rubygems.org/downloads/%{gem_name}-%{version}%{?prerelease}.gem
%endif

Autoreq: 0

Expand Down

0 comments on commit cdb14a2

Please sign in to comment.