merge develop

This commit is contained in:
Trevor Cooper 2023-08-20 14:49:36 -07:00
commit ca2b34e4cd
Signed by: tcooper
GPG Key ID: 52364D7BBCEB35B8
43 changed files with 474 additions and 29 deletions
needles
anaconda
cockpit
console
gnome/japanese
scripts
templates.fif.json
tests

View File

@ -0,0 +1,17 @@
{
"area": [
{
"xpos": 66,
"ypos": 295,
"width": 441,
"type": "match",
"height": 20
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"ENV-LANGUAGE-english",
"anaconda_help_localization_link"
]
}

Binary file not shown.

After

(image error) Size: 91 KiB

View File

@ -0,0 +1,17 @@
{
"area": [
{
"width": 36,
"ypos": 145,
"xpos": 250,
"height": 11,
"type": "match"
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"LANGUAGE-arabic",
"anaconda_install_user_created"
]
}

Binary file not shown.

After

(image error) Size: 123 KiB

View File

@ -0,0 +1,24 @@
{
"area": [
{
"ypos": 634,
"xpos": 716,
"width": 305,
"height": 14,
"type": "match"
},
{
"type": "match",
"height": 14,
"ypos": 698,
"width": 105,
"xpos": 875
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"LANGUAGE-japanese",
"anaconda_install_done"
]
}

Binary file not shown.

After

(image error) Size: 226 KiB

View File

@ -0,0 +1,17 @@
{
"area": [
{
"xpos": 398,
"ypos": 145,
"width": 36,
"type": "match",
"height": 11
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"LANGUAGE-russian",
"anaconda_install_user_created"
]
}

Binary file not shown.

After

(image error) Size: 129 KiB

View File

@ -0,0 +1,17 @@
{
"area": [
{
"xpos": 224,
"ypos": 361,
"width": 45,
"height": 11,
"type": "match"
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"LANGUAGE-arabic",
"anaconda_network_connected"
]
}

Binary file not shown.

After

(image error) Size: 250 KiB

View File

@ -0,0 +1,17 @@
{
"area": [
{
"xpos": 783,
"ypos": 364,
"width": 60,
"height": 10,
"type": "match"
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"LANGUAGE-french",
"anaconda_network_connected"
]
}

View File

@ -0,0 +1,17 @@
{
"area": [
{
"xpos": 785,
"ypos": 362,
"width": 50,
"height": 10,
"type": "match"
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"LANGUAGE-japanese",
"anaconda_network_connected"
]
}

View File

@ -0,0 +1,17 @@
{
"area": [
{
"xpos": 719,
"height": 18,
"type": "match",
"ypos": 359,
"width": 105
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"ENV-LANGUAGE-english",
"anaconda_network_connected"
]
}

Binary file not shown.

After

(image error) Size: 250 KiB

View File

@ -0,0 +1,17 @@
{
"area": [
{
"xpos": 778,
"ypos": 364,
"width": 68,
"height": 10,
"type": "match"
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"LANGUAGE-russian",
"anaconda_network_connected"
]
}

View File

@ -0,0 +1,21 @@
{
"area": [
{
"height": 21,
"type": "match",
"width": 42,
"xpos": 965,
"ypos": 34,
"click_point": {
"xpos": 21,
"ypos": 10.5
}
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"LANGUAGE-arabic",
"anaconda_spoke_done"
]
}

Binary file not shown.

After

(image error) Size: 126 KiB

View File

@ -0,0 +1,20 @@
{
"area": [
{
"width": 56,
"ypos": 34,
"xpos": 17,
"height": 21,
"type": "match",
"click_point": {
"xpos": 28,
"ypos": 10.5
}
}
],
"properties": [],
"tags": [
"LANGUAGE-russian",
"anaconda_spoke_done"
]
}

Binary file not shown.

After

(image error) Size: 127 KiB

View File

@ -0,0 +1,16 @@
{
"area": [
{
"ypos": 475,
"xpos": 529,
"width": 40,
"height": 21,
"type": "match"
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"autoupdate_planned_time"
]
}

Binary file not shown.

After

(image error) Size: 47 KiB

View File

@ -0,0 +1,17 @@
{
"area": [
{
"height": 28,
"type": "match",
"ypos": 585,
"xpos": 264,
"width": 133
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"ENV-LANGUAGE-english",
"cockpit_services_detail"
]
}

Binary file not shown.

After

(image error) Size: 73 KiB

View File

@ -0,0 +1,17 @@
{
"area": [
{
"ypos": 362,
"width": 39,
"xpos": 14,
"height": 18,
"type": "match"
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"ENV-LANGUAGE-english",
"cockpit_logs"
]
}

Binary file not shown.

After

(image error) Size: 76 KiB

View File

@ -0,0 +1,17 @@
{
"area": [
{
"ypos": 618,
"xpos": 16,
"width": 143,
"height": 10,
"type": "match"
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"LANGUAGE-english",
"boot_enter_passphrase"
]
}

Binary file not shown.

After

(image error) Size: 97 KiB

View File

@ -0,0 +1,17 @@
{
"area": [
{
"width": 113,
"ypos": 575,
"xpos": 427,
"type": "match",
"height": 19
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"ENV-LANGUAGE-english",
"bootloader_uefi"
]
}

Binary file not shown.

After

(image error) Size: 9.8 KiB

View File

@ -0,0 +1,18 @@
{
"area": [
{
"type": "match",
"ypos": 611,
"width": 113,
"xpos": 210,
"height": 19
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"ENV-LANGUAGE-english",
"bootloader",
"bootloader_uefi"
]
}

Binary file not shown.

After

(image error) Size: 9.4 KiB

View File

@ -0,0 +1,18 @@
{
"area": [
{
"width": 113,
"ypos": 611,
"type": "match",
"height": 19,
"xpos": 210
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"ENV-LANGUAGE-english",
"bootloader",
"bootloader_uefi"
]
}

Binary file not shown.

After

(image error) Size: 6.9 KiB

View File

@ -0,0 +1,16 @@
{
"area": [
{
"type": "match",
"height": 157,
"width": 163,
"ypos": 224,
"xpos": 445
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"getting_started"
]
}

Binary file not shown.

After

(image error) Size: 201 KiB

View File

@ -1,16 +1,18 @@
#!/bin/bash #!/bin/bash
set -e set -e
MAJOR_VERSION=9
MINOR_VERSION=0
## Usage: Posts ISOs to openQA for each of the universal, dvd-iso, package-set, minimal-iso, and boot-iso FLAVORs. ## Usage: Posts ISOs to openQA for each of the universal, dvd-iso, package-set, minimal-iso, and boot-iso FLAVORs.
# scripts/run-all-flavors.sh # scripts/run-all-flavors.sh
# Test a beta build with alternative repo URL
# ROCKY_EXTRA_ARGS="GRUB=ip=dhcp GRUBADD=inst.repo=https://dl.rockylinux.org/stg/rocky/8.8-BETA/BaseOS/x86_64/os DNF_CONTENTDIR=stg CURRREL=8 IDENTIFICATION=false" scripts/run-all-flavors.sh
ROCKY_VERSION="$MAJOR_VERSION.$MINOR_VERSION" ROCKY_VERSION="9.2"
MAJOR_VERSION=${ROCKY_VERSION:0:1}
MINOR_VERSION=${ROCKY_VERSION:2:1}
ROCKY_ARCH="${ROCKY_ARCH:=x86_64}" ROCKY_ARCH="${ROCKY_ARCH:=x86_64}"
ROCKY_EXTRA_ARGS="${ROCKY_EXTRA_ARGS:-}" ROCKY_EXTRA_ARGS="${ROCKY_EXTRA_ARGS:-}"
BUILD_PREFIX="-$(date +%Y%m%d.%H%M%S).0-$(git branch --show-current)" BUILD_NAME="-$(date +%Y%m%d).0-$(git branch --show-current)-$ROCKY_VERSION"
ISO_PREFIX="Rocky-$ROCKY_VERSION-$ROCKY_ARCH" ISO_PREFIX="Rocky-$ROCKY_VERSION-$ROCKY_ARCH"
DVD_ISOTYPE=dvd1 DVD_ISOTYPE=dvd1
@ -31,8 +33,8 @@ openqa-cli api \
DISTRI=rocky \ DISTRI=rocky \
FLAVOR=universal \ FLAVOR=universal \
VERSION="$ROCKY_VERSION" \ VERSION="$ROCKY_VERSION" \
BUILD="$BUILD_PREFIX-universal-$ROCKY_VERSION" \ BUILD="$BUILD_NAME" \
"${ROCKY_EXTRA_ARGS}" ${ROCKY_EXTRA_ARGS}
openqa-cli api \ openqa-cli api \
-X POST isos \ -X POST isos \
@ -41,8 +43,8 @@ openqa-cli api \
DISTRI=rocky \ DISTRI=rocky \
FLAVOR="dvd-iso" \ FLAVOR="dvd-iso" \
VERSION="$ROCKY_VERSION" \ VERSION="$ROCKY_VERSION" \
BUILD="$BUILD_PREFIX-dvd-$ROCKY_VERSION" \ BUILD="$BUILD_NAME" \
"${ROCKY_EXTRA_ARGS}" ${ROCKY_EXTRA_ARGS}
openqa-cli api \ openqa-cli api \
-X POST isos \ -X POST isos \
@ -51,8 +53,8 @@ openqa-cli api \
DISTRI=rocky \ DISTRI=rocky \
FLAVOR=package-set \ FLAVOR=package-set \
VERSION="$ROCKY_VERSION" \ VERSION="$ROCKY_VERSION" \
BUILD="$BUILD_PREFIX-packageset-$ROCKY_VERSION" \ BUILD="$BUILD_NAME" \
"${ROCKY_EXTRA_ARGS}" ${ROCKY_EXTRA_ARGS}
openqa-cli api \ openqa-cli api \
-X POST isos \ -X POST isos \
@ -61,8 +63,8 @@ openqa-cli api \
DISTRI=rocky \ DISTRI=rocky \
FLAVOR=minimal-iso \ FLAVOR=minimal-iso \
VERSION="$ROCKY_VERSION" \ VERSION="$ROCKY_VERSION" \
BUILD="$BUILD_PREFIX-minimal-$ROCKY_VERSION" \ BUILD="$BUILD_NAME" \
"${ROCKY_EXTRA_ARGS}" ${ROCKY_EXTRA_ARGS}
openqa-cli api \ openqa-cli api \
-X POST isos \ -X POST isos \
@ -71,5 +73,5 @@ openqa-cli api \
DISTRI=rocky \ DISTRI=rocky \
FLAVOR=boot-iso \ FLAVOR=boot-iso \
VERSION="$ROCKY_VERSION" \ VERSION="$ROCKY_VERSION" \
BUILD="$BUILD_PREFIX-boot-$ROCKY_VERSION" \ BUILD="$BUILD_NAME" \
"${ROCKY_EXTRA_ARGS}" ${ROCKY_EXTRA_ARGS}

View File

@ -1,9 +1,6 @@
#!/bin/bash #!/bin/bash
set -e set -e
MAJOR_VERSION=9
MINOR_VERSION=0
## Usage: Post an ISO for the specified FLAVOR. Defaults to boot-iso. ## Usage: Post an ISO for the specified FLAVOR. Defaults to boot-iso.
# #
## Run the boot-iso FLAVOR ## Run the boot-iso FLAVOR
@ -15,13 +12,14 @@ MINOR_VERSION=0
## Run the localization test suites ## Run the localization test suites
# ROCKY_FLAVOR ROCKY_EXTRA_ARGS=TEST=install_arabic_language,install_asian_language,install_european_language,install_cyrillic_language scripts/run-openqa-tests.sh # ROCKY_FLAVOR ROCKY_EXTRA_ARGS=TEST=install_arabic_language,install_asian_language,install_european_language,install_cyrillic_language scripts/run-openqa-tests.sh
ROCKY_VERSION="9.2"
MAJOR_VERSION=${ROCKY_VERSION:0:1}
MINOR_VERSION=${ROCKY_VERSION:2:1}
ROCKY_FLAVOR="${ROCKY_FLAVOR:-boot-iso}" ROCKY_FLAVOR="${ROCKY_FLAVOR:-boot-iso}"
ROCKY_VERSION="$MAJOR_VERSION.$MINOR_VERSION"
ROCKY_ARCH="${ROCKY_ARCH:=x86_64}" ROCKY_ARCH="${ROCKY_ARCH:=x86_64}"
ROCKY_EXTRA_ARGS="${ROCKY_EXTRA_ARGS:-}" ROCKY_EXTRA_ARGS="${ROCKY_EXTRA_ARGS:-}"
BUILD_PREFIX="-$(date +%Y%m%d.%H%M%S).0-$(git branch --show-current)" BUILD_NAME="-$(date +%Y%m%d).0-$(git branch --show-current)-$ROCKY_VERSION"
BUILD_NAME="$BUILD_PREFIX-$ROCKY_FLAVOR-$ROCKY_VERSION"
ISO_PREFIX="Rocky-$ROCKY_VERSION-$ROCKY_ARCH" ISO_PREFIX="Rocky-$ROCKY_VERSION-$ROCKY_ARCH"
if [[ "$ROCKY_FLAVOR" == "dvd-iso" || "$ROCKY_FLAVOR" == "universal" ]]; then if [[ "$ROCKY_FLAVOR" == "dvd-iso" || "$ROCKY_FLAVOR" == "universal" ]]; then

View File

@ -1418,6 +1418,36 @@
"WORKER_CLASS": "tap" "WORKER_CLASS": "tap"
} }
}, },
"slurm22": {
"profiles": {
"rocky-dvd-iso-aarch64-*-aarch64": 10,
"rocky-dvd-iso-x86_64-*-64bit": 10
},
"settings": {
"BOOTFROM": "c",
"HDD_1": "disk_%FLAVOR%_%MACHINE%.qcow2",
"POSTINSTALL": "slurm",
"START_AFTER_TEST": "%DEPLOY_UPLOAD_TEST%",
"ROOT_PASSWORD": "weakpassword",
"USER_LOGIN": "false",
"SLURM_VERSION": "22"
}
},
"slurm23": {
"profiles": {
"rocky-dvd-iso-aarch64-*-aarch64": 10,
"rocky-dvd-iso-x86_64-*-64bit": 10
},
"settings": {
"BOOTFROM": "c",
"HDD_1": "disk_%FLAVOR%_%MACHINE%.qcow2",
"POSTINSTALL": "slurm",
"START_AFTER_TEST": "%DEPLOY_UPLOAD_TEST%",
"ROOT_PASSWORD": "weakpassword",
"USER_LOGIN": "false",
"SLURM_VERSION": "23"
}
},
"support_server": { "support_server": {
"profiles": { "profiles": {
"rocky-dvd-iso-aarch64-*-aarch64": 10, "rocky-dvd-iso-aarch64-*-aarch64": 10,

View File

@ -2,24 +2,37 @@ use base "installedtest";
use strict; use strict;
use testapi; use testapi;
use packagetest; use packagetest;
use utils;
sub run { sub run {
my $self = shift; my $self = shift;
# switch to TTY3 for both, graphical and console tests # switch to TTY3 for both, graphical and console tests
$self->root_console(tty => 3); $self->root_console(tty => 3);
# enable test repos and install test packages # enable test repos and install test packages
prepare_test_packages; prepare_test_packages;
# check rpm agrees they installed good # check rpm agrees they installed good
verify_installed_packages; verify_installed_packages;
if (get_var("DISTRI") eq "rocky") { if (get_var("DISTRI") eq "rocky") {
# pandoc-common is in PowerTools in RockyLinux if (get_version_major() < 9) {
# pandoc-common is in PowerTools in Rocky Linux 8
assert_script_run 'dnf config-manager --set-enabled powertools', 60; assert_script_run 'dnf config-manager --set-enabled powertools', 60;
} }
else {
# pandoc-common is in CRB in Rocky Linux 8
assert_script_run 'dnf config-manager --set-enabled crb', 60;
}
}
# update the fake pandoc-common (should come from the real repo) # update the fake pandoc-common (should come from the real repo)
# this can take a long time if we get unlucky with the metadata refresh # this can take a long time if we get unlucky with the metadata refresh
assert_script_run 'dnf -y --disablerepo=openqa-testrepo* --disablerepo=updates-testing update pandoc-common', 600; assert_script_run 'dnf -y --disablerepo=openqa-testrepo* --disablerepo=updates-testing update pandoc-common', 600;
# check we got the updated version # check we got the updated version
verify_updated_packages; verify_updated_packages;
# now remove pandoc-common, and see if we can do a straight # now remove pandoc-common, and see if we can do a straight
# install from the default repos # install from the default repos
assert_script_run 'dnf -y remove pandoc-common'; assert_script_run 'dnf -y remove pandoc-common';

65
tests/slurm.pm Normal file
View File

@ -0,0 +1,65 @@
use base "installedtest";
use strict;
use testapi;
use utils;
sub slurm_setup {
# install HPC repository
my $version = get_var("SLURM_VERSION");
assert_script_run "dnf -y install rocky-release-hpc", 120;
# Set up munge
assert_script_run "dnf -y install munge", 120;
assert_script_run "dd if=/dev/urandom bs=1 count=1024 >/etc/munge/munge.key";
assert_script_run "chmod 400 /etc/munge/munge.key";
assert_script_run "chown munge.munge /etc/munge/munge.key";
assert_script_run "systemctl enable --now munge.service";
# install slurm
if (get_var("CURRREL") eq '8') {
assert_script_run "dnf config-manager --set-enabled powertools";
}
assert_script_run "dnf install -y slurm$version-slurmdbd slurm$version-slurmrestd slurm$version-slurmctld slurm$version-slurmd";
# Since this is a single node system, we don't have to modify the conf files. We will for larger multi-node tests.
# start services
assert_script_run "systemctl enable --now slurmctld slurmdbd slurmrestd slurmd";
}
sub run {
my $self = shift;
# do all the install stuff
slurm_setup();
# if everything is configured right, sinfo should show the following output
# $ sinfo
# PARTITION AVAIL TIMELIMIT NODES STATE NODELIST
# debug* up infinite 1 idle localhost
validate_script_output "sinfo", sub { m/debug.*localhost/ };
# write a boring job script
assert_script_run "echo '#!/bin/bash\n#SBATCH --job-name=antarctica_time\nsleep 120\nTZ=NZST date' > job.sh";
## schedule a job and run it to completion
assert_script_run "sbatch job.sh";
validate_script_output "squeue", sub { m/antar/ };
sleep 121;
# after 121 seconds, job should have completed and no longer exist in the queue
validate_script_output "squeue", sub { $_ !~ m/antar/ };
## cancel a job
assert_script_run "sbatch job.sh";
validate_script_output "squeue", sub { m/antar/ };
assert_script_run "scancel 2";
# job should no longer be in the queue
validate_script_output "squeue", sub { $_ !~ m/antar/ };
}
sub test_flags {
return {fatal => 1};
}
1;
# vim: set sw=4 et: