Skip to content

Commit 0e43237

Browse files
authored
Merge pull request #311 from foursixnine/leaposs
Bring Leap in sync with Factory variables
2 parents d2d770b + 55d59a5 commit 0e43237

File tree

2 files changed

+25
-25
lines changed

2 files changed

+25
-25
lines changed

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

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
MIRROR_PREFIX=http://openqa.opensuse.org/assets/repo \
1414
REPO_0=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
1515
REPO_1=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Debug-Build1.3 \
16-
REPO_LEAP_OSS=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
17-
REPO_LEAP_OSS_DEBUG=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Debug-Build1.3 \
18-
REPO_LEAP_OSS_DEBUG_PACKAGES='{java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*}' \
16+
REPO_OSS=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
17+
REPO_OSS_DEBUG=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Debug-Build1.3 \
18+
REPO_OSS_DEBUG_PACKAGES='{java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*}' \
1919
SUSEMIRROR=http://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
2020
VERSION=16.0 \
2121
_OBSOLETE=1
@@ -35,9 +35,9 @@
3535
MIRROR_PREFIX=http://openqa.opensuse.org/assets/repo \
3636
REPO_0=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
3737
REPO_1=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Debug-Build1.3 \
38-
REPO_LEAP_OSS=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
39-
REPO_LEAP_OSS_DEBUG=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Debug-Build1.3 \
40-
REPO_LEAP_OSS_DEBUG_PACKAGES='{java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*}' \
38+
REPO_OSS=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
39+
REPO_OSS_DEBUG=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Debug-Build1.3 \
40+
REPO_OSS_DEBUG_PACKAGES='{java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*}' \
4141
SUSEMIRROR=http://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
4242
VERSION=16.0 \
4343
_OBSOLETE=1
@@ -57,9 +57,9 @@
5757
MIRROR_PREFIX=http://openqa.opensuse.org/assets/repo \
5858
REPO_0=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
5959
REPO_1=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Debug-Build1.3 \
60-
REPO_LEAP_OSS=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
61-
REPO_LEAP_OSS_DEBUG=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Debug-Build1.3 \
62-
REPO_LEAP_OSS_DEBUG_PACKAGES='{java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*}' \
60+
REPO_OSS=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
61+
REPO_OSS_DEBUG=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Debug-Build1.3 \
62+
REPO_OSS_DEBUG_PACKAGES='{java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*}' \
6363
SUSEMIRROR=http://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
6464
VERSION=16.0 \
6565
_OBSOLETE=1
@@ -79,9 +79,9 @@
7979
MIRROR_PREFIX=http://openqa.opensuse.org/assets/repo \
8080
REPO_0=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
8181
REPO_1=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Debug-Build1.3 \
82-
REPO_LEAP_OSS=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
83-
REPO_LEAP_OSS_DEBUG=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Debug-Build1.3 \
84-
REPO_LEAP_OSS_DEBUG_PACKAGES='{java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*}' \
82+
REPO_OSS=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
83+
REPO_OSS_DEBUG=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Debug-Build1.3 \
84+
REPO_OSS_DEBUG_PACKAGES='{java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*}' \
8585
SUSEMIRROR=http://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
8686
VERSION=16.0 \
8787
_OBSOLETE=1
@@ -101,9 +101,9 @@
101101
MIRROR_PREFIX=http://openqa.opensuse.org/assets/repo \
102102
REPO_0=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
103103
REPO_1=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Debug-Build1.3 \
104-
REPO_LEAP_OSS=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
105-
REPO_LEAP_OSS_DEBUG=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Debug-Build1.3 \
106-
REPO_LEAP_OSS_DEBUG_PACKAGES='{java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*}' \
104+
REPO_OSS=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
105+
REPO_OSS_DEBUG=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Debug-Build1.3 \
106+
REPO_OSS_DEBUG_PACKAGES='{java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*}' \
107107
SUSEMIRROR=http://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
108108
VERSION=16.0 \
109109
_OBSOLETE=1
@@ -123,9 +123,9 @@
123123
MIRROR_PREFIX=http://openqa.opensuse.org/assets/repo \
124124
REPO_0=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
125125
REPO_1=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Debug-Build1.3 \
126-
REPO_LEAP_OSS=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
127-
REPO_LEAP_OSS_DEBUG=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Debug-Build1.3 \
128-
REPO_LEAP_OSS_DEBUG_PACKAGES='{java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*}' \
126+
REPO_OSS=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
127+
REPO_OSS_DEBUG=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Debug-Build1.3 \
128+
REPO_OSS_DEBUG_PACKAGES='{java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*}' \
129129
SUSEMIRROR=http://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
130130
VERSION=16.0 \
131131
_OBSOLETE=1
@@ -145,9 +145,9 @@
145145
MIRROR_PREFIX=http://openqa.opensuse.org/assets/repo \
146146
REPO_0=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
147147
REPO_1=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Debug-Build1.3 \
148-
REPO_LEAP_OSS=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
149-
REPO_LEAP_OSS_DEBUG=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Debug-Build1.3 \
150-
REPO_LEAP_OSS_DEBUG_PACKAGES='{java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*}' \
148+
REPO_OSS=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
149+
REPO_OSS_DEBUG=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Debug-Build1.3 \
150+
REPO_OSS_DEBUG_PACKAGES='{java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*}' \
151151
SUSEMIRROR=http://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
152152
VERSION=16.0 \
153153
_OBSOLETE=1
@@ -167,9 +167,9 @@
167167
MIRROR_PREFIX=http://openqa.opensuse.org/assets/repo \
168168
REPO_0=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
169169
REPO_1=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Debug-Build1.3 \
170-
REPO_LEAP_OSS=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
171-
REPO_LEAP_OSS_DEBUG=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Debug-Build1.3 \
172-
REPO_LEAP_OSS_DEBUG_PACKAGES='{java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*}' \
170+
REPO_OSS=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
171+
REPO_OSS_DEBUG=Leap-16.0-aarch64-ppc64le-s390x-x86_64-Debug-Build1.3 \
172+
REPO_OSS_DEBUG_PACKAGES='{java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*}' \
173173
SUSEMIRROR=http://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
174174
VERSION=16.0 \
175175
_OBSOLETE=1

xml/obs/openSUSE:Leap:16.0.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
archs="aarch64 x86_64 ppc64le s390x">
77
<flavor name="online-installer" folder="../product/local" media1="0">
88
<repos>
9-
<leap_oss mirror="1" multiarch="1" folder="*leap_oss/Leap-16.0-aarch64-ppc64le-s390x-x86_64/" debug="{java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*}"/>
9+
<oss mirror="1" multiarch="1" folder="*leap_oss/Leap-16.0-aarch64-ppc64le-s390x-x86_64/" debug="{java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*}"/>
1010
</repos>
1111
<iso filemask="online-installer" folder="../product/local/*leap_mini*"/>
1212
</flavor>

0 commit comments

Comments
 (0)