From b84c18980911d0f4d9531dd752754ba4a9e7c1b3 Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Mon, 30 Nov 2020 20:37:44 +0000
Subject: [PATCH] Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/cockpit.git#8849522a61ed70524a8d35e0df71e0ee1b44347c
---
 .gitignore        |  2 ++
 cockpit.spec      | 16 ++++++++++++----
 sources           |  2 +-
 tests/run-test.sh |  4 ----
 tests/verify.sh   |  3 +++
 5 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index a5a6000..7a14ef8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -192,3 +192,5 @@
 /cockpit-230.tar.xz
 /cockpit-231.tar.xz
 /cockpit-232.tar.xz
+/cockpit-233.tar.xz
+/cockpit-233.1.tar.xz
diff --git a/cockpit.spec b/cockpit.spec
index 10b658a..156ebc4 100644
--- a/cockpit.spec
+++ b/cockpit.spec
@@ -1,5 +1,5 @@
 # This spec file has been automatically updated
-Version:        232
+Version:        233.1
 Release: 1%{?dist}
 #
 # Copyright (C) 2014-2020 Red Hat, Inc.
@@ -194,14 +194,14 @@ rm -f %{buildroot}/%{_libdir}/cockpit/*.so
 install -D -p -m 644 AUTHORS COPYING README.md %{buildroot}%{_docdir}/cockpit/
 
 # only ship deprecated PatternFly API for stable releases
-%if 0%{?fedora} > 33 || 0%{?rhel} > 8
-    rm %{buildroot}/%{_datadir}/cockpit/base1/patternfly.css
+%if 0%{?fedora} <= 33 || 0%{?rhel} <= 8
+    ln -s cockpit.css.gz %{buildroot}/%{_datadir}/cockpit/base1/patternfly.css.gz
 %endif
 
 # Build the package lists for resource packages
 echo '%dir %{_datadir}/cockpit/base1' > base.list
 echo '%dir %{_datadir}/cockpit/base1/fonts' >> base.list
-find %{buildroot}%{_datadir}/cockpit/base1 -type f >> base.list
+find %{buildroot}%{_datadir}/cockpit/base1 -type f -o -type l >> base.list
 echo '%{_sysconfdir}/cockpit/machines.d' >> base.list
 echo %{buildroot}%{_datadir}/polkit-1/actions/org.cockpit-project.cockpit-bridge.policy >> base.list
 echo '%dir %{_datadir}/cockpit/ssh' >> base.list
@@ -703,6 +703,14 @@ via PackageKit.
 
 # The changelog is automatically generated and merged
 %changelog
+* Thu Nov 26 2020 Katerina Koukiou <kkoukiou@redhat.com> - 233.1-1
+
+- Machines: Fix CSS regression on the VMs details page
+- One test fix for the metrics page
+
+* Thu Nov 26 2020 Cockpit Project <cockpituous@gmail.com> - 233-1
+- Update to upstream 233 release
+
 * Wed Nov 11 2020 Katerina Koukiou <kkoukiou@redhat.com> - 232-1
 
 - Improved host editing
diff --git a/sources b/sources
index 485f701..0da70f2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cockpit-232.tar.xz) = ff9b4a2db73dc5d1654ab951a9a8b2ec251f75d126037f6c10b64f1cf9f01e4088d2afe93b7c661a1816188d9cef080b8ae856225080c28a68de389518f2df46
+SHA512 (cockpit-233.1.tar.xz) = 941ef6916901c34a1a427e45993b3f53c49e95c52e4b6d4f7c1781e3e59ad27f863d379778b3b4ddd1ca22b5d3641d0650e8c9a98bfd3b283c6c7dfe92d6b9ae
diff --git a/tests/run-test.sh b/tests/run-test.sh
index fe19ae0..17ac424 100755
--- a/tests/run-test.sh
+++ b/tests/run-test.sh
@@ -42,10 +42,6 @@ if [ -n "$test_optional" ]; then
     # pre-download cirros image for Machines tests
     bots/image-download cirros
 
-    # takes too long, somehow breaks Ansible
-    EXCLUDES="$EXCLUDES TestMachines.testCreate"
-    # triggers SELinux violation
-    EXCLUDES="$EXCLUDES TestMachines.testAddDisk"
     # not investigated yet
     EXCLUDES="$EXCLUDES
         TestMachines.testCreateThenInstall
diff --git a/tests/verify.sh b/tests/verify.sh
index 88e354b..a1e0a66 100755
--- a/tests/verify.sh
+++ b/tests/verify.sh
@@ -20,6 +20,9 @@ fi
 # make libpwquality less aggressive, so that our "foobar" password works
 printf 'dictcheck = 0\nminlen = 6\n' >> /etc/security/pwquality.conf
 
+# set root password for logging in
+echo root:foobar | chpasswd
+
 # create user account for logging in
 if ! id admin 2>/dev/null; then
     useradd -c Administrator -G wheel admin