Skip to content

Commit 71e9eaf

Browse files
committed
(maint) Enable to install from nightly repo for Ubuntu 22.04 for task beaker tests
Also, allow commit mesages to begin with FM-<digits> for internal modules tickets
1 parent 3a22b68 commit 71e9eaf

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

rakelib/commits.rake

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,12 @@ task(:commits) do
77
%x{git log --no-merges --pretty=%s #{commit_range}}.each_line do |commit_summary|
88
# This regex tests for the currently supported commit summary tokens.
99
# The exception tries to explain it in more full.
10-
if /^\((maint|packaging|doc|docs|modules-\d+)\)|revert/i.match(commit_summary).nil?
10+
if /^\((maint|packaging|doc|docs|fm|modules-\d+)\)|revert/i.match(commit_summary).nil?
1111
raise "\n\n\n\tThis commit summary didn't match CONTRIBUTING.md guidelines:\n" \
1212
"\n\t\t#{commit_summary}\n" \
1313
"\tThe commit summary (i.e. the first line of the commit message) should start with one of:\n" \
1414
"\t\t(MODULES-<digits>) # this is most common and should be a ticket at tickets.puppet.com\n" \
15+
"\t\t(FM-<digits>)\n" \
1516
"\t\t(docs)\n" \
1617
"\t\t(docs)(DOCUMENT-<digits>)\n" \
1718
"\t\t(packaging)\n"

task_spec/spec/acceptance/init_spec.rb

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,15 @@ def target_platform
7676
end
7777

7878
# Try to install an older puppet6 version
79-
results = run_task('puppet_agent::install', 'target', { 'collection' => 'puppet6',
80-
'version' => puppet_6_version,
81-
'stop_service' => true })
79+
results = if %r{ubuntu-22.04}.match?(target_platform)
80+
run_task('puppet_agent::install', 'target', { 'collection' => 'puppet6_nightly',
81+
'version' => puppet_6_version,
82+
'stop_service' => true })
83+
else
84+
run_task('puppet_agent::install', 'target', { 'collection' => 'puppet6',
85+
'version' => puppet_6_version,
86+
'stop_service' => true })
87+
end
8288
expect(results).to all(include('status' => 'success'))
8389

8490
# It installed a version older than latest puppet6

0 commit comments

Comments
 (0)