Skip to content

Fixes for Leap 16 #294

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

Closed
wants to merge 1 commit into from
Closed

Fixes for Leap 16 #294

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 @@ -391,6 +391,7 @@ def openqa_call_extra(repos):
''' + openqa_call_build_id_from_iso2(build_id_from_iso) + '''
[[ $repo =~ license ]] || echo " REPO_REPOPREFIX$repoKey=$repoDest \\\\"
''' + openqa_call_extra(repos) + '''
[ $i != 0 ] || ''' + openqa_call_repo0() + '''
: $((i++))
done < <(grep $repot$additional_repo_suffix __envsub/files_repo.lst | grep REPOTYPE | grep $arch | sort)
done'''
Expand Down
16 changes: 13 additions & 3 deletions script/scriptgen.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1095,15 +1095,25 @@ def gen_print_openqa(self, f):
self.p(" i={}".format(i), f)

if self.repos or self.repolink:
sl = ""
if self.ag.brand == "ibs":
self.p(" i=9", f) # temporary to simplify diff with old rsync scripts, may be removed later
# some trickery for REPO_SLE_ vs REPO_SL_ variables in ibs
sl = "SLE_"
# some trickery for REPO_SLE_ vs REPO_SL_ variables in ibs
sl = "SLE_"
for r in self.repos:
if r.tag.startswith("SL"):
sl = ""
break
self.p(cfg.openqa_call_repot(self.build_id_from_iso, self.repos), f, "REPOTYPE", "''", "REPOPREFIX", sl)
self.p(
cfg.openqa_call_repot(self.build_id_from_iso, self.repos),
f,
"REPOTYPE",
"''",
"REPOPREFIX",
sl,
"REPO0_ISO",
"$repoDest",
)

repodirs = self.repodirs
if not repodirs and self.repolink:
Expand Down
56 changes: 48 additions & 8 deletions t/obs/openSUSE:Leap:16.0:ToTest/print_openqa.before
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,14 @@
CHECKSUM_ISO=$(cut -b-64 /var/lib/openqa/factory/other/agama-installer-Leap.aarch64-16.0.0-Leap-Build1.3.iso.sha256 | grep -E '[0-9a-f]{5,40}' | head -n1) \
DISTRI=opensuse \
FLAVOR=agama-installer-Leap \
FULLURL=1 \
ISO=agama-installer-Leap.aarch64-16.0.0-Leap-Build1.3.iso \
MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
MIRROR_PREFIX=http://openqa.opensuse.org/assets/repo \
REPO_0=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
REPO_SLE_LEAP_16_0_AARCH64_PPC64LE_S390X_X86_64=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
REPO_LEAP_16_0_AARCH64_PPC64LE_S390X_X86_64=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
SUSEMIRROR=http://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
VERSION=16.0 \
_OBSOLETE=1

Expand All @@ -18,9 +23,14 @@
CHECKSUM_ISO=$(cut -b-64 /var/lib/openqa/factory/other/agama-installer-Leap.x86_64-16.0.0-Leap-Build1.3.iso.sha256 | grep -E '[0-9a-f]{5,40}' | head -n1) \
DISTRI=opensuse \
FLAVOR=agama-installer-Leap \
FULLURL=1 \
ISO=agama-installer-Leap.x86_64-16.0.0-Leap-Build1.3.iso \
MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
MIRROR_PREFIX=http://openqa.opensuse.org/assets/repo \
REPO_0=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
REPO_SLE_LEAP_16_0_AARCH64_PPC64LE_S390X_X86_64=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
REPO_LEAP_16_0_AARCH64_PPC64LE_S390X_X86_64=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
SUSEMIRROR=http://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
VERSION=16.0 \
_OBSOLETE=1

Expand All @@ -31,9 +41,14 @@
CHECKSUM_ISO=$(cut -b-64 /var/lib/openqa/factory/other/agama-installer-Leap.ppc64le-16.0.0-Leap-Build1.3.iso.sha256 | grep -E '[0-9a-f]{5,40}' | head -n1) \
DISTRI=opensuse \
FLAVOR=agama-installer-Leap \
FULLURL=1 \
ISO=agama-installer-Leap.ppc64le-16.0.0-Leap-Build1.3.iso \
MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
MIRROR_PREFIX=http://openqa.opensuse.org/assets/repo \
REPO_0=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
REPO_SLE_LEAP_16_0_AARCH64_PPC64LE_S390X_X86_64=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
REPO_LEAP_16_0_AARCH64_PPC64LE_S390X_X86_64=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
SUSEMIRROR=http://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
VERSION=16.0 \
_OBSOLETE=1

Expand All @@ -44,9 +59,14 @@
CHECKSUM_ISO=$(cut -b-64 /var/lib/openqa/factory/other/agama-installer-Leap.s390x-16.0.0-Leap-Build1.3.iso.sha256 | grep -E '[0-9a-f]{5,40}' | head -n1) \
DISTRI=opensuse \
FLAVOR=agama-installer-Leap \
FULLURL=1 \
ISO=agama-installer-Leap.s390x-16.0.0-Leap-Build1.3.iso \
MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
MIRROR_PREFIX=http://openqa.opensuse.org/assets/repo \
REPO_0=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
REPO_SLE_LEAP_16_0_AARCH64_PPC64LE_S390X_X86_64=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
REPO_LEAP_16_0_AARCH64_PPC64LE_S390X_X86_64=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
SUSEMIRROR=http://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
VERSION=16.0 \
_OBSOLETE=1

Expand All @@ -57,9 +77,14 @@
CHECKSUM_ISO=$(cut -b-64 /var/lib/openqa/factory/other/Leap-16.0-offline-installer-aarch64-Build1.3.install.iso.sha256 | grep -E '[0-9a-f]{5,40}' | head -n1) \
DISTRI=opensuse \
FLAVOR=offline-installer \
FULLURL=1 \
ISO=Leap-16.0-offline-installer-aarch64-Build1.3.install.iso \
MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
MIRROR_PREFIX=http://openqa.opensuse.org/assets/repo \
REPO_0=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
REPO_SLE_LEAP_16_0_AARCH64_PPC64LE_S390X_X86_64=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
REPO_LEAP_16_0_AARCH64_PPC64LE_S390X_X86_64=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
SUSEMIRROR=http://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
VERSION=16.0 \
_OBSOLETE=1

Expand All @@ -70,9 +95,14 @@
CHECKSUM_ISO=$(cut -b-64 /var/lib/openqa/factory/other/Leap-16.0-offline-installer-x86_64-Build1.3.install.iso.sha256 | grep -E '[0-9a-f]{5,40}' | head -n1) \
DISTRI=opensuse \
FLAVOR=offline-installer \
FULLURL=1 \
ISO=Leap-16.0-offline-installer-x86_64-Build1.3.install.iso \
MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
MIRROR_PREFIX=http://openqa.opensuse.org/assets/repo \
REPO_0=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
REPO_SLE_LEAP_16_0_AARCH64_PPC64LE_S390X_X86_64=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
REPO_LEAP_16_0_AARCH64_PPC64LE_S390X_X86_64=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
SUSEMIRROR=http://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
VERSION=16.0 \
_OBSOLETE=1

Expand All @@ -83,9 +113,14 @@
CHECKSUM_ISO=$(cut -b-64 /var/lib/openqa/factory/other/Leap-16.0-offline-installer-ppc64le-Build1.3.install.iso.sha256 | grep -E '[0-9a-f]{5,40}' | head -n1) \
DISTRI=opensuse \
FLAVOR=offline-installer \
FULLURL=1 \
ISO=Leap-16.0-offline-installer-ppc64le-Build1.3.install.iso \
MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
MIRROR_PREFIX=http://openqa.opensuse.org/assets/repo \
REPO_0=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
REPO_SLE_LEAP_16_0_AARCH64_PPC64LE_S390X_X86_64=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
REPO_LEAP_16_0_AARCH64_PPC64LE_S390X_X86_64=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In this case, we might want to have a different name for this repo (or have it duplicated to... i.e LEAP_REPO) would that be possible? See where its used at:

https://github.com/os-autoinst/os-autoinst-distri-opensuse/pull/22054/files#diff-dd7d062b30fb82649a199111da8e89224600e38f86a24a23d251e0adc6747a89R22

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

so it is basically exactly how it is written in xml, which is exactly how it is configured in OBS. Do we really need another mapping from there to some custom name? Maybe rename it in OBS if it is too ugly?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Quoting from our conversation

we should aim to have REPO_OSS or maybe REPO_LEAP_OSS (because the folder is 000productcompose:leap_oss)

SUSEMIRROR=http://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
VERSION=16.0 \
_OBSOLETE=1

Expand All @@ -96,9 +131,14 @@
CHECKSUM_ISO=$(cut -b-64 /var/lib/openqa/factory/other/Leap-16.0-offline-installer-s390x-Build1.3.install.iso.sha256 | grep -E '[0-9a-f]{5,40}' | head -n1) \
DISTRI=opensuse \
FLAVOR=offline-installer \
FULLURL=1 \
ISO=Leap-16.0-offline-installer-s390x-Build1.3.install.iso \
MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
MIRROR_PREFIX=http://openqa.opensuse.org/assets/repo \
REPO_0=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
REPO_SLE_LEAP_16_0_AARCH64_PPC64LE_S390X_X86_64=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
REPO_LEAP_16_0_AARCH64_PPC64LE_S390X_X86_64=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
SUSEMIRROR=http://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
VERSION=16.0 \
_OBSOLETE=1