Skip to content

Commit 52d2274

Browse files
andrii-suseandrii-suse
committed
Fixes for Leap 16
- Add MIRROR variables to openqa call. - Remove SLE from REPO variable name
1 parent 4be4d8d commit 52d2274

File tree

3 files changed

+62
-11
lines changed

3 files changed

+62
-11
lines changed

‎script/cfg.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -391,6 +391,7 @@ def openqa_call_extra(repos):
391391
''' + openqa_call_build_id_from_iso2(build_id_from_iso) + '''
392392
[[ $repo =~ license ]] || echo " REPO_REPOPREFIX$repoKey=$repoDest \\\\"
393393
''' + openqa_call_extra(repos) + '''
394+
[ $i != 0 ] || ''' + openqa_call_repo0() + '''
394395
: $((i++))
395396
done < <(grep $repot$additional_repo_suffix __envsub/files_repo.lst | grep REPOTYPE | grep $arch | sort)
396397
done'''

‎script/scriptgen.py‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1095,15 +1095,25 @@ def gen_print_openqa(self, f):
10951095
self.p(" i={}".format(i), f)
10961096

10971097
if self.repos or self.repolink:
1098+
sl = ""
10981099
if self.ag.brand == "ibs":
10991100
self.p(" i=9", f) # temporary to simplify diff with old rsync scripts, may be removed later
1100-
# some trickery for REPO_SLE_ vs REPO_SL_ variables in ibs
1101-
sl = "SLE_"
1101+
# some trickery for REPO_SLE_ vs REPO_SL_ variables in ibs
1102+
sl = "SLE_"
11021103
for r in self.repos:
11031104
if r.tag.startswith("SL"):
11041105
sl = ""
11051106
break
1106-
self.p(cfg.openqa_call_repot(self.build_id_from_iso, self.repos), f, "REPOTYPE", "''", "REPOPREFIX", sl)
1107+
self.p(
1108+
cfg.openqa_call_repot(self.build_id_from_iso, self.repos),
1109+
f,
1110+
"REPOTYPE",
1111+
"''",
1112+
"REPOPREFIX",
1113+
sl,
1114+
"REPO0_ISO",
1115+
"$repoDest",
1116+
)
11071117

11081118
repodirs = self.repodirs
11091119
if not repodirs and self.repolink:

‎t/obs/openSUSE:Leap:16.0:ToTest/print_openqa.before‎

Lines changed: 48 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,14 @@
55
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) \
66
DISTRI=opensuse \
77
FLAVOR=agama-installer-Leap \
8+
FULLURL=1 \
89
ISO=agama-installer-Leap.aarch64-16.0.0-Leap-Build1.3.iso \
10+
MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
11+
MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
12+
MIRROR_PREFIX=http://openqa.opensuse.org/assets/repo \
913
REPO_0=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
10-
REPO_SLE_LEAP_16_0_AARCH64_PPC64LE_S390X_X86_64=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
14+
REPO_LEAP_16_0_AARCH64_PPC64LE_S390X_X86_64=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
15+
SUSEMIRROR=http://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
1116
VERSION=16.0 \
1217
_OBSOLETE=1
1318

@@ -18,9 +23,14 @@
1823
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) \
1924
DISTRI=opensuse \
2025
FLAVOR=agama-installer-Leap \
26+
FULLURL=1 \
2127
ISO=agama-installer-Leap.x86_64-16.0.0-Leap-Build1.3.iso \
28+
MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
29+
MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
30+
MIRROR_PREFIX=http://openqa.opensuse.org/assets/repo \
2231
REPO_0=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
23-
REPO_SLE_LEAP_16_0_AARCH64_PPC64LE_S390X_X86_64=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
32+
REPO_LEAP_16_0_AARCH64_PPC64LE_S390X_X86_64=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
33+
SUSEMIRROR=http://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
2434
VERSION=16.0 \
2535
_OBSOLETE=1
2636

@@ -31,9 +41,14 @@
3141
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) \
3242
DISTRI=opensuse \
3343
FLAVOR=agama-installer-Leap \
44+
FULLURL=1 \
3445
ISO=agama-installer-Leap.ppc64le-16.0.0-Leap-Build1.3.iso \
46+
MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
47+
MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
48+
MIRROR_PREFIX=http://openqa.opensuse.org/assets/repo \
3549
REPO_0=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
36-
REPO_SLE_LEAP_16_0_AARCH64_PPC64LE_S390X_X86_64=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
50+
REPO_LEAP_16_0_AARCH64_PPC64LE_S390X_X86_64=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
51+
SUSEMIRROR=http://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
3752
VERSION=16.0 \
3853
_OBSOLETE=1
3954

@@ -44,9 +59,14 @@
4459
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) \
4560
DISTRI=opensuse \
4661
FLAVOR=agama-installer-Leap \
62+
FULLURL=1 \
4763
ISO=agama-installer-Leap.s390x-16.0.0-Leap-Build1.3.iso \
64+
MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
65+
MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
66+
MIRROR_PREFIX=http://openqa.opensuse.org/assets/repo \
4867
REPO_0=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
49-
REPO_SLE_LEAP_16_0_AARCH64_PPC64LE_S390X_X86_64=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
68+
REPO_LEAP_16_0_AARCH64_PPC64LE_S390X_X86_64=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
69+
SUSEMIRROR=http://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
5070
VERSION=16.0 \
5171
_OBSOLETE=1
5272

@@ -57,9 +77,14 @@
5777
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) \
5878
DISTRI=opensuse \
5979
FLAVOR=offline-installer \
80+
FULLURL=1 \
6081
ISO=Leap-16.0-offline-installer-aarch64-Build1.3.install.iso \
82+
MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
83+
MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
84+
MIRROR_PREFIX=http://openqa.opensuse.org/assets/repo \
6185
REPO_0=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
62-
REPO_SLE_LEAP_16_0_AARCH64_PPC64LE_S390X_X86_64=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
86+
REPO_LEAP_16_0_AARCH64_PPC64LE_S390X_X86_64=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
87+
SUSEMIRROR=http://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
6388
VERSION=16.0 \
6489
_OBSOLETE=1
6590

@@ -70,9 +95,14 @@
7095
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) \
7196
DISTRI=opensuse \
7297
FLAVOR=offline-installer \
98+
FULLURL=1 \
7399
ISO=Leap-16.0-offline-installer-x86_64-Build1.3.install.iso \
100+
MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
101+
MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
102+
MIRROR_PREFIX=http://openqa.opensuse.org/assets/repo \
74103
REPO_0=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
75-
REPO_SLE_LEAP_16_0_AARCH64_PPC64LE_S390X_X86_64=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
104+
REPO_LEAP_16_0_AARCH64_PPC64LE_S390X_X86_64=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
105+
SUSEMIRROR=http://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
76106
VERSION=16.0 \
77107
_OBSOLETE=1
78108

@@ -83,9 +113,14 @@
83113
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) \
84114
DISTRI=opensuse \
85115
FLAVOR=offline-installer \
116+
FULLURL=1 \
86117
ISO=Leap-16.0-offline-installer-ppc64le-Build1.3.install.iso \
118+
MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
119+
MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
120+
MIRROR_PREFIX=http://openqa.opensuse.org/assets/repo \
87121
REPO_0=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
88-
REPO_SLE_LEAP_16_0_AARCH64_PPC64LE_S390X_X86_64=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
122+
REPO_LEAP_16_0_AARCH64_PPC64LE_S390X_X86_64=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
123+
SUSEMIRROR=http://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
89124
VERSION=16.0 \
90125
_OBSOLETE=1
91126

@@ -96,9 +131,14 @@
96131
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) \
97132
DISTRI=opensuse \
98133
FLAVOR=offline-installer \
134+
FULLURL=1 \
99135
ISO=Leap-16.0-offline-installer-s390x-Build1.3.install.iso \
136+
MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
137+
MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
138+
MIRROR_PREFIX=http://openqa.opensuse.org/assets/repo \
100139
REPO_0=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
101-
REPO_SLE_LEAP_16_0_AARCH64_PPC64LE_S390X_X86_64=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
140+
REPO_LEAP_16_0_AARCH64_PPC64LE_S390X_X86_64=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
141+
SUSEMIRROR=http://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
102142
VERSION=16.0 \
103143
_OBSOLETE=1
104144

0 commit comments

Comments
 (0)