From f17b37c2926578a5c3f810a232c86eeadbbf63f6 Mon Sep 17 00:00:00 2001 From: Josef Skladanka Date: Mon, 26 Jan 2015 14:43:01 +0100 Subject: [PATCH] Decoupled tools from tests --- fedora/COPYING => COPYING | 0 InstallGuide.txt | 85 ------------------ InstallTests.md | 52 ----------- QEMU_variables.txt | 32 ------- fedora/README => README | 0 TestSuites.md | 19 ---- fedora/main.pm => main.pm | 0 {fedora/needles => needles}/.keep | 0 .../anaconda_install_done.json | 0 .../anaconda_install_done.png | Bin .../anaconda_install_finish.json | 0 .../anaconda_install_finish.png | Bin .../anaconda_install_root_password.json | 0 .../anaconda_install_root_password.png | Bin .../anaconda_install_user_creation.json | 0 .../anaconda_install_user_creation.png | Bin ...onda_install_user_creation_make_admin.json | 0 ...conda_install_user_creation_make_admin.png | Bin .../anaconda_main_hub_begin_installation.json | 0 .../anaconda_main_hub_begin_installation.png | Bin ...anaconda_main_hub_install_destination.json | 0 .../anaconda_main_hub_install_destination.png | Bin .../anaconda_main_hub_server.json | 0 .../anaconda_main_hub_server.png | Bin .../anaconda_select_install_lang.json | 0 .../anaconda_select_install_lang.png | Bin ...anaconda_select_install_lang_continue.json | 0 .../anaconda_select_install_lang_continue.png | Bin ..._select_install_lang_english_filtered.json | 0 ...a_select_install_lang_english_filtered.png | Bin ..._select_install_lang_english_selected.json | 0 ...a_select_install_lang_english_selected.png | Bin .../anaconda_spoke_done.json | 0 .../anaconda_spoke_done.png | Bin .../bootloader_server.json | 0 .../needles => needles}/bootloader_server.png | Bin .../text_console_login.json | 0 .../text_console_login.png | Bin fedora/templates => templates | 0 {fedora/tests => tests}/install_simple.pm | 0 tools/viewneedles.py | 72 --------------- 41 files changed, 260 deletions(-) rename fedora/COPYING => COPYING (100%) delete mode 100644 InstallGuide.txt delete mode 100644 InstallTests.md delete mode 100644 QEMU_variables.txt rename fedora/README => README (100%) delete mode 100644 TestSuites.md rename fedora/main.pm => main.pm (100%) rename {fedora/needles => needles}/.keep (100%) rename {fedora/needles => needles}/anaconda_install_done.json (100%) rename {fedora/needles => needles}/anaconda_install_done.png (100%) rename {fedora/needles => needles}/anaconda_install_finish.json (100%) rename {fedora/needles => needles}/anaconda_install_finish.png (100%) rename {fedora/needles => needles}/anaconda_install_root_password.json (100%) rename {fedora/needles => needles}/anaconda_install_root_password.png (100%) rename {fedora/needles => needles}/anaconda_install_user_creation.json (100%) rename {fedora/needles => needles}/anaconda_install_user_creation.png (100%) rename {fedora/needles => needles}/anaconda_install_user_creation_make_admin.json (100%) rename {fedora/needles => needles}/anaconda_install_user_creation_make_admin.png (100%) rename {fedora/needles => needles}/anaconda_main_hub_begin_installation.json (100%) rename {fedora/needles => needles}/anaconda_main_hub_begin_installation.png (100%) rename {fedora/needles => needles}/anaconda_main_hub_install_destination.json (100%) rename {fedora/needles => needles}/anaconda_main_hub_install_destination.png (100%) rename {fedora/needles => needles}/anaconda_main_hub_server.json (100%) rename {fedora/needles => needles}/anaconda_main_hub_server.png (100%) rename {fedora/needles => needles}/anaconda_select_install_lang.json (100%) rename {fedora/needles => needles}/anaconda_select_install_lang.png (100%) rename {fedora/needles => needles}/anaconda_select_install_lang_continue.json (100%) rename {fedora/needles => needles}/anaconda_select_install_lang_continue.png (100%) rename {fedora/needles => needles}/anaconda_select_install_lang_english_filtered.json (100%) rename {fedora/needles => needles}/anaconda_select_install_lang_english_filtered.png (100%) rename {fedora/needles => needles}/anaconda_select_install_lang_english_selected.json (100%) rename {fedora/needles => needles}/anaconda_select_install_lang_english_selected.png (100%) rename {fedora/needles => needles}/anaconda_spoke_done.json (100%) rename {fedora/needles => needles}/anaconda_spoke_done.png (100%) rename {fedora/needles => needles}/bootloader_server.json (100%) rename {fedora/needles => needles}/bootloader_server.png (100%) rename {fedora/needles => needles}/text_console_login.json (100%) rename {fedora/needles => needles}/text_console_login.png (100%) rename fedora/templates => templates (100%) rename {fedora/tests => tests}/install_simple.pm (100%) delete mode 100755 tools/viewneedles.py diff --git a/fedora/COPYING b/COPYING similarity index 100% rename from fedora/COPYING rename to COPYING diff --git a/InstallGuide.txt b/InstallGuide.txt deleted file mode 100644 index 6ac3d091..00000000 --- a/InstallGuide.txt +++ /dev/null @@ -1,85 +0,0 @@ -= OpenQA install guide = - -== Install OpenSuse 13.2, default with Gnome == - -* Add online repos before install -* Create partition setup & use the right HDD -* Select Update & Non-OSS repos & Main Update Repository -* Select GNOME desktop -* Create user (test/fedora), make user system administrator -* Disable firewall, enable SSH -* ??? -* Profit! - - - -== OpenQA installation == - -sudo su - - -# add user -useradd geekotest - -# add repos -zypper ar -f obs://devel:openQA/openSUSE_13.2 openQA -zypper ar -f obs://devel:openQA:13.2/openSUSE_13.2 openQA-perl-modules - -# install -zypper in openQA -zypper in openQA-worker - -# filesystem layout - -cd /var/lib/openqa -mkdir pool/1 -chown -R geekotest backlog cache factory perl pool share testresults script - - -# apache -gensslcert -cd /etc/apache2/vhosts.d/ -a2enmod headers -a2enmod proxy -a2enmod proxy_http -a2enmod proxy_wstunnel -a2enmod ssl -a2enflag SSL - -cp openqa-ssl.conf.template openqa-ssl.conf -cp openqa.conf.template openqa.conf - -# edit openqa-common.inc -# replace Order allow deny & Allow from all by sinle line -# Require all granted - -# edit openqa-ssl.conf -# un-comment lines starting with #SSL -# replace paths to certificates from 'openqa.{crt,key}' to 'server.{crt,key}' - -# OpenID -# edit /etc/openqa/openqa.ini -# uncomment & change: -# [openid] -# provider = https://id.fedoraproject.org/ - - -# apply patch fixing machine-pausing in QEMU, if needed -# https://github.com/os-autoinst/os-autoinst/commit/c8896375288d5f39424cf06108a92c8498c4aff3 - -# services -systemctl enable apache2 -systemctl restart apache2 -systemctl enable openqa-webui -systemctl restart openqa-webui - - -curl http://localhost - -# login via OpenID - the first one to login is automagically set to be the admin - -# Setup Worker -# go to http:/localhost/api_keys & create the keys -# copy the key & secret to /etc/openqa/client.conf -systemctl enable openqa-worker@1 -systemctl start openqa-worker@1 -# check whether worker is active in the web-ui diff --git a/InstallTests.md b/InstallTests.md deleted file mode 100644 index 4387a62a..00000000 --- a/InstallTests.md +++ /dev/null @@ -1,52 +0,0 @@ -# Default boot and install -* workstation live -* server offline -* KDE live - -# Storage devices -* sata -* pata -* scsi -* virtio -* raidy? - -# guided storage configuration -* guided empty -* delete all -* multi select -* delete partial -* free space -* encrypted -* multi empty all - -# guided shrinking -* shrink? - -# custom storage -* software raid -* btrfs -* ext3 -* xfs -* no swap - -# user interface -* interface graphical -* text? - -# installation repositories -* http/ftp variation -* nfs??? - -# kickstarts? -* (zalezi na sitovani mezi virtualkou a hostem) - -# upgrade? -* (slo by to, ale bude to tahat baliky z netu) - -# misc -* anaconda user creation -* updates img via url -* updates img via local media -* traceback debug -* dualboot with windows -* image boot local diff --git a/QEMU_variables.txt b/QEMU_variables.txt deleted file mode 100644 index 6a303357..00000000 --- a/QEMU_variables.txt +++ /dev/null @@ -1,32 +0,0 @@ -= QEMU settings = - -Set via variables per-testsuite in the OpenQA-opensuse tests (might make more sense to do it per-machine): - - # disk settings - $vars->{NUMDISKS} ||= 1; - $vars->{HDDSIZEGB} ||= 10; - $vars->{HDDMODEL} ||= "virtio-blk"; - # network settings - $vars->{NICMODEL} ||= "virtio-net"; - $vars->{NICTYPE} ||= "user"; - $vars->{NICMAC} ||= "52:54:00:12:34:56"; - # misc - if (!$vars->{OFW}) { - $vars->{QEMUVGA} ||= ["cirrus"]; - } - else { - $vars->{QEMUVGA} ||= [ 'std', '-g', '1024x768' ]; - } - $vars->{QEMUCPUS} ||= 1; - if ( defined( $vars->{RAIDLEVEL} ) ) { - $vars->{NUMDISKS} = 4; - } - - - -UEFI, USBBOOT, KEEPHDDS, LAPTOP - ??? - - - - - diff --git a/fedora/README b/README similarity index 100% rename from fedora/README rename to README diff --git a/TestSuites.md b/TestSuites.md deleted file mode 100644 index c07f838a..00000000 --- a/TestSuites.md +++ /dev/null @@ -1,19 +0,0 @@ -# server_simple - -## TESTS -// get anaconda -* disk_guided_empty -// start installatin & reboot -// wait for login screen - -## QEMU-vars - - -## Covered testcases -* server offline -* virtio -* guided empty -* interface graphical -* anaconda user creation - - diff --git a/fedora/main.pm b/main.pm similarity index 100% rename from fedora/main.pm rename to main.pm diff --git a/fedora/needles/.keep b/needles/.keep similarity index 100% rename from fedora/needles/.keep rename to needles/.keep diff --git a/fedora/needles/anaconda_install_done.json b/needles/anaconda_install_done.json similarity index 100% rename from fedora/needles/anaconda_install_done.json rename to needles/anaconda_install_done.json diff --git a/fedora/needles/anaconda_install_done.png b/needles/anaconda_install_done.png similarity index 100% rename from fedora/needles/anaconda_install_done.png rename to needles/anaconda_install_done.png diff --git a/fedora/needles/anaconda_install_finish.json b/needles/anaconda_install_finish.json similarity index 100% rename from fedora/needles/anaconda_install_finish.json rename to needles/anaconda_install_finish.json diff --git a/fedora/needles/anaconda_install_finish.png b/needles/anaconda_install_finish.png similarity index 100% rename from fedora/needles/anaconda_install_finish.png rename to needles/anaconda_install_finish.png diff --git a/fedora/needles/anaconda_install_root_password.json b/needles/anaconda_install_root_password.json similarity index 100% rename from fedora/needles/anaconda_install_root_password.json rename to needles/anaconda_install_root_password.json diff --git a/fedora/needles/anaconda_install_root_password.png b/needles/anaconda_install_root_password.png similarity index 100% rename from fedora/needles/anaconda_install_root_password.png rename to needles/anaconda_install_root_password.png diff --git a/fedora/needles/anaconda_install_user_creation.json b/needles/anaconda_install_user_creation.json similarity index 100% rename from fedora/needles/anaconda_install_user_creation.json rename to needles/anaconda_install_user_creation.json diff --git a/fedora/needles/anaconda_install_user_creation.png b/needles/anaconda_install_user_creation.png similarity index 100% rename from fedora/needles/anaconda_install_user_creation.png rename to needles/anaconda_install_user_creation.png diff --git a/fedora/needles/anaconda_install_user_creation_make_admin.json b/needles/anaconda_install_user_creation_make_admin.json similarity index 100% rename from fedora/needles/anaconda_install_user_creation_make_admin.json rename to needles/anaconda_install_user_creation_make_admin.json diff --git a/fedora/needles/anaconda_install_user_creation_make_admin.png b/needles/anaconda_install_user_creation_make_admin.png similarity index 100% rename from fedora/needles/anaconda_install_user_creation_make_admin.png rename to needles/anaconda_install_user_creation_make_admin.png diff --git a/fedora/needles/anaconda_main_hub_begin_installation.json b/needles/anaconda_main_hub_begin_installation.json similarity index 100% rename from fedora/needles/anaconda_main_hub_begin_installation.json rename to needles/anaconda_main_hub_begin_installation.json diff --git a/fedora/needles/anaconda_main_hub_begin_installation.png b/needles/anaconda_main_hub_begin_installation.png similarity index 100% rename from fedora/needles/anaconda_main_hub_begin_installation.png rename to needles/anaconda_main_hub_begin_installation.png diff --git a/fedora/needles/anaconda_main_hub_install_destination.json b/needles/anaconda_main_hub_install_destination.json similarity index 100% rename from fedora/needles/anaconda_main_hub_install_destination.json rename to needles/anaconda_main_hub_install_destination.json diff --git a/fedora/needles/anaconda_main_hub_install_destination.png b/needles/anaconda_main_hub_install_destination.png similarity index 100% rename from fedora/needles/anaconda_main_hub_install_destination.png rename to needles/anaconda_main_hub_install_destination.png diff --git a/fedora/needles/anaconda_main_hub_server.json b/needles/anaconda_main_hub_server.json similarity index 100% rename from fedora/needles/anaconda_main_hub_server.json rename to needles/anaconda_main_hub_server.json diff --git a/fedora/needles/anaconda_main_hub_server.png b/needles/anaconda_main_hub_server.png similarity index 100% rename from fedora/needles/anaconda_main_hub_server.png rename to needles/anaconda_main_hub_server.png diff --git a/fedora/needles/anaconda_select_install_lang.json b/needles/anaconda_select_install_lang.json similarity index 100% rename from fedora/needles/anaconda_select_install_lang.json rename to needles/anaconda_select_install_lang.json diff --git a/fedora/needles/anaconda_select_install_lang.png b/needles/anaconda_select_install_lang.png similarity index 100% rename from fedora/needles/anaconda_select_install_lang.png rename to needles/anaconda_select_install_lang.png diff --git a/fedora/needles/anaconda_select_install_lang_continue.json b/needles/anaconda_select_install_lang_continue.json similarity index 100% rename from fedora/needles/anaconda_select_install_lang_continue.json rename to needles/anaconda_select_install_lang_continue.json diff --git a/fedora/needles/anaconda_select_install_lang_continue.png b/needles/anaconda_select_install_lang_continue.png similarity index 100% rename from fedora/needles/anaconda_select_install_lang_continue.png rename to needles/anaconda_select_install_lang_continue.png diff --git a/fedora/needles/anaconda_select_install_lang_english_filtered.json b/needles/anaconda_select_install_lang_english_filtered.json similarity index 100% rename from fedora/needles/anaconda_select_install_lang_english_filtered.json rename to needles/anaconda_select_install_lang_english_filtered.json diff --git a/fedora/needles/anaconda_select_install_lang_english_filtered.png b/needles/anaconda_select_install_lang_english_filtered.png similarity index 100% rename from fedora/needles/anaconda_select_install_lang_english_filtered.png rename to needles/anaconda_select_install_lang_english_filtered.png diff --git a/fedora/needles/anaconda_select_install_lang_english_selected.json b/needles/anaconda_select_install_lang_english_selected.json similarity index 100% rename from fedora/needles/anaconda_select_install_lang_english_selected.json rename to needles/anaconda_select_install_lang_english_selected.json diff --git a/fedora/needles/anaconda_select_install_lang_english_selected.png b/needles/anaconda_select_install_lang_english_selected.png similarity index 100% rename from fedora/needles/anaconda_select_install_lang_english_selected.png rename to needles/anaconda_select_install_lang_english_selected.png diff --git a/fedora/needles/anaconda_spoke_done.json b/needles/anaconda_spoke_done.json similarity index 100% rename from fedora/needles/anaconda_spoke_done.json rename to needles/anaconda_spoke_done.json diff --git a/fedora/needles/anaconda_spoke_done.png b/needles/anaconda_spoke_done.png similarity index 100% rename from fedora/needles/anaconda_spoke_done.png rename to needles/anaconda_spoke_done.png diff --git a/fedora/needles/bootloader_server.json b/needles/bootloader_server.json similarity index 100% rename from fedora/needles/bootloader_server.json rename to needles/bootloader_server.json diff --git a/fedora/needles/bootloader_server.png b/needles/bootloader_server.png similarity index 100% rename from fedora/needles/bootloader_server.png rename to needles/bootloader_server.png diff --git a/fedora/needles/text_console_login.json b/needles/text_console_login.json similarity index 100% rename from fedora/needles/text_console_login.json rename to needles/text_console_login.json diff --git a/fedora/needles/text_console_login.png b/needles/text_console_login.png similarity index 100% rename from fedora/needles/text_console_login.png rename to needles/text_console_login.png diff --git a/fedora/templates b/templates similarity index 100% rename from fedora/templates rename to templates diff --git a/fedora/tests/install_simple.pm b/tests/install_simple.pm similarity index 100% rename from fedora/tests/install_simple.pm rename to tests/install_simple.pm diff --git a/tools/viewneedles.py b/tools/viewneedles.py deleted file mode 100755 index 9d69dcde..00000000 --- a/tools/viewneedles.py +++ /dev/null @@ -1,72 +0,0 @@ -#!/usr/bin/env python -import pygame -import sys -import os.path -import glob -import json -from pygame.locals import * - -def load_areas(img, jsons): - if img in jsons.keys(): - f = open(jsons[img], "r") - img_json = f.read() - f.close() - parsed = json.loads(img_json) - return parsed["area"] - else: - return [] - -if len(sys.argv) != 2: - print "%s directory" % sys.argv[0] - sys.exit() - -RES = (1024, 768) - -pygame.init() -fpsClock = pygame.time.Clock() - -windowSurfaceObj = pygame.display.set_mode(RES) -pygame.display.set_caption("OpenQA needles viewer") - -img_files = glob.glob(os.path.join(sys.argv[1], "*.png")) -img_files.sort() -json_files = glob.glob(os.path.join(sys.argv[1], "*.json")) - -jsons = {} -for img in img_files: - json_name = os.path.splitext(img)[0] + ".json" - if json_name in json_files: - jsons[img] = json_name - -index = 0 -imageSurfaceObj = pygame.image.load(img_files[index]) -pygame.display.set_caption(os.path.basename(img_files[index])) -areas = load_areas(img_files[index], jsons) - -while True: - for event in pygame.event.get(): - if event.type == QUIT: - pygame.quit() - sys.exit() - elif event.type == KEYDOWN: - if event.key == K_LEFT: - index = index - 1 if index > 0 else len(img_files) - 1 - img_index = img_files[index] - imageSurfaceObj = pygame.image.load(img_index) - pygame.display.set_caption(os.path.basename(img_index)) - areas = load_areas(img_index, jsons) - elif event.key == K_RIGHT: - index = index + 1 if index + 1 < len(img_files) else 0 - img_index = img_files[index] - imageSurfaceObj = pygame.image.load(img_index) - pygame.display.set_caption(os.path.basename(img_index)) - areas = load_areas(img_index, jsons) - elif event.key == K_ESCAPE: - pygame.event.post(pygame.event.Event(QUIT)) - - windowSurfaceObj.blit(imageSurfaceObj, (0, 0)) - for area in areas: - pygame.draw.rect(windowSurfaceObj, pygame.Color(255, 0, 0), (area["xpos"], area["ypos"], area["width"], area["height"]), 3) - - pygame.display.update() - fpsClock.tick(30)