Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ on:
pull_request:
schedule:
- cron: '0 6 * * 1'
workflow_dispatch: {}


jobs:
Expand Down
1 change: 1 addition & 0 deletions .sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ Rakefile:
.github/workflows/ci.yaml:
run_on_schedule:
- '0 6 * * 1'
workflow_dispatch: true
acceptance_matrix:
set:
- ---el7
Expand Down
3 changes: 2 additions & 1 deletion manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,8 @@
fail("Unsupported OS: module ${module_name}. osfamily=${osfamily} osmajor=${osmajor} detected")
}

if $repo_release == '3.1' {
$repo_version = split($repo_release, '/')[-1]
if $repo_version == '3.1' {
# Debian 12 and Ubuntu 24.04 in OnDemand 3.1 use OS NodeJS
if (String($openondemand::osmajor) in ['12', '24.04']) {
$nodejs = undef
Expand Down
4 changes: 2 additions & 2 deletions metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
"hpc",
"gateway"
],
"pdk-version": "2.7.1",
"pdk-version": "3.4.0",
"template-url": "https://github.com/treydock/pdk-templates.git#master",
"template-ref": "heads/master-0-gd2de99e"
"template-ref": "heads/master-0-g3c12381"
}
4 changes: 2 additions & 2 deletions spec/acceptance/openondemand_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@

describe 'openondemand class:' do
supported_releases.each do |release|
context "when repo_release => #{release}" do
context "when repo_release => 'staging/#{release}'" do
it 'runs successfully' do
pp = <<-PP
class { 'openondemand':
repo_release => '#{release}',
repo_release => 'staging/#{release}',
generator_insecure => true,
}
PP
Expand Down