diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 9445aaa..f26baf0 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -8,6 +8,7 @@ on: pull_request: schedule: - cron: '0 6 * * 1' + workflow_dispatch: {} jobs: diff --git a/.sync.yml b/.sync.yml index 10b0a85..48b7cd6 100644 --- a/.sync.yml +++ b/.sync.yml @@ -5,6 +5,7 @@ Rakefile: .github/workflows/ci.yaml: run_on_schedule: - '0 6 * * 1' + workflow_dispatch: true acceptance_matrix: set: - ---el7 diff --git a/manifests/init.pp b/manifests/init.pp index 272939f..d530a0c 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -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 diff --git a/metadata.json b/metadata.json index a9e29bd..8818394 100644 --- a/metadata.json +++ b/metadata.json @@ -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" } diff --git a/spec/acceptance/openondemand_spec.rb b/spec/acceptance/openondemand_spec.rb index 66adf66..84eafbe 100644 --- a/spec/acceptance/openondemand_spec.rb +++ b/spec/acceptance/openondemand_spec.rb @@ -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