Skip to content

Fix3 read_files.sh for Factory/base #310

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 30, 2025
Merged

Fix3 read_files.sh for Factory/base #310

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e31d2a8
Fix3 read_files.sh for Factory/base
andrii-suse Jul 30, 2025
ec7ffef
Factory: move media1=0 to global definition
andrii-suse Jul 30, 2025
59547a7
t: Adjust integration test to new layout
andrii-suse Jul 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions script/scriptgen.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -692,12 +692,12 @@ def gen_read_files(self, f):
done = ""
if archs:
wild = "*" + archs + "*"
if " " in archs and self.repodirs:
self.p("for arch in {}; do".format(archs), f)
wild = "*$arch*"
done = "done"

if "Leap" in self.ag.envdir or "Jump" in self.ag.envdir or self.version_from_media:
if " " in archs and self.repodirs:
self.p("for arch in {}; do".format(archs), f)
wild = "*$arch*"
done = "done"

for repodir in self.repodirs:
self.p(
cfg.read_files_repo_media,
Expand Down
8 changes: 8 additions & 0 deletions t/obs/openSUSE:Factory:ToTest/jeos/print_openqa.before
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
REPO_1=openSUSE-Tumbleweed-oss-x86_64-Snapshot20250210-Debug \
REPO_2=openSUSE-Tumbleweed-oss-x86_64-Snapshot20250210-Source \
REPO_3=openSUSE-Tumbleweed-oss-x86_64.license-Snapshot20250210 \
REPO_4=openSUSE-Tumbleweed-non-oss-x86_64-Snapshot20250210 \
REPO_NON_OSS=openSUSE-Tumbleweed-non-oss-x86_64-Snapshot20250210 \
REPO_OSS=openSUSE-Tumbleweed-oss-x86_64-Snapshot20250210 \
REPO_OSS_DEBUG=openSUSE-Tumbleweed-oss-x86_64-Snapshot20250210-Debug \
REPO_OSS_DEBUG_PACKAGES='java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*' \
Expand All @@ -39,6 +41,8 @@
REPO_1=openSUSE-Tumbleweed-oss-x86_64-Snapshot20250210-Debug \
REPO_2=openSUSE-Tumbleweed-oss-x86_64-Snapshot20250210-Source \
REPO_3=openSUSE-Tumbleweed-oss-x86_64.license-Snapshot20250210 \
REPO_4=openSUSE-Tumbleweed-non-oss-x86_64-Snapshot20250210 \
REPO_NON_OSS=openSUSE-Tumbleweed-non-oss-x86_64-Snapshot20250210 \
REPO_OSS=openSUSE-Tumbleweed-oss-x86_64-Snapshot20250210 \
REPO_OSS_DEBUG=openSUSE-Tumbleweed-oss-x86_64-Snapshot20250210-Debug \
REPO_OSS_DEBUG_PACKAGES='java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*' \
Expand All @@ -64,6 +68,8 @@
REPO_1=openSUSE-Tumbleweed-oss-x86_64-Snapshot20250210-Debug \
REPO_2=openSUSE-Tumbleweed-oss-x86_64-Snapshot20250210-Source \
REPO_3=openSUSE-Tumbleweed-oss-x86_64.license-Snapshot20250210 \
REPO_4=openSUSE-Tumbleweed-non-oss-x86_64-Snapshot20250210 \
REPO_NON_OSS=openSUSE-Tumbleweed-non-oss-x86_64-Snapshot20250210 \
REPO_OSS=openSUSE-Tumbleweed-oss-x86_64-Snapshot20250210 \
REPO_OSS_DEBUG=openSUSE-Tumbleweed-oss-x86_64-Snapshot20250210-Debug \
REPO_OSS_DEBUG_PACKAGES='java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*' \
Expand All @@ -89,6 +95,8 @@
REPO_1=openSUSE-Tumbleweed-oss-x86_64-Snapshot20250210-Debug \
REPO_2=openSUSE-Tumbleweed-oss-x86_64-Snapshot20250210-Source \
REPO_3=openSUSE-Tumbleweed-oss-x86_64.license-Snapshot20250210 \
REPO_4=openSUSE-Tumbleweed-non-oss-x86_64-Snapshot20250210 \
REPO_NON_OSS=openSUSE-Tumbleweed-non-oss-x86_64-Snapshot20250210 \
REPO_OSS=openSUSE-Tumbleweed-oss-x86_64-Snapshot20250210 \
REPO_OSS_DEBUG=openSUSE-Tumbleweed-oss-x86_64-Snapshot20250210-Debug \
REPO_OSS_DEBUG_PACKAGES='java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*' \
Expand Down
8 changes: 8 additions & 0 deletions t/obs/openSUSE:Factory:ToTest/live/print_openqa.before
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
REPO_1=openSUSE-Tumbleweed-oss-x86_64-Snapshot20240222-Debug \
REPO_2=openSUSE-Tumbleweed-oss-x86_64-Snapshot20240222-Source \
REPO_3=openSUSE-Tumbleweed-oss-x86_64.license-Snapshot20240222 \
REPO_4=openSUSE-Tumbleweed-non-oss-x86_64-Snapshot20240222 \
REPO_NON_OSS=openSUSE-Tumbleweed-non-oss-x86_64-Snapshot20240222 \
REPO_OSS=openSUSE-Tumbleweed-oss-x86_64-Snapshot20240222 \
REPO_OSS_DEBUG=openSUSE-Tumbleweed-oss-x86_64-Snapshot20240222-Debug \
REPO_OSS_DEBUG_PACKAGES='java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*' \
Expand All @@ -39,6 +41,8 @@
REPO_1=openSUSE-Tumbleweed-oss-x86_64-Snapshot20240222-Debug \
REPO_2=openSUSE-Tumbleweed-oss-x86_64-Snapshot20240222-Source \
REPO_3=openSUSE-Tumbleweed-oss-x86_64.license-Snapshot20240222 \
REPO_4=openSUSE-Tumbleweed-non-oss-x86_64-Snapshot20240222 \
REPO_NON_OSS=openSUSE-Tumbleweed-non-oss-x86_64-Snapshot20240222 \
REPO_OSS=openSUSE-Tumbleweed-oss-x86_64-Snapshot20240222 \
REPO_OSS_DEBUG=openSUSE-Tumbleweed-oss-x86_64-Snapshot20240222-Debug \
REPO_OSS_DEBUG_PACKAGES='java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*' \
Expand All @@ -64,6 +68,8 @@
REPO_1=openSUSE-Tumbleweed-oss-x86_64-Snapshot20240222-Debug \
REPO_2=openSUSE-Tumbleweed-oss-x86_64-Snapshot20240222-Source \
REPO_3=openSUSE-Tumbleweed-oss-x86_64.license-Snapshot20240222 \
REPO_4=openSUSE-Tumbleweed-non-oss-x86_64-Snapshot20240222 \
REPO_NON_OSS=openSUSE-Tumbleweed-non-oss-x86_64-Snapshot20240222 \
REPO_OSS=openSUSE-Tumbleweed-oss-x86_64-Snapshot20240222 \
REPO_OSS_DEBUG=openSUSE-Tumbleweed-oss-x86_64-Snapshot20240222-Debug \
REPO_OSS_DEBUG_PACKAGES='java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*' \
Expand All @@ -89,6 +95,8 @@
REPO_1=openSUSE-Tumbleweed-oss-x86_64-Snapshot20240222-Debug \
REPO_2=openSUSE-Tumbleweed-oss-x86_64-Snapshot20240222-Source \
REPO_3=openSUSE-Tumbleweed-oss-x86_64.license-Snapshot20240222 \
REPO_4=openSUSE-Tumbleweed-non-oss-x86_64-Snapshot20240222 \
REPO_NON_OSS=openSUSE-Tumbleweed-non-oss-x86_64-Snapshot20240222 \
REPO_OSS=openSUSE-Tumbleweed-oss-x86_64-Snapshot20240222 \
REPO_OSS_DEBUG=openSUSE-Tumbleweed-oss-x86_64-Snapshot20240222-Debug \
REPO_OSS_DEBUG_PACKAGES='java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*' \
Expand Down
10 changes: 10 additions & 0 deletions t/obs/openSUSE:Factory:ToTest/microos-qcow/print_openqa.before
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
REPO_1=openSUSE-Tumbleweed-oss-x86_64-Snapshot20250210-Debug \
REPO_2=openSUSE-Tumbleweed-oss-x86_64-Snapshot20250210-Source \
REPO_3=openSUSE-Tumbleweed-oss-x86_64.license-Snapshot20250210 \
REPO_4=openSUSE-Tumbleweed-non-oss-x86_64-Snapshot20250210 \
REPO_NON_OSS=openSUSE-Tumbleweed-non-oss-x86_64-Snapshot20250210 \
REPO_OSS=openSUSE-Tumbleweed-oss-x86_64-Snapshot20250210 \
REPO_OSS_DEBUG=openSUSE-Tumbleweed-oss-x86_64-Snapshot20250210-Debug \
REPO_OSS_DEBUG_PACKAGES='java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*' \
Expand All @@ -39,6 +41,8 @@
REPO_1=openSUSE-Tumbleweed-oss-x86_64-Snapshot20250210-Debug \
REPO_2=openSUSE-Tumbleweed-oss-x86_64-Snapshot20250210-Source \
REPO_3=openSUSE-Tumbleweed-oss-x86_64.license-Snapshot20250210 \
REPO_4=openSUSE-Tumbleweed-non-oss-x86_64-Snapshot20250210 \
REPO_NON_OSS=openSUSE-Tumbleweed-non-oss-x86_64-Snapshot20250210 \
REPO_OSS=openSUSE-Tumbleweed-oss-x86_64-Snapshot20250210 \
REPO_OSS_DEBUG=openSUSE-Tumbleweed-oss-x86_64-Snapshot20250210-Debug \
REPO_OSS_DEBUG_PACKAGES='java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*' \
Expand All @@ -64,6 +68,8 @@
REPO_1=openSUSE-Tumbleweed-oss-x86_64-Snapshot20250210-Debug \
REPO_2=openSUSE-Tumbleweed-oss-x86_64-Snapshot20250210-Source \
REPO_3=openSUSE-Tumbleweed-oss-x86_64.license-Snapshot20250210 \
REPO_4=openSUSE-Tumbleweed-non-oss-x86_64-Snapshot20250210 \
REPO_NON_OSS=openSUSE-Tumbleweed-non-oss-x86_64-Snapshot20250210 \
REPO_OSS=openSUSE-Tumbleweed-oss-x86_64-Snapshot20250210 \
REPO_OSS_DEBUG=openSUSE-Tumbleweed-oss-x86_64-Snapshot20250210-Debug \
REPO_OSS_DEBUG_PACKAGES='java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*' \
Expand All @@ -89,6 +95,8 @@
REPO_1=openSUSE-Tumbleweed-oss-x86_64-Snapshot20250210-Debug \
REPO_2=openSUSE-Tumbleweed-oss-x86_64-Snapshot20250210-Source \
REPO_3=openSUSE-Tumbleweed-oss-x86_64.license-Snapshot20250210 \
REPO_4=openSUSE-Tumbleweed-non-oss-x86_64-Snapshot20250210 \
REPO_NON_OSS=openSUSE-Tumbleweed-non-oss-x86_64-Snapshot20250210 \
REPO_OSS=openSUSE-Tumbleweed-oss-x86_64-Snapshot20250210 \
REPO_OSS_DEBUG=openSUSE-Tumbleweed-oss-x86_64-Snapshot20250210-Debug \
REPO_OSS_DEBUG_PACKAGES='java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*' \
Expand All @@ -114,6 +122,8 @@
REPO_1=openSUSE-Tumbleweed-oss-x86_64-Snapshot20250210-Debug \
REPO_2=openSUSE-Tumbleweed-oss-x86_64-Snapshot20250210-Source \
REPO_3=openSUSE-Tumbleweed-oss-x86_64.license-Snapshot20250210 \
REPO_4=openSUSE-Tumbleweed-non-oss-x86_64-Snapshot20250210 \
REPO_NON_OSS=openSUSE-Tumbleweed-non-oss-x86_64-Snapshot20250210 \
REPO_OSS=openSUSE-Tumbleweed-oss-x86_64-Snapshot20250210 \
REPO_OSS_DEBUG=openSUSE-Tumbleweed-oss-x86_64-Snapshot20250210-Debug \
REPO_OSS_DEBUG_PACKAGES='java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*' \
Expand Down
2 changes: 2 additions & 0 deletions t/obs/openSUSE:Factory:ToTest/microos/print_openqa.before
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
REPO_1=openSUSE-Tumbleweed-oss-x86_64-Snapshot20250210-Debug \
REPO_2=openSUSE-Tumbleweed-oss-x86_64-Snapshot20250210-Source \
REPO_3=openSUSE-Tumbleweed-oss-x86_64.license-Snapshot20250210 \
REPO_4=openSUSE-Tumbleweed-non-oss-x86_64-Snapshot20250210 \
REPO_NON_OSS=openSUSE-Tumbleweed-non-oss-x86_64-Snapshot20250210 \
REPO_OSS=openSUSE-Tumbleweed-oss-x86_64-Snapshot20250210 \
REPO_OSS_DEBUG=openSUSE-Tumbleweed-oss-x86_64-Snapshot20250210-Debug \
REPO_OSS_DEBUG_PACKAGES='java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*' \
Expand Down
2 changes: 2 additions & 0 deletions t/obs/openSUSE:Factory:ToTest/wsl/print_openqa.before
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
REPO_1=openSUSE-Tumbleweed-oss-x86_64-Snapshot20240222.appx-Debug \
REPO_2=openSUSE-Tumbleweed-oss-x86_64-Snapshot20240222.appx-Source \
REPO_3=openSUSE-Tumbleweed-oss-x86_64.license-Snapshot20240222.appx \
REPO_4=openSUSE-Tumbleweed-non-oss-x86_64-Snapshot20240222.appx \
REPO_NON_OSS=openSUSE-Tumbleweed-non-oss-x86_64-Snapshot20240222.appx \
REPO_OSS=openSUSE-Tumbleweed-oss-x86_64-Snapshot20240222.appx \
REPO_OSS_DEBUG=openSUSE-Tumbleweed-oss-x86_64-Snapshot20240222.appx-Debug \
REPO_OSS_DEBUG_PACKAGES='java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*' \
Expand Down
5 changes: 3 additions & 2 deletions xml/obs/openSUSE:Factory.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
<openQA
project_pattern="openSUSE:(?P&lt;version&gt;Factory):ToTest"
distri="opensuse"
repo_path="images/local">
repo_path="images/local"
media1="0">
<batch name="base" archs="x86_64">
<flavor name="Tumbleweed-NET|Tumbleweed-DVD" folder="images/local/*product*" iso="1" media1="0">
<flavor name="Tumbleweed-NET|Tumbleweed-DVD" folder="images/local/*product*" iso="1">
<repos>
<oss folder="0openSUSE" debug="{java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*}" source="{coreutils*,yast2-network*,yast2-http-server*}" mirror="1" dest="openSUSE-Tumbleweed-oss-x86_64"/>
<non-oss folder="0NonFree" dest="openSUSE-Tumbleweed-non-oss-x86_64"/>
Expand Down
1 change: 1 addition & 0 deletions xml/obs/openSUSE:Factory:zSystems.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<openQA
project_pattern="openSUSE:(?P&lt;version&gt;Factory):zSystems:ToTest"
dist_path="images/local"
repo_path=""
distri="opensuse">
<flavor name="Tumbleweed-DVD" folder="*product*" iso="1" archs="s390x">
<repos>
Expand Down
Loading