Skip to content

Commit

Permalink
Add yast2_clone_system to validate generated profile on stagingY
Browse files Browse the repository at this point in the history
I updated the yaml scheduler.
I havent done any other change in test_suite.
REPO_SLE_MODULE_DEVELOPMENT_TOOLS is set to factory repo.
After installation of jing is removed.
Also I removed the xmllint.
  • Loading branch information
b10n1k committed Jan 17, 2020
1 parent 1a21779 commit 48c610c
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
1 change: 1 addition & 0 deletions schedule/staging/autoyast_mini@64bit-staging.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ schedule:
- autoyast/installation
- autoyast/console
- autoyast/login
- console/yast2_clone_system
- autoyast/wicked
- autoyast/repos
- autoyast/clone
Expand Down
16 changes: 8 additions & 8 deletions tests/console/yast2_clone_system.pm
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ use base "y2_module_consoletest";
use strict;
use warnings;
use testapi;
use version_utils qw(is_sle is_opensuse);
use version_utils qw(is_sle is_opensuse is_staging);
use utils 'zypper_call';
use repo_tools 'get_repo_var_name';

Expand Down Expand Up @@ -44,21 +44,21 @@ sub run {

unless (is_opensuse) {
my $devel_repo = get_required_var(is_sle('>=15') ? get_repo_var_name("MODULE_DEVELOPMENT_TOOLS") : 'REPO_SLE_SDK');
zypper_call "ar -c $utils::OPENQA_FTP_URL/" . $devel_repo . " devel-repo";
my $uri = (is_staging) ? $devel_repo : "$utils::OPENQA_FTP_URL/" . $devel_repo;
zypper_call "ar -c $uri devel-repo";
}

zypper_call '--gpg-auto-import-keys ref';
zypper_call 'install jing';

my $rc_jing = script_run "jing $xml_schema_path $ay_profile_path";
my $rc_xmllint = script_run "xmllint --noout --relaxng $xml_schema_path $ay_profile_path";
zypper_call 'install jing';
zypper_call "rr devel-repo" if (is_staging);
my $rc_jing = script_run "jing $xml_schema_path $ay_profile_path";

if (($rc_jing) || ($rc_xmllint)) {
if ($rc_jing) {
if (is_sle('<15')) {
record_soft_failure 'bsc#1103712';
}
else {
die "autoinst.xml does not validate for unknown reason";
die "$ay_profile_path does not validate";
}
}

Expand Down

0 comments on commit 48c610c

Please sign in to comment.