Skip to content
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.

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

Removed ALP Live images #1181

Merged
merged 1 commit into from
May 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion live/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ FLAVOR = openSUSE
# files to copy from src/
COPY_FILES = $(patsubst $(SRCDIR)/%,$(DESTDIR)/%,$(wildcard $(SRCDIR)/*))

all: $(DESTDIR) $(COPY_FILES) $(DESTDIR)/config-cdroot.tar.xz $(DESTDIR)/root.tar.xz $(DESTDIR)/root-ALP-PXE.tar.xz
all: $(DESTDIR) $(COPY_FILES) $(DESTDIR)/config-cdroot.tar.xz $(DESTDIR)/root.tar.xz

# clean the destination directory (but keep the .osc directory if it is present)
clean:
Expand Down
61 changes: 4 additions & 57 deletions live/agama-live.kiwi
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,7 @@
</description>
<profiles>
<profile name="openSUSE" description="openSUSE multiproduct image" import="true" />
<profile name="ALP" description="ALP-only image" />
<profile name="openSUSE-Playwright" description="openSUSE image with Playwright integration tests" arch="aarch64,x86_64" />
<profile name="ALP-Playwright" description="ALP image with Playwright integration tests" arch="aarch64,x86_64" />
<profile name="ALP-PXE" description="ALP OEM image for remote installation" />
</profiles>
<preferences>
<version>7.0.0</version>
Expand All @@ -26,72 +23,27 @@
<bootsplash-theme>bgrt</bootsplash-theme>
<bootloader-theme>openSUSE</bootloader-theme>
</preferences>
<preferences arch="ppc64le" profiles="openSUSE,ALP">
<preferences arch="ppc64le" profiles="openSUSE">
<type image="iso" flags="dmsquash" firmware="ofw" mediacheck="true" volid="agama" editbootconfig="fix_bootconfig">
<bootloader name="grub2" console="serial" timeout="10"/>
</type>
</preferences>
<preferences arch="aarch64,x86_64" profiles="openSUSE,ALP,openSUSE-Playwright,ALP-Playwright">
<preferences arch="aarch64,x86_64" profiles="openSUSE,openSUSE-Playwright">
<type image="iso" flags="dmsquash" firmware="uefi" mediacheck="true" volid="agama" editbootconfig="fix_bootconfig">
<bootloader name="grub2" timeout="10"/>
</type>
</preferences>
<preferences arch="s390x" profiles="openSUSE,ALP">
<preferences arch="s390x" profiles="openSUSE">
<type image="iso" flags="dmsquash" volid="agama" editbootconfig="fix_bootconfig">
<bootloader name="custom" />
</type>
</preferences>
<preferences arch="ppc64le" profiles="ALP-PXE">
<!-- For some reason the compression results on ppc64le are not as good as on the other archs -->
<type image="oem" filesystem="btrfs" fsmountoptions="compress=zstd:15" firmware="ofw" installpxe="true" installboot="install" kernelcmdline="rd.kiwi.ramdisk ramdisk_size=3174400" volid="agama">
<bootloader name="grub2" console="serial" timeout="1"/>
<oemconfig>
<oem-skip-verify>true</oem-skip-verify>
<oem-unattended>true</oem-unattended>
<oem-unattended-id>/dev/ram1</oem-unattended-id>
<oem-swap>false</oem-swap>
<oem-multipath-scan>false</oem-multipath-scan>
</oemconfig>
<size unit="M">3000</size>
</type>
</preferences>
<preferences arch="s390x" profiles="ALP-PXE">
<type image="oem" filesystem="btrfs" fsmountoptions="compress=zstd:15" installpxe="true" installboot="install" kernelcmdline="rd.kiwi.ramdisk ramdisk_size=2097152" volid="agama">
<bootloader name="custom"/>
<oemconfig>
<oem-skip-verify>true</oem-skip-verify>
<oem-unattended>true</oem-unattended>
<oem-unattended-id>/dev/ram1</oem-unattended-id>
<oem-swap>false</oem-swap>
<oem-multipath-scan>false</oem-multipath-scan>
</oemconfig>
<size unit="M">1900</size>
</type>
</preferences>
<preferences arch="aarch64,x86_64" profiles="ALP-PXE">
<type image="oem" filesystem="btrfs" fsmountoptions="compress=zstd:15" firmware="uefi" installiso="true" installpxe="true" installboot="install" kernelcmdline="rd.kiwi.ramdisk ramdisk_size=2097152" volid="agama">
<bootloader name="grub2" timeout="1"/>
<oemconfig>
<oem-skip-verify>true</oem-skip-verify>
<oem-unattended>true</oem-unattended>
<oem-unattended-id>/dev/ram1</oem-unattended-id>
<oem-swap>false</oem-swap>
<oem-multipath-scan>false</oem-multipath-scan>
</oemconfig>
<size unit="M">1900</size>
</type>
</preferences>
<users>
<user password="$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0" home="/root" name="root" groups="root"/>
</users>
<repository type="rpm-md">
<source path="obsrepositories:/"/>
</repository>
<packages type="image" profiles="ALP-PXE">
<package name="dracut-kiwi-oem-repart"/>
<package name="dracut-kiwi-oem-dump"/>
<archive name="brd.tar.gz"/>
</packages>
<packages type="image">
<package name="avahi"/>
<package name="bind-utils"/>
Expand Down Expand Up @@ -165,13 +117,8 @@
<package name="agama-products-opensuse"/>
<package name="openSUSE-build-key"/>
</packages>
<!-- additional packages for the ALP flavors -->
<packages type="image" profiles="ALP,ALP-Playwright">
<package name="agama-products-ALP-Dolomite"/>
<package name="suse-build-key"/>
</packages>
<!-- additional packages for the Playwright flavors -->
<packages type="image" profiles="openSUSE-Playwright,ALP-Playwright">
<packages type="image" profiles="openSUSE-Playwright">
<package name="playwright"/>
<!-- <package name="cockpit-agama-playwright"/> -->
<!-- Playwright does not work with the openSUSE Firefox, -->
Expand Down
1 change: 0 additions & 1 deletion live/root-ALP-PXE/etc/dracut.conf.d/90-brd.conf

This file was deleted.

3 changes: 0 additions & 3 deletions live/src/_multibuild
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
<multibuild>
<flavor>openSUSE</flavor>
<flavor>openSUSE-Playwright</flavor>
<flavor>ALP</flavor>
<flavor>ALP-Playwright</flavor>
<flavor>ALP-PXE</flavor>
</multibuild>
2 changes: 1 addition & 1 deletion web/src/components/overview/ProductSection.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ const Content = ({ isLoading = false }) => {

return (
<Text>
{/* TRANSLATORS: %s is replaced by a product name (e.g., SUSE ALP-Dolomite) */}
{/* TRANSLATORS: %s is replaced by a product name (e.g. SLES) */}
{isRegistered ? sprintf(_("%s (registered)"), productName) : productName}
</Text>
);
Expand Down
2 changes: 1 addition & 1 deletion web/src/components/product/ProductPage.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ const DeregisterProductPopup = ({
/>
<p>
{
// TRANSLATORS: %s is replaced by a product name (e.g., SUSE ALP-Dolomite)
// TRANSLATORS: %s is replaced by a product name (e.g. SLES)
sprintf(_("Do you want to deregister %s?"), selectedProduct.name)
}
</p>
Expand Down
6 changes: 0 additions & 6 deletions web/src/components/product/ProductSelector.test.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,6 @@ import { createClient } from "~/client";
jest.mock("~/client");

const products = [
{
id: "ALP-Dolomite",
name: "ALP Dolomite",
description: "ALP Dolomite description"
},
{
id: "Tumbleweed",
name: "openSUSE Tumbleweed",
Expand All @@ -53,7 +48,6 @@ it("shows an option for each product", async () => {
installerRender(<ProductSelector products={products} />);

await screen.findByRole("grid", { name: "Available products" });
screen.getByRole("row", { name: /ALP Dolomite/ });
screen.getByRole("row", { name: /openSUSE Tumbleweed/ });
screen.getByRole("row", { name: /openSUSE MicroOS/ });
});
Expand Down
Loading