1
0

Accepting request 692231 from home:RBrownSUSE:microos

Groups.yml refreshed, all patterns defined, with correct names

OBS-URL: https://build.opensuse.org/request/show/692231
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/000package-groups?expand=0&rev=63
This commit is contained in:
Dominique Leuenberger 2019-04-08 18:52:08 +00:00 committed by Git OBS Bridge
parent c2bda2eb17
commit c024419497
3 changed files with 70 additions and 44 deletions

View File

@ -12,7 +12,12 @@ OUTPUT:
- opensuse_kubic:
recommends: false
includes:
- opensuse_microos
- opensuse_kubic
- opensuse_microos:
recommends: false
includes:
- opensuse_microos
dvd:
- kernel-default
@ -341,19 +346,29 @@ dvd:
- inkscape
- autoyast2
opensuse_kubic:
opensuse_microos:
- dummy-release: [locked]
# we need a global flag, not there yet
- kernel-vanilla-base: [locked]
- kernel-kvmsmall-base: [locked]
- kernel-vanilla: [locked]
- kernel-kvmsmall: [locked]
- openSUSE-Tumbleweed-Kubic-release
- openSUSE-MicroOS-release
- kernel-default
- patterns-caasp-MicroOS: [aarch64,x86_64]
- patterns-caasp-kubeadm: [aarch64,x86_64]
- patterns-caasp-onlyDVD: [aarch64,x86_64]
- patterns-caasp-alt-onlyDVD: [aarch64,x86_64]
- patterns-microos-base: [aarch64,x86_64]
- patterns-microos-defaults: [aarch64,x86_64]
- patterns-microos-hardware: [aarch64,x86_64]
- patterns-microos-apparmor: [aarch64,x86_64]
- patterns-microos-selinux: [aarch64,x86_64]
- patterns-microos-sssd_ldap: [aarch64,x86_64]
- patterns-microos-ima_evm: [aarch64,x86_64]
- patterns-microos-cloud: [aarch64,x86_64]
- patterns-microos-onlyDVD: [aarch64,x86_64]
- patterns-microos-alt_onlyDVD: [aarch64,x86_64]
- podman-cni-config: [aarch64,x86_64]
- docker-kubic-kubeadm-criconfig: [aarch64,x86_64]
- kernel-default-base: [aarch64,x86_64]
opensuse_kubic:
- patterns-containers-kubeadm: [aarch64,x86_64]
- patterns-containers-container_runtime_kubernetes: [aarch64,x86_64]
- patterns-containers-container_runtime: [aarch64,x86_64]

View File

@ -1,5 +1,5 @@
#
# spec file for package openSUSE-Tumbleweed-Kubic-release.spec
# spec file for package openSUSE-MicroOS-release.spec
#
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
@ -16,7 +16,7 @@
#
Name: openSUSE-Tumbleweed-Kubic-release
Name: openSUSE-MicroOS-release
Version: ___VERSION___
Release: 0
Summary: ___SUMMARY___ ___BETA_VERSION___
@ -32,8 +32,9 @@ Recommends: branding
Conflicts: distribution-release
Conflicts: kernel < 4.4
Provides: distribution-release
# Needed to not break installation-images in short turn; this needs to fixed there of course
Provides: openSUSE-Kubic-release
# MicroOS-release replaces Tumbleweed-Kubic-release
Provides: openSUSE-Tumbleweed-Kubic-release
Obsoletes: openSUSE-Tumbleweed-Kubic-release <= 20190324
# this package should only be available for the "basearchs" of a product
ExclusiveArch: %ix86 x86_64 ppc64le s390x aarch64
___PRODUCT_PROVIDES___
@ -69,14 +70,14 @@ VERSION_ID=`echo %{version}|tr '[:upper:]' '[:lower:]'|sed -e 's/ //g;'`
# note: VERSION is an optional field and has no meaning other than informative on a rolling distro
# We do thus not add it to the os-release file
cat > %{buildroot}%{_libexecdir}/os-release <<EOF
NAME="openSUSE Tumbleweed Kubic"
NAME="openSUSE MicroOS"
# VERSION="%{version}%{?betaversion: %{betaversion}}"
ID="opensuse-tumbleweed-kubic"
ID="opensuse-microos"
ID_LIKE="suse opensuse opensuse-tumbleweed"
VERSION_ID="$VERSION_ID"
PRETTY_NAME="openSUSE Tumbleweed Kubic"
PRETTY_NAME="openSUSE MicroOS"
ANSI_COLOR="0;32"
CPE_NAME="cpe:/o:opensuse:tumbleweed-kubic:%{version}"
CPE_NAME="cpe:/o:opensuse:microos:%{version}"
BUG_REPORT_URL="https://bugs.opensuse.org"
HOME_URL="https://www.opensuse.org/"
EOF

View File

@ -3,18 +3,18 @@
<products>
<product>
<vendor>openSUSE</vendor>
<name>openSUSE-Tumbleweed-Kubic</name>
<releasepkgname>openSUSE-Tumbleweed-Kubic-release</releasepkgname>
<name>openSUSE-MicroOS</name>
<releasepkgname>openSUSE-MicroOS-release</releasepkgname>
<endoflife/>
<version></version>
<!-- release is no longer optional -->
<release>0</release>
<productline>openSUSE-Tumbleweed-Kubic</productline>
<productline>openSUSE-MicroOS</productline>
<summary>openSUSE Tumbleweed Kubic</summary>
<shortsummary>openSUSE Tumbleweed Kubic</shortsummary>
<description>openSUSE Tumbleweed Kubic combines the benefits of a rolling OS with a container orchestration platform. It is a modern Linux Operating System, designed for containers and optimized for large, clustered deployments. It inherits the
benefits of openSUSE Tumbleweed while redefining the operating system into a small, efficient and reliable distribution.
<summary>openSUSE MicroOS</summary>
<shortsummary>openSUSE MicroOS</shortsummary>
<description>openSUSE MicroOS combines the benefits of a rolling OS with a read-only root filesystem with transactional updates. It is a modern Linux Operating System, designed for single-service installations, such as container hosts. It is optimized for large, clustered deployments.
It inherits the benefits of openSUSE Tumbleweed while redefining the operating system into a small, efficient and reliable distribution.
</description>
<linguas>
@ -27,7 +27,7 @@
<buildconfig>
<!-- This section is needed to generate the installation media -->
<producttheme>Kubic</producttheme>
<producttheme>MicroOS</producttheme>
<create_flavors>true</create_flavors>
</buildconfig>
@ -53,7 +53,34 @@
<media
type="dvd5"
flavor="dvd"
name="openSUSE-Tumbleweed-Kubic-DVD"
name="openSUSE-MicroOS-DVD"
sourcemedia="0"
firmware="uefi"
mediastyle="suse-tumbleweed"
run_hybridiso="true"
run_media_check="true"
use_undecided="false"
create_pattern="false"
use_required="true"
use_recommended="true"
use_suggested="false">
<archsets>
<archset ref="x86_64"/>
</archsets>
<metadata>
<package name="skelcd-installer-MicroOS"/>
<!--package name="skelcd-control-MicroOS"/-->
<package name="skelcd-openSUSE"/>
</metadata>
<use group="opensuse_microos" create_pattern="false"/>
<use group="opensuse_microos.x86_64" create_pattern="false"/>
</media>
<!-- BEWARE: do not touch the naming here without adapting ftp upload scripts ! -->
<media
type="dvd5"
flavor="kubic-dvd"
name="openSUSE-Kubic-DVD"
sourcemedia="0"
firmware="uefi"
mediastyle="suse-tumbleweed"
@ -77,26 +104,9 @@
</media>
</mediasets>
<group name="openSUSE-Kubic-direct">
<packagelist>
<package name="caasp-container-manifests"/>
<package name="kubic-caasp-dex-image"/>
<package name="kubic-dnsmasq-nanny-image"/>
<package name="kubic-flannel-image"/>
<package name="kubic-haproxy-image"/>
<package name="kubic-kubedns-image"/>
<package name="kubic-mariadb-image"/>
<package name="kubic-openldap-image"/>
<package name="kubic-pv-recycler-node-image"/>
<package name="kubic-salt-api-image"/>
<package name="kubic-salt-master-image"/>
<package name="kubic-salt-minion-image"/>
<package name="kubic-sidecar-image"/>
<package name="kubic-tiller-image"/>
<package name="kubic-velum-image"/>
</packagelist>
</group>
<xi:include href="opensuse_microos.group"/>
<xi:include href="opensuse_kubic.group"/>
</productdefinition>