Skip to content

Add xml attribute ln_iso_to_repo #270

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 1 commit into from
Sep 16, 2024
Merged

Add xml attribute ln_iso_to_repo #270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions script/cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ def rsync_commands(checksum):
mkdir /var/lib/openqa/factory/repo/$repo0folder
bsdtar xf /var/lib/openqa/factory/iso/$dest -C /var/lib/openqa/factory/repo/$repo0folder
}"
[ -z "FLAVORTOREPOORS" ] || [ $( echo "$flavor" | grep -E -c "^(FLAVORTOREPOORS)$" ) -eq 0 ] || echo "cp -l /var/lib/openqa/factory/iso/$dest /var/lib/openqa/factory/openqa/factory/repo/"
done
done'''

Expand Down
6 changes: 6 additions & 0 deletions script/scriptgen.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ def __init__(self, name, actionGenerator):
self.fixed_iso = ""
self.mask = ""
self.iso_extract_as_repo = {}
self.ln_iso_to_repo = {}
self.mirror_repo = ""
self.repos = []
self.repolink = ""
Expand Down Expand Up @@ -276,6 +277,7 @@ def p(
s = s.replace("FLAVORORS", "|".join(self.flavors))
s = s.replace("FLAVORALIASLIST", ",".join(aliases))
s = s.replace("FLAVORASREPOORS", "|".join([f for f in self.flavors if self.iso_extract_as_repo.get(f, 0)]))
s = s.replace("FLAVORTOREPOORS", "|".join([f for f in self.flavors if self.ln_iso_to_repo.get(f, 0)]))

if self.repos or (self.repolink and not "/" in self.repolink):
repos = self.repos.copy()
Expand Down Expand Up @@ -354,6 +356,8 @@ def doFlavor(self, node):
self.iso_extract_as_repo[iso] = 1
self.repo0folder = node.attrib["extract_as_repo"]
self.isos.append(iso)
if node.attrib.get("ln_iso_to_repo", ""):
self.ln_iso_to_repo[iso] = node.attrib["ln_iso_to_repo"]

if node.attrib.get("name", "") and node.attrib.get("folder", ""):
self.iso_folder[node.attrib["name"]] = node.attrib["folder"]
Expand Down Expand Up @@ -1049,6 +1053,8 @@ def gen_print_openqa(self, f):
s = cfg.openqa_call_repo0b
destiso = self.fixed_iso[:-4]
self.p(s, f, "REPO0_ISO", destiso)
if self.ln_iso_to_repo.get(iso, 0):
self.p(s, f, "REPO_0", "REPO_999", "REPO0_ISO", destiso + ".iso")
if self.iso_5:
pref = self.iso_5.replace("-", "_").rstrip("_DVD")
self.p(cfg.openqa_call_repo5, f, "REPOALIAS", "SLE_{}".format(pref))
Expand Down
1 change: 1 addition & 0 deletions t/obs/systemsmanagement:Agama:Devel/s390x/print_openqa.before
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/agama-installer.s390x-9.0.0-openSUSE-Build17.9 \
MIRROR_PREFIX=http://openqa.opensuse.org/assets/repo \
REPO_0=agama-installer.s390x-9.0.0-openSUSE-Build17.9 \
REPO_999=agama-installer.s390x-9.0.0-openSUSE-Build17.9.iso \
SUSEMIRROR=http://openqa.opensuse.org/assets/repo/agama-installer.s390x-9.0.0-openSUSE-Build17.9 \
VERSION=agama-9.0 \
_OBSOLETE=1
Expand Down
1 change: 1 addition & 0 deletions t/obs/systemsmanagement:Agama:Devel/s390x/print_rsync_iso.before
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ rsync --timeout=3600 -tlp4 --specials obspublish-other::openqa/systemsmanagement
mkdir /var/lib/openqa/factory/repo/agama-installer.s390x-9.0.0-openSUSE-Build17.9
bsdtar xf /var/lib/openqa/factory/iso/agama-installer.s390x-9.0.0-openSUSE-Build17.9.iso -C /var/lib/openqa/factory/repo/agama-installer.s390x-9.0.0-openSUSE-Build17.9
}
cp -l /var/lib/openqa/factory/iso/agama-installer.s390x-9.0.0-openSUSE-Build17.9.iso /var/lib/openqa/factory/openqa/factory/repo/
2 changes: 1 addition & 1 deletion xml/obs/systemsmanagement:Agama:Devel.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
<flavor name="agama-installer" folder="images/*/agama-installer:openSUSE/" iso="1" media1="0"/>
</batch>
<batch name="s390x" archs="s390x">
<flavor name="agama-installer" folder="images/*/agama-installer:openSUSE/" iso="extract_as_repo" media1="0"/>
<flavor name="agama-installer" folder="images/*/agama-installer:openSUSE/" iso="extract_as_repo" ln_iso_to_repo="1" media1="0"/>
</batch>
</openQA>
Loading