Skip to content

Commit 666b1a0

Browse files
authored
Merge pull request #609 from AriaXLi/main
(FM-8943) Enable to install from nightly repo for Ubuntu 22.04 for task beaker tests
2 parents 21a148a + 54d0beb commit 666b1a0

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

rakelib/commits.rake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ 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|fm|modules-\d+)\)|revert/i.match(commit_summary).nil?
10+
if /^\((maint|packaging|doc|docs|fm-\d+|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" \

task_spec/spec/acceptance/init_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ def target_platform
7777

7878
# Try to install an older puppet6 version
7979
results = if %r{ubuntu-22.04}.match?(target_platform)
80-
run_task('puppet_agent::install', 'target', { 'collection' => 'puppet6_nightly',
80+
run_task('puppet_agent::install', 'target', { 'collection' => 'puppet6-nightly',
8181
'version' => puppet_6_version,
8282
'stop_service' => true })
8383
else

0 commit comments

Comments
 (0)