Skip to content

Commit

Permalink
Add installation of apache2-utils also for gensslcert for jeos
Browse files Browse the repository at this point in the history
till now we just install this package for Tumbleweed, recently failure
of gensslcert on jeos shows that we need make sure that apache2-util got
installed.
see https://progress.opensuse.org/issues/157864, https://progress.opensuse.org/issues/157894
  • Loading branch information
Zaoliang committed Mar 25, 2024
1 parent c28bff9 commit c67d9fa
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
4 changes: 2 additions & 2 deletions lib/apachetest.pm
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ use strict;
use warnings;
use testapi;
use utils;
use version_utils qw(is_sle is_leap check_version is_tumbleweed);
use version_utils qw(is_sle is_leap check_version is_tumbleweed is_jeos);
use Utils::Architectures qw(is_aarch64);

our @EXPORT = qw(setup_apache2 setup_pgsqldb destroy_pgsqldb test_pgsql test_mysql postgresql_cleanup);
Expand All @@ -42,7 +42,7 @@ sub setup_apache2 {
push @packages, get_var('APACHE2_PKG', "apache2");

# For gensslcert
push @packages, 'apache2-utils', 'openssl' if is_tumbleweed;
push @packages, 'apache2-utils', 'openssl' if (is_tumbleweed || is_jeos);

if (($mode eq "NSS") && get_var("FIPS")) {
$mode = "NSSFIPS";
Expand Down
1 change: 1 addition & 0 deletions tests/console/apache.pm
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ sub run {

# Install and start apache
zypper_call "in $apache2";
zypper_call "in apache2-utils" if is_jeos;
systemctl 'enable apache2'; # Note: The systemd service is always apache2, not apache2-tls13.
systemctl 'restart apache2'; # apache2 could be already running from previous test runs
systemctl 'status apache2';
Expand Down

0 comments on commit c67d9fa

Please sign in to comment.