From a58084aa088f28c402b587335585429409d0911f Mon Sep 17 00:00:00 2001
From: Katerina Koukiou <kkoukiou@redhat.com>
Date: Tue, 28 Mar 2023 10:38:42 +0200
Subject: [PATCH] Update to cockpit 288.2 and cockpit-machines 286 upstream
 releases

Resolves: rhbz#1913548
---
 .fmf/version           |  1 +
 .gitignore             |  3 +++
 cockpit-appstream.spec | 13 +++++++------
 plans/all.fmf          | 32 ++++++++++++++++++++++++++++++++
 sources                |  4 ++--
 5 files changed, 45 insertions(+), 8 deletions(-)
 create mode 100644 .fmf/version
 create mode 100644 plans/all.fmf

diff --git a/.fmf/version b/.fmf/version
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/.fmf/version
@@ -0,0 +1 @@
+1
diff --git a/.gitignore b/.gitignore
index ba2dd78..a7d9585 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,6 @@ SOURCES/cockpit-286.1.tar.xz
 SOURCES/cockpit-machines-284.1.tar.xz
 /cockpit-286.1.tar.xz
 /cockpit-machines-284.1.tar.xz
+/cockpit-machines-286.tar.xz
+/cockpit-288.1.tar.xz
+/cockpit-288.2.tar.xz
diff --git a/cockpit-appstream.spec b/cockpit-appstream.spec
index 252c649..2382984 100644
--- a/cockpit-appstream.spec
+++ b/cockpit-appstream.spec
@@ -28,7 +28,7 @@
 # we maintain the basic/optional split, then it can be replaced with just %{version}.
 %define required_base 266
 
-%define machines_version 284.1
+%define machines_version 286
 
 # we generally want CentOS packages to be like RHEL; special cases need to check %{centos} explicitly
 %if 0%{?centos}
@@ -51,7 +51,7 @@ Summary:        Web Console for Linux servers
 License:        LGPLv2+
 URL:            https://cockpit-project.org/
 
-Version:        286.1
+Version:        288.2
 Release:        1%{?dist}
 Source0:        https://github.com/cockpit-project/cockpit/releases/download/%{version}/cockpit-%{version}.tar.xz
 Source1:        https://github.com/cockpit-project/cockpit-machines/releases/download/%{machines_version}/cockpit-machines-%{machines_version}.tar.xz
@@ -208,9 +208,6 @@ echo '%{_libexecdir}/cockpit-ssh' >> base.list
 echo '%dir %{_datadir}/cockpit/pcp' > pcp.list
 find %{buildroot}%{_datadir}/cockpit/pcp -type f >> pcp.list
 
-echo '%dir %{_datadir}/cockpit/tuned' > system.list
-find %{buildroot}%{_datadir}/cockpit/tuned -type f >> system.list
-
 echo '%dir %{_datadir}/cockpit/shell' >> system.list
 find %{buildroot}%{_datadir}/cockpit/shell -type f >> system.list
 
@@ -256,7 +253,7 @@ find %{buildroot}%{_datadir}/cockpit/static -type f >> static.list
 
 # when not building basic packages, remove their files
 %if 0%{?build_basic} == 0
-for pkg in base1 branding motd kdump networkmanager selinux shell sosreport ssh static systemd tuned users metrics; do
+for pkg in base1 branding motd kdump networkmanager selinux shell sosreport ssh static systemd users metrics; do
     rm -r %{buildroot}/%{_datadir}/cockpit/$pkg
     rm -f %{buildroot}/%{_datadir}/metainfo/org.cockpit-project.cockpit-${pkg}.metainfo.xml
 done
@@ -711,6 +708,10 @@ via PackageKit.
 
 # The changelog is automatically generated and merged
 %changelog
+* Wed Mar 29 2023 Katerina Koukiou <hello@packit.dev> - 288.2-1
+- Storage: Mounting filesystems at boot time
+- Machines: Create VM based on cloud image and start it later (rhbz#1913548)
+
 * Thu Feb 23 2023 Martin Pitt <mpitt@redhat.com> - 286.1-1
 - Translation updates (rhbz#2139719)
 
diff --git a/plans/all.fmf b/plans/all.fmf
new file mode 100644
index 0000000..f73dcd2
--- /dev/null
+++ b/plans/all.fmf
@@ -0,0 +1,32 @@
+discover:
+    how: fmf
+    # for machines tests; keep in sync with cockpit-appstream.spec
+    url: https://github.com/cockpit-project/cockpit-machines
+    ref: "286"
+
+execute:
+    how: tmt
+
+/optional:
+    summary: Run Cockpit tests for optional packages
+    discover+:
+        url: https://github.com/cockpit-project/cockpit
+        ref: "288.2"
+        test: /test/browser/optional
+
+/machines-basic:
+    summary: Run basic Machines tests (creation and lifetime)
+    discover+:
+        test: /test/browser/basic
+
+/machines-network:
+    summary: Run network related Machines tests
+    discover+:
+        url: https://github.com/cockpit-project/cockpit-machines
+        test: /test/browser/network
+
+/machines-storage:
+    summary: Run storage related Machines tests
+    discover+:
+        url: https://github.com/cockpit-project/cockpit-machines
+        test: /test/browser/storage
diff --git a/sources b/sources
index 68ade99..d2be527 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (cockpit-286.1.tar.xz) = a84dfe8d7f860e226c349d4b872ad21ebc18f643143f78f3e2a388a2beae3ab06153e623dcce0d1b39c2dbc5d6c8baff049a281533129e963c3c1aa54505acd6
-SHA512 (cockpit-machines-284.1.tar.xz) = 8e9c472f3081753a96b43a6b7661a8d25a64859e489cc3d3182736d1afa77397fb5b9339794ea2d776fb9dcaec91f450e4b386a56cd61918eca447de978124cd
+SHA512 (cockpit-288.2.tar.xz) = af521b2e45f8b195d2c555a02e52f6988fd22786d2e8596fe1f037cdff99846df9bdc038deeb71a724f2ba4aea4c35a18a5c789a6bfdbd4942a4b55f0ced691c
+SHA512 (cockpit-machines-286.tar.xz) = ee6d33ec2ce385fd39d4ed212bfe33b058349f0b54caa81439080410098fb83fcc58d40881a50f83290b4b84a24ed39f7eb36c32bbdcb157a6de085419a960ff