Merge branch 'main' into drop-gettext

Author: jcharaoui

.github/workflows/acceptance.yml

@@ -38,6 +38,12 @@ on:
         required: true
         type: string
         default: main
+      fork:
+        description: |-
+          (Fork) The fork of openvox-server to run the Beaker test suite from.
+        required: true
+        type: string
+        default: openvoxproject
       pre-release-build:
         description: |-
           (Pre-release Build) Whether to test unreleased version
@@ -85,12 +91,6 @@ on:
           true)
         default: 'https://s3.osuosl.org/openvox-artifacts'
         type: string
-      fork:
-        description: |-
-          The github fork of the project-name Beaker test suite to run.
-        required: true
-        type: string
-        default: openvoxproject
 
 permissions:
   contents: read
@@ -99,59 +99,14 @@ jobs:
   acceptance:
     uses: 'openvoxproject/shared-actions/.github/workflows/beaker_acceptance.yml@main'
     with:
+      suite-name: openvox-server
       ref: ${{ inputs.ref }}
-      project-name: openvox-server
-      install-openvox: true
+      fork: ${{ inputs.fork }}
       openvox-collection: ${{ inputs.collection }}
       openvox-agent-version: ${{ inputs.openvox-agent-version }}
       openvox-agent-pre-release-build: ${{ inputs.pre-release-build }}
-      install-openvox-server: true
       openvox-server-version: ${{ inputs.openvox-server-version }}
       openvox-server-pre-release-build: ${{ inputs.pre-release-build }}
-      install-openvoxdb: true
       openvoxdb-version: ${{ inputs.openvoxdb-version }}
       openvoxdb-pre-release-build: ${{ inputs.pre-release-build }}
       artifacts-url: ${{ inputs.artifacts-url }}
-      fork: ${{ inputs.fork }}
-      acceptance-working-dir: './'
-      acceptance-pre-suite: |-
-        [
-          "acceptance/suites/pre_suite/openvox/configure_type_defaults.rb",
-          "acceptance/suites/pre_suite/foss/00_setup_environment.rb",
-          "acceptance/suites/pre_suite/foss/070_InstallCACerts.rb",
-          "acceptance/suites/pre_suite/foss/10_update_ca_certs.rb",
-          "acceptance/suites/pre_suite/foss/15_prep_locales.rb",
-          "acceptance/suites/pre_suite/foss/71_smoke_test_puppetserver.rb",
-          "acceptance/suites/pre_suite/foss/80_configure_puppet.rb",
-          "acceptance/suites/pre_suite/foss/85_configure_sut.rb",
-          "acceptance/suites/pre_suite/foss/90_validate_sign_cert.rb",
-          "acceptance/suites/pre_suite/foss/95_install_pdb.rb",
-          "acceptance/suites/pre_suite/foss/99_collect_data.rb"
-        ]
-      acceptance-tests: |-
-        [
-          "acceptance/suites/tests"
-        ]
-      beaker-options: |-
-        {
-          "helper":       "acceptance/lib/helper.rb",
-          "load_path":    "acceptance/lib",
-          "options_file": "acceptance/config/beaker/options.rb"
-        }
-      vms: |-
-        [
-          {
-            "role": "primary",
-            "count": 1,
-            "cpus": 4,
-            "mem_mb": 8192,
-            "cpu_mode": "host-model"
-          },
-          {
-            "role": "agent",
-            "count": 1,
-            "cpus": 2,
-            "mem_mb": 2048,
-            "cpu_mode": "host-model"
-          }
-        ]

.github/workflows/build.yml

@@ -20,6 +20,10 @@ on:
           Branch/tag from ezbake that will be used for openvoxdb/server builds.
         type: string
         default: 'main'
+      ezbake-ver:
+        description: 'The version specified in project.clj in the given ezbake-ref. Will default to the version found in project.clj in this repo if not specified.'
+        type: string
+        required: false
 
 permissions:
   contents: read
@@ -31,4 +35,6 @@ jobs:
       ref: ${{ inputs.ref }}
       deb_platform_list: ${{ inputs.deb_platform_list }}
       rpm_platform_list: ${{ inputs.rpm_platform_list }}
+      ezbake-ref: ${{ inputs.ezbake-ref }}
+      ezbake-ver: ${{ inputs.ezbake-ver }}
     secrets: inherit

.github/workflows/pr-testing.yml

@@ -29,11 +29,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           submodules: recursive
       - name: setup java
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
           java-version: ${{ matrix.version }}
@@ -61,15 +61,15 @@ jobs:
         ruby: ['3.1', '3.2', '3.3', '3.4']
     steps:
       - name: checkout repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           submodules: recursive
       - name: setup ruby
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
       - name: setup java
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
           java-version: ${{ matrix.java }}
@@ -87,7 +87,7 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: checkout repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           submodules: recursive
       - name: setup ruby
@@ -105,12 +105,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: setup java
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: temurin
           java-version: 17
       - name: checkout repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       # newer versions cause lint errors
       # https://github.com/clj-kondo/clj-kondo/releases
       - name: Install clojure tools
@@ -121,6 +121,7 @@ jobs:
         run: clj-kondo --lint src test
 
   tests:
+    if: always()
     needs:
       - clojure-tests
       - rspec-tests
@@ -129,4 +130,7 @@ jobs:
     runs-on: ubuntu-24.04
     name: Test suite
     steps:
-      - run: echo Test suite completed
+      - name: Decide whether the needed jobs succeeded or failed
+        uses: re-actors/alls-green@release/v1
+        with:
+          jobs: ${{ toJSON(needs) }}

.github/workflows/release.yaml

@@ -13,7 +13,7 @@ jobs:
     # Optional but recommended to use a specific environment
     environment: release
     # Prevent releases from forked repositories
-    if: github.repository_owner == 'OpenVoxProject'
+    if: github.repository_owner == 'OpenVoxProject' && !startsWith(github.ref_name, '99.')
 
     permissions:
       contents: write

Gemfile

@@ -10,7 +10,7 @@ def location_for(place, fake_version = nil)
   end
 end
 
-gem 'public_suffix', '>= 4.0.7', '< 7'
+gem 'public_suffix', '>= 4.0.7', '< 8'
 # 1.0.0 is the first OpenVoxProject release
 gem 'packaging', '~> 1.0', github: 'OpenVoxProject/packaging'
 gem 'rake', :group => [:development, :test]

dev-resources/Gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gem 'openvoxserver-ca'

dev-resources/README.md

@@ -1,3 +1,12 @@
-This directory should only contain files (sample data, ssl files, etc.) that are
-referenced by tests.  When possible, files should be placed in a package/directory
-structure that corresponds with the test that is using them.
+# dev-resources
+
+This directory should only contain files (sample data, ssl files, etc.) that are referenced by tests.
+When possible, files should be placed in a package/directory structure that corresponds with the test that is using them.
+
+## regenerate certificates
+
+```shell
+bundle config set --local path 'vendor/bundle'
+bundle install
+bundle exec ruby regen_certs.rb
+```

dev-resources/puppetlabs/puppetserver/certificate_authority_test/master/conf/ca/ca_crl.pem

@@ -1,17 +1,12 @@
 -----BEGIN X509 CRL-----
-MIICvTCBpgIBATANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDDBRQdXBwZXQgQ0E6
-IGxvY2FsaG9zdBcNMjAwODIwMjAzNTM0WhcNMjUwODIwMjAzNTM1WjAiMCACAQQX
-DTIwMDgyMDIwMzUzNVowDDAKBgNVHRUEAwoBAaAvMC0wCgYDVR0UBAMCAQEwHwYD
-VR0jBBgwFoAUZJODtkR2pYd8nASfjQN5gUGDYBgwDQYJKoZIhvcNAQELBQADggIB
-ABwQ2e2XXCd8b54HzCBOxo8IBypsILzn3rA0HJzgsaT1ioMQKXaBt942J695Cagx
-Q21NAIKSilbZTqUOevvEHaTS1AeyRr5Ua38oTaHecI5bA+ZDm7EFtdEIRvAMI3pD
-KCOQlImPJTYO1IQP/3ikSWwVhkDs080/3Axy+V0QfauifBxOcFpjp6qStdAaW8Yw
-k5JL1hXE5ywJVOSaZtUTkcnLNq0J1BhIlAyQ41A9gl29+XU2CdwhvuAXSFwCxT0n
-xdPeqQNjZoGB6RsRRGuTBLucmcH1xio4hTxWxgBW0wyMMwyfPcboZ9Wfy1hC4AFy
-2g1LwY9RrfF45wUOlWAvWtjvBQzv2LqFcnS9q0uy8T/TL2dSJPq5bjXI0R/cbPhh
-ukliIbmGhAWZ4B7lsPHa1L2CSsGNBXjYDevXKMnR2BY62Y4KL2mx7AAz/IyAWa99
-rdHvU76KHRiuDCSpEoPxhmDvG6lpBEQzOO6izyBZ6VrGXNZeZEPJ81+wbr9o5ODc
-xqAJBnKyhiveBuggmkzi+sHRqa0sRat3ltrF8xmNoT/RtzqD2RCpe6WUzY9JWnXV
-ISwNTvFR9AbjEIS4Vuy5RwKLqxmcRqvN9GQsuo5RralJIxogstLddQRNw+c+h3Zu
-zA6SmZ55ocyn3FN9V4ubrdNF+W4BFEwe82gfspJmKZaz
+MIIBrzCBmAIBATANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDDBRQdXBwZXQgQ0E6
+IGxvY2FsaG9zdBcNMjUwODE4MDkxMjE5WhcNMzAwODE4MDkxMjE5WjAUMBICAQQX
+DTI1MDgxOTA5MTIxOVqgLzAtMB8GA1UdIwQYMBaAFDFTaF7Cc7HdPYz2vTh5xz9h
+gzBqMAoGA1UdFAQDAgEAMA0GCSqGSIb3DQEBCwUAA4IBAQCIBSDp0CU/1z2UbmM4
+C9v2AhauxFe+mdrsBkxvimgn7FQ1XRJQSOSiOClY9/+w3mJMOF7TX8ylQ/QQOuYv
+q/mszEUTC8WsJ+QmhfA+GClycqUcvqGT0ksFS4Ftu8rQWWzJfExFhJoFEHhNH6iF
+K9Fzvy4VPRUqT7Ke7Mz0J1V4pqfQk8Ijpt/3Z5nQ4uozmldSyKC6WxAJ4p20KkCt
+9fbOXWXVkENq1M6Kqt82qaHwFyHWKnPweTnCbc3aORft7lcTnX6bumSdsXHptBFy
+++utMa+MGI/tQE6qIlBQwqO0ECJ1s4OOMSIsxmsT8jwruoM1qnIqqtd4DQtIhUl8
+463w
 -----END X509 CRL-----

dev-resources/puppetlabs/puppetserver/certificate_authority_test/master/conf/ca/ca_crt.pem

@@ -1,31 +1,20 @@
 -----BEGIN CERTIFICATE-----
-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
+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
 -----END CERTIFICATE-----

dev-resources/puppetlabs/puppetserver/certificate_authority_test/master/conf/ca/ca_key.pem

@@ -1,51 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----