Improve testing for acceptance and add back Ubuntu 20.04 (#186)

* Improve testing for acceptance

* Attempt to fix UTF-8 errors for execs by using /dev/null redirect

Author: treydock

.github/workflows/ci.yaml

@@ -42,6 +42,7 @@ jobs:
       - name: Run tests
         run: bundle exec rake parallel_spec
   acceptance:
+    # Run on 22.04 until newer doesn't cause ioctl errors for el10 tests
     runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
@@ -56,10 +57,29 @@ jobs:
           - "debian-12"
         puppet:
           - "puppet8"
+        repo_release:
+          - "staging/4.0"
+          - "staging/4.1"
+          - "4.0"
+          - "4.1"
+        include:
+          - set: "ubuntu-2004"
+            puppet: "puppet8"
+            repo_release: "staging/4.0"
+          - set: "ubuntu-2004"
+            puppet: "puppet8"
+            repo_release: "4.0"
+        exclude:
+          - set: "el10"
+            puppet: "puppet8"
+            repo_release: "staging/4.0"
+          - set: "el10"
+            puppet: "puppet8"
+            repo_release: "4.0"
     env:
       BUNDLE_WITHOUT: development:release
       BEAKER_debug: true
-    name: ${{ matrix.puppet }} ${{ matrix.set }}
+    name: ${{ matrix.puppet }} ${{ matrix.set }} (repo=${{ matrix.repo_release }})
     steps:
       - name: Enable IPv6 on docker
         run: |
@@ -86,3 +106,4 @@ jobs:
         env:
           BEAKER_PUPPET_COLLECTION: ${{ matrix.puppet }}
           BEAKER_set: ${{ matrix.set }}
+          BEAKER_repo_release: ${{ matrix.repo_release }}

.sync.yml

@@ -6,6 +6,7 @@ Rakefile:
   run_on_schedule:
     - '0 6 * * 1'
   workflow_dispatch: true
+  acceptance_name: '${{ matrix.puppet }} ${{ matrix.set }} (repo=${{ matrix.repo_release }})'
   acceptance_matrix:
       set:
         - el8
@@ -17,6 +18,25 @@ Rakefile:
         - debian-12
       puppet:
         - puppet8
+      repo_release:
+        - staging/4.0
+        - staging/4.1
+        - '4.0'
+        - '4.1'
+  acceptance_includes:
+    - set: ubuntu-2004
+      puppet: puppet8
+      repo_release: staging/4.0
+    - set: ubuntu-2004
+      puppet: puppet8
+      repo_release: '4.0'
+  acceptance_excludes:
+    - set: el10
+      puppet: puppet8
+      repo_release: staging/4.0
+    - set: el10
+      puppet: puppet8
+      repo_release: '4.0'
 .gitlab-ci.yml:
   delete: true
 appveyor.yml:
@@ -44,7 +64,7 @@ spec/acceptance/nodesets/debian-11.yml:
 spec/acceptance/nodesets/ubuntu-1804.yml:
   delete: true
 spec/acceptance/nodesets/ubuntu-2004.yml:
-  delete: true
+  unmanaged:  true
 spec/acceptance/nodesets/ubuntu-2204.yml:
   packages:
     - cron

README.md

@@ -358,10 +358,11 @@ openondemand::confs:
 
 This module has been tested on:
 
-* RedHat/CentOS 7 x86_64
 * RedHat/Rocky Linux/Alma Linux 8
 * RedHat/Rocky Linux/Alma Linux 9
+* RedHat/Rocky Linux/Alma Linux 10 (OnDemand 4.1 only)
 * Amazon Linux 2023
-* Ubuntu 20.04
+* Ubuntu 20.04 (OnDemand 4.0 only)
 * Ubuntu 22.04
+* Ubuntu 24.04
 * Debian 12

manifests/init.pp

@@ -404,14 +404,21 @@
   $osfamily = $facts.dig('os', 'family')
   $osname = $facts.dig('os', 'name')
   $osmajor = $facts.dig('os', 'release', 'major')
+  $repo_version = split($repo_release, '/')[-1]
 
-  $supported = ['RedHat-8','RedHat-9','RedHat-10','RedHat-2023','Debian-22.04','Debian-24.04','Debian-12']
+  $supported = ['RedHat-8','RedHat-9','RedHat-10','RedHat-2023','Debian-20.04','Debian-22.04','Debian-24.04','Debian-12']
   $os = "${osfamily}-${osmajor}"
   if ! ($os in $supported) {
     fail("Unsupported OS: module ${module_name}. osfamily=${osfamily} osmajor=${osmajor} detected")
   }
 
-  $repo_version = split($repo_release, '/')[-1]
+  if $facts['os']['family'] == 'RedHat' and String($openondemand::osmajor) == '10' and $repo_version == '4.0' {
+    fail('EL10 is not supported for OnDemand 4.0')
+  }
+  if $facts['os']['name'] == 'Ubuntu' and String($openondemand::osmajor) == '20.04' and $repo_version == '4.1' {
+    fail('Ubuntu 20.04 is not supported for OnDemand 4.1')
+  }
+
   if $repo_version == '4.0' {
     $nodejs = '20'
     $ruby = '3.3'

manifests/service.pp

@@ -4,7 +4,7 @@
   assert_private()
 
   exec { 'nginx_stage-app_clean':
-    command     => '/opt/ood/nginx_stage/sbin/nginx_stage app_clean',
+    command     => '/opt/ood/nginx_stage/sbin/nginx_stage app_clean &>/dev/null',
     refreshonly => true,
     subscribe   => [
       File['/etc/ood/config/nginx_stage.yml'],
@@ -13,7 +13,7 @@
     ],
   }
   -> exec { 'nginx_stage-app_reset-pun':
-    command     => '/opt/ood/nginx_stage/sbin/nginx_stage app_reset --sub-uri=/pun',
+    command     => '/opt/ood/nginx_stage/sbin/nginx_stage app_reset --sub-uri=/pun &>/dev/null',
     refreshonly => true,
     subscribe   => [
       File['/etc/ood/config/nginx_stage.yml'],
@@ -22,7 +22,7 @@
     ],
   }
   -> exec { 'nginx_stage-nginx_clean':
-    command     => '/opt/ood/nginx_stage/sbin/nginx_stage nginx_clean',
+    command     => '/opt/ood/nginx_stage/sbin/nginx_stage nginx_clean &>/dev/null',
     refreshonly => true,
     subscribe   => [
       File['/etc/ood/config/nginx_stage.yml'],

metadata.json

@@ -79,6 +79,7 @@
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
+        "20.04",
         "22.04",
         "24.04"
       ]
@@ -102,6 +103,6 @@
     "gateway"
   ],
   "pdk-version": "3.4.0",
-  "template-url": "https://github.com/treydock/pdk-templates.git#el10",
-  "template-ref": "remotes/origin/el10-0-g7f231cc"
+  "template-url": "https://github.com/treydock/pdk-templates.git#master",
+  "template-ref": "heads/master-0-g875588c"
 }

spec/acceptance/nodesets/ubuntu-2004.yml

@@ -0,0 +1,28 @@
+HOSTS:
+  ubuntu2004:
+    roles:
+      - agent
+    platform: ubuntu-20.04-amd64
+    hypervisor : docker
+    image: ubuntu:20.04
+    docker_preserve_image: true
+    docker_cmd: '["/sbin/init"]'
+    docker_image_commands:
+      - "rm -f /etc/dpkg/dpkg.cfg.d/excludes"
+      - 'apt-get install -y wget net-tools iproute2 locales apt-transport-https ca-certificates cron'
+      - 'locale-gen en_US.UTF-8'
+    docker_env:
+      - LANG=en_US.UTF-8
+      - LANGUAGE=en_US.UTF-8
+      - LC_ALL=en_US.UTF-8
+    docker_container_name: 'openondemand-ubuntu2004'
+    default_module_install_opts:
+      ignore-dependencies: 
+      force: 
+CONFIG:
+  log_level: debug
+  type: foss
+ssh:
+  password: root
+  auth_methods: ["password"]
+

spec/acceptance/openondemand_spec.rb

@@ -3,21 +3,19 @@
 require 'spec_helper_acceptance'
 
 describe 'openondemand class:' do
-  supported_releases.each_pair do |release, versions|
-    versions.each do |version|
-      context "when repo_release => 'staging/#{release}' ondemand_package_ensure => '#{version}'" do
-        it 'runs successfully' do
-          pp = <<-PP
-          class { 'openondemand':
-            repo_release            => 'staging/#{release}',
-            ondemand_package_ensure => '#{version}',
-            generator_insecure      => true,
-          }
-          PP
-
-          apply_manifest(pp, catch_failures: true)
-          apply_manifest(pp, catch_changes: true)
-        end
+  versions(RSpec.configuration.repo_release).each do |version|
+    context "when repo_release => '#{RSpec.configuration.repo_release}' ondemand_package_ensure => '#{version}'" do
+      it 'runs successfully' do
+        pp = <<-PP
+        class { 'openondemand':
+          repo_release            => '#{RSpec.configuration.repo_release}',
+          ondemand_package_ensure => '#{version}',
+          generator_insecure      => true,
+        }
+        PP
+
+        apply_manifest(pp, catch_failures: true)
+        apply_manifest(pp, catch_changes: true)
       end
     end
   end

spec/classes/init_spec.rb

@@ -8,6 +8,15 @@
       let(:facts) do
         facts
       end
+      let(:default_params) do
+        if facts[:os]['name'] == 'Ubuntu' && facts[:os]['release']['major'] == '20.04'
+          { repo_release: '4.0' }
+        else
+          {}
+        end
+      end
+      let(:param_override) { {} }
+      let(:params) { default_params.merge(param_override) }
 
       it { is_expected.to compile.with_all_deps }
 

spec/shared_examples/config.rb

@@ -6,7 +6,7 @@
   end
 
   context 'with nginx_stage options defined' do
-    let(:params) do
+    let(:param_override) do
       {
         nginx_stage_passenger_options: {
           'passenger_foobar' => 'baz',
@@ -23,7 +23,7 @@
   end
 
   context 'with configurations defined' do
-    let(:params) do
+    let(:param_override) do
       {
         'pinned_apps' => [
           'usr/*',
@@ -50,12 +50,12 @@
     it 'has valid config' do
       content = catalogue.resource('file', '/etc/ood/config/ondemand.d/ondemand.yml').send(:parameters)[:content]
       data = YAML.safe_load(content)
-      expect(data).to eq(params)
+      expect(data).to eq(param_override)
     end
   end
 
   context 'with hook.env' do
-    let(:params) { { pun_pre_hook_root_cmd: '/dne/hook.sh' } }
+    let(:param_override) { { pun_pre_hook_root_cmd: '/dne/hook.sh' } }
 
     it 'has default hook contents' do
       is_expected.to contain_file('/etc/ood/config/hook.env').with(
@@ -69,7 +69,7 @@
     end
 
     context 'with hook config defined' do
-      let(:params) do
+      let(:param_override) do
         {
           pun_pre_hook_root_cmd: '/dne/hook.sh',
           oidc_client_id: 'ondemand',
@@ -102,7 +102,7 @@
     end
 
     context 'with nginx_stage_configs options defined' do
-      let(:params) do
+      let(:param_override) do
         {
           nginx_stage_configs: {
             'foo' => 'bar',