Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix acceptance test Java version #1093

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix acceptance test Java version #1093

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fcb2326
remove deprecated function with native puppet
zilchms Mar 26, 2024
8b4dcb2
test if hiera needs different layout
zilchms Mar 27, 2024
fe6ac52
add correct Debian/Ubuntu java package name
zilchms Mar 27, 2024
d603621
push javaversion for acceptance tests to 17
zilchms Mar 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 1 addition & 4 deletions manifests/user_setup.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,7 @@

# On Debian the service is started by default so it must be configured prior
# to installation which is why it's configured in this file rather than config.pp
$config_hash = merge(
$jenkins::params::config_hash_defaults,
$jenkins::config_hash
)
$config_hash = $jenkins::params::config_hash_defaults + $jenkins::config_hash

systemd::dropin_file { 'puppet-overrides.conf':
unit => 'jenkins.service',
Expand Down
2 changes: 1 addition & 1 deletion spec/acceptance/hieradata/os/RedHat.yaml → spec/acceptance/hieradata/common.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
---
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the rename seems wrong, the package name is not common but specific to the RedHat family

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was going to say that https://github.com/voxpupuli/voxpupuli-acceptance/?tab=readme-ov-file#hiera shows the default hierachy, but this module still uses the old voxpupuli-acceptance 2.x where os really is family. See voxpupuli/voxpupuli-acceptance@650b642

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it does not since yesterday :)

# Jenkins 2.361.1 requires Java 11 or newer
java::package: java-11-openjdk-devel
java::package: java-17-openjdk-devel
3 changes: 3 additions & 0 deletions spec/acceptance/hieradata/os/Debian.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
# Jenkins 2.361.1 requires Java 11 or newer
java::package: openjdk-17-jdk
Comment on lines +2 to +3
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you say 11, but use 17? :)