Skip to content

Commit e2e5498

Browse files
authored
Merge pull request #749 from voxpupuli/modulesync
modulesync 10.8.0
2 parents 9357fb1 + 62fc3ef commit e2e5498

3 files changed

Lines changed: 30 additions & 3 deletions

File tree

.github/workflows/ci.yml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,29 @@ on:
1111
branches:
1212
- main
1313
- master
14+
workflow_dispatch:
15+
inputs:
16+
beaker_staging_url:
17+
description: |-
18+
URL to a staging Server to test unreleased packages.
19+
We will append the version to the Server and assume all packages are in the same directory.
20+
Only supported for AIO packages.
21+
required: false
22+
type: string
23+
default: 'https://artifacts.voxpupuli.org/openvox-agent'
24+
beaker_collection:
25+
description: |-
26+
When set to staging, we will download the packages from staging_url.
27+
Otherwise we will use the official repos. Supported values: puppet7, puppet8, openvox7, openvox8, staging.
28+
When unset, we will generate a list of supported collections based on metadata.json.
29+
required: false
30+
type: string
31+
beaker_staging_version:
32+
description: |-
33+
The package version we want to test.
34+
Only used for beaker_collection = staging
35+
required: false
36+
type: string
1437

1538
concurrency:
1639
group: ${{ github.ref_name }}
@@ -23,3 +46,7 @@ jobs:
2346
puppet:
2447
name: Puppet
2548
uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v4
49+
with:
50+
beaker_staging_url: ${{ inputs.beaker_staging_url }}
51+
beaker_collection: ${{ inputs.beaker_collection }}
52+
beaker_staging_version: ${{ inputs.beaker_staging_version }}

.msync.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
# Managed by modulesync - DO NOT EDIT
33
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
44

5-
modulesync_config_version: '10.7.0'
5+
modulesync_config_version: '10.8.0'

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ source ENV['GEM_SOURCE'] || 'https://rubygems.org'
55

66
group :test do
77
gem 'voxpupuli-test', '~> 14.0', :require => false
8-
gem 'puppet_metadata', '~> 6.0', :require => false
8+
gem 'puppet_metadata', '~> 6.1', :require => false
99
end
1010

1111
group :development do
@@ -14,7 +14,7 @@ group :development do
1414
end
1515

1616
group :system_tests do
17-
gem 'voxpupuli-acceptance', '~> 4.0', :require => false
17+
gem 'voxpupuli-acceptance', '~> 4.4', :require => false
1818
end
1919

2020
group :release do

0 commit comments

Comments
 (0)