Skip to content

Commit 63efac5

Browse files
authored
Merge pull request #166 from OpenVoxProject/fix_int_tests
Fix int tests due to missing BC jars
2 parents 9c1fb59 + 45013e3 commit 63efac5

2 files changed

Lines changed: 6 additions & 2 deletions

File tree

ext/bin/config-puppetserver-test-ref

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,12 @@ fi
7171
# Install Puppet Server dependencies
7272
# If we're not testing against the git tree (say in jenkins), don't install.
7373
if test -z "$PDB_NO_PUPPETSERVER_INSTALL"; then
74+
# Because openvox-server as of 8.12.0 no longer packages the BC code directly
75+
# in the uberjar due to flexibility building for FIPS and non-FIPS, and is only
76+
# included in the ezbake packaging profile, we need to build the uberjar here
77+
# with that profile. Should probably fix this in the openvox-server project.clj at some point.
7478
lein install
75-
lein uberjar
79+
lein with-profile ezbake uberjar
7680
fi
7781
# Cache Puppet Server version in a file in ext/test-conf directory
7882
dep_ver="$(lein-pprint :version)"

tasks/test.rake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ namespace :vox do
2929
spec = args[:spec] || 'core+ext/openjdk17/pg-17'
3030
_suite, java, _pg = spec.split('/')
3131

32-
image = java =~ /17/ ? "debian:12" : "debian:13"
32+
image = java =~ /17/ ? "ruby:3.2-bookworm" : "ruby:3.2-trixie"
3333

3434
puts "Starting container"
3535
teardown if container_exists

0 commit comments

Comments
 (0)