summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Styk <mastyk@redhat.com>2020-03-18 17:57:23 +0100
committerMartin Styk <mastyk@redhat.com>2020-03-18 17:57:23 +0100
commita2b6e51eb398a715e805adc2d2760f0d5b2272b7 (patch)
treecc0d8a1700070a6dbbf25da2709fdf7ff8407dc2
parente914077e7da311ddd9270f2f3f511fab00c1010f (diff)
parent21fe3ae524beea144ea9e6e79a4937367a9e1b0f (diff)
Merge branch 'release-27' into develop
Change-Id: I04d1c2b53db8351d07333e67c5d4a691939db5da Signed-off-by: Martin Styk <mastyk@redhat.com>
-rw-r--r--Client/setup.py2
-rw-r--r--Common/bkr/common/__init__.py2
-rw-r--r--Common/setup.py2
-rw-r--r--IntegrationTests/setup.py2
-rw-r--r--IntegrationTests/src/bkr/inttest/server/kickstarts/Fedora18-scheduler-defaults.expected2
-rw-r--r--IntegrationTests/src/bkr/inttest/server/kickstarts/Fedorarawhide-scheduler-defaults.expected2
-rw-r--r--IntegrationTests/src/bkr/inttest/server/kickstarts/RHVH-defaults.expected2
-rw-r--r--IntegrationTests/src/bkr/inttest/server/kickstarts/RedHatEnterpriseLinux6-scheduler-defaults-beaker-create-kickstart.expected2
-rw-r--r--IntegrationTests/src/bkr/inttest/server/kickstarts/RedHatEnterpriseLinux6-scheduler-defaults.expected2
-rw-r--r--IntegrationTests/src/bkr/inttest/server/kickstarts/RedHatEnterpriseLinux6-scheduler-guest.expected2
-rw-r--r--IntegrationTests/src/bkr/inttest/server/kickstarts/RedHatEnterpriseLinux6-scheduler-manual.expected2
-rw-r--r--IntegrationTests/src/bkr/inttest/server/kickstarts/RedHatEnterpriseLinux7-scheduler-defaults.expected2
-rw-r--r--IntegrationTests/src/bkr/inttest/server/kickstarts/RedHatEnterpriseLinux7-scheduler-manual.expected2
-rw-r--r--IntegrationTests/src/bkr/inttest/server/kickstarts/RedHatEnterpriseLinuxAlternateArchitectures7-scheduler-defaults.expected2
-rw-r--r--IntegrationTests/src/bkr/inttest/server/kickstarts/RedHatEnterpriseLinuxServer5-scheduler-defaults.expected2
-rw-r--r--LabController/setup.py2
-rw-r--r--Server/bkr/server/snippets/rhts_post2
-rw-r--r--Server/setup.py2
-rw-r--r--beaker.spec4
-rw-r--r--documentation/whats-new/release-27.rst11
20 files changed, 31 insertions, 20 deletions
diff --git a/Client/setup.py b/Client/setup.py
index dad2350..40fec94 100644
--- a/Client/setup.py
+++ b/Client/setup.py
@@ -22,7 +22,7 @@ def bash_completion_dir():
setup(
name='beaker-client',
- version='27.2',
+ version='27.3',
description='Command-line client for interacting with Beaker',
author='Red Hat, Inc.',
author_email='beaker-devel@lists.fedorahosted.org',
diff --git a/Common/bkr/common/__init__.py b/Common/bkr/common/__init__.py
index 9dd3237..bee8df5 100644
--- a/Common/bkr/common/__init__.py
+++ b/Common/bkr/common/__init__.py
@@ -2,4 +2,4 @@
# code in bkr.__init__), the version details are retrieved from here in
# order to correctly handle module shadowing on sys.path
-__version__ = '27.2'
+__version__ = '27.3'
diff --git a/Common/setup.py b/Common/setup.py
index 3d02e18..d921063 100644
--- a/Common/setup.py
+++ b/Common/setup.py
@@ -12,7 +12,7 @@ from setuptools import setup, find_packages
setup(
name='beaker-common',
- version='27.2',
+ version='27.3',
description='Common components for Beaker packages',
author='Red Hat, Inc.',
author_email='beaker-devel@lists.fedorahosted.org',
diff --git a/IntegrationTests/setup.py b/IntegrationTests/setup.py
index 1793d6a..8e11a57 100644
--- a/IntegrationTests/setup.py
+++ b/IntegrationTests/setup.py
@@ -12,7 +12,7 @@ def get_compose_layout():
setup(
name='beaker-integration-tests',
- version='27.2',
+ version='27.3',
description='Integration tests for Beaker',
author='Red Hat, Inc.',
author_email='beaker-devel@lists.fedorahosted.org',
diff --git a/IntegrationTests/src/bkr/inttest/server/kickstarts/Fedora18-scheduler-defaults.expected b/IntegrationTests/src/bkr/inttest/server/kickstarts/Fedora18-scheduler-defaults.expected
index ddd12a2..0a79e61 100644
--- a/IntegrationTests/src/bkr/inttest/server/kickstarts/Fedora18-scheduler-defaults.expected
+++ b/IntegrationTests/src/bkr/inttest/server/kickstarts/Fedora18-scheduler-defaults.expected
@@ -301,7 +301,7 @@ fi
# fill the yum cache and redirect output to /dev/null
# This speeds up yum because of a bug where it will update stdout too often.
# http://lists.baseurl.org/pipermail/yum-devel/2011-December/008857.html
-$package_command check-update > /dev/null 2>&1 || true
+$package_command check-update -y > /dev/null 2>&1 || true
if command -v dnf >/dev/null ; then
package_command="dnf"
else
diff --git a/IntegrationTests/src/bkr/inttest/server/kickstarts/Fedorarawhide-scheduler-defaults.expected b/IntegrationTests/src/bkr/inttest/server/kickstarts/Fedorarawhide-scheduler-defaults.expected
index 91ee900..4f60ee7 100644
--- a/IntegrationTests/src/bkr/inttest/server/kickstarts/Fedorarawhide-scheduler-defaults.expected
+++ b/IntegrationTests/src/bkr/inttest/server/kickstarts/Fedorarawhide-scheduler-defaults.expected
@@ -297,7 +297,7 @@ fi
# fill the yum cache and redirect output to /dev/null
# This speeds up yum because of a bug where it will update stdout too often.
# http://lists.baseurl.org/pipermail/yum-devel/2011-December/008857.html
-$package_command check-update > /dev/null 2>&1 || true
+$package_command check-update -y > /dev/null 2>&1 || true
cat <<"EOF" >/etc/profile.d/beaker-harness-env.sh
export BEAKER_LAB_CONTROLLER_URL="http://lab.test-kickstart.invalid:8000/"
export BEAKER_LAB_CONTROLLER=lab.test-kickstart.invalid
diff --git a/IntegrationTests/src/bkr/inttest/server/kickstarts/RHVH-defaults.expected b/IntegrationTests/src/bkr/inttest/server/kickstarts/RHVH-defaults.expected
index 1940280..9d48120 100644
--- a/IntegrationTests/src/bkr/inttest/server/kickstarts/RHVH-defaults.expected
+++ b/IntegrationTests/src/bkr/inttest/server/kickstarts/RHVH-defaults.expected
@@ -283,7 +283,7 @@ fi
# fill the yum cache and redirect output to /dev/null
# This speeds up yum because of a bug where it will update stdout too often.
# http://lists.baseurl.org/pipermail/yum-devel/2011-December/008857.html
-$package_command check-update > /dev/null 2>&1 || true
+$package_command check-update -y > /dev/null 2>&1 || true
if command -v dnf >/dev/null ; then
package_command="dnf"
else
diff --git a/IntegrationTests/src/bkr/inttest/server/kickstarts/RedHatEnterpriseLinux6-scheduler-defaults-beaker-create-kickstart.expected b/IntegrationTests/src/bkr/inttest/server/kickstarts/RedHatEnterpriseLinux6-scheduler-defaults-beaker-create-kickstart.expected
index 688569a..41c3ced 100644
--- a/IntegrationTests/src/bkr/inttest/server/kickstarts/RedHatEnterpriseLinux6-scheduler-defaults-beaker-create-kickstart.expected
+++ b/IntegrationTests/src/bkr/inttest/server/kickstarts/RedHatEnterpriseLinux6-scheduler-defaults-beaker-create-kickstart.expected
@@ -357,7 +357,7 @@ fi
# fill the yum cache and redirect output to /dev/null
# This speeds up yum because of a bug where it will update stdout too often.
# http://lists.baseurl.org/pipermail/yum-devel/2011-December/008857.html
-$package_command check-update > /dev/null 2>&1 || true
+$package_command check-update -y > /dev/null 2>&1 || true
if command -v dnf >/dev/null ; then
package_command="dnf"
else
diff --git a/IntegrationTests/src/bkr/inttest/server/kickstarts/RedHatEnterpriseLinux6-scheduler-defaults.expected b/IntegrationTests/src/bkr/inttest/server/kickstarts/RedHatEnterpriseLinux6-scheduler-defaults.expected
index 9e6fee2..1f8b7a4 100644
--- a/IntegrationTests/src/bkr/inttest/server/kickstarts/RedHatEnterpriseLinux6-scheduler-defaults.expected
+++ b/IntegrationTests/src/bkr/inttest/server/kickstarts/RedHatEnterpriseLinux6-scheduler-defaults.expected
@@ -357,7 +357,7 @@ fi
# fill the yum cache and redirect output to /dev/null
# This speeds up yum because of a bug where it will update stdout too often.
# http://lists.baseurl.org/pipermail/yum-devel/2011-December/008857.html
-$package_command check-update > /dev/null 2>&1 || true
+$package_command check-update -y > /dev/null 2>&1 || true
if command -v dnf >/dev/null ; then
package_command="dnf"
else
diff --git a/IntegrationTests/src/bkr/inttest/server/kickstarts/RedHatEnterpriseLinux6-scheduler-guest.expected b/IntegrationTests/src/bkr/inttest/server/kickstarts/RedHatEnterpriseLinux6-scheduler-guest.expected
index 98b911c..a9b799b 100644
--- a/IntegrationTests/src/bkr/inttest/server/kickstarts/RedHatEnterpriseLinux6-scheduler-guest.expected
+++ b/IntegrationTests/src/bkr/inttest/server/kickstarts/RedHatEnterpriseLinux6-scheduler-guest.expected
@@ -344,7 +344,7 @@ fi
# fill the yum cache and redirect output to /dev/null
# This speeds up yum because of a bug where it will update stdout too often.
# http://lists.baseurl.org/pipermail/yum-devel/2011-December/008857.html
-$package_command check-update > /dev/null 2>&1 || true
+$package_command check-update -y > /dev/null 2>&1 || true
if command -v dnf >/dev/null ; then
package_command="dnf"
else
diff --git a/IntegrationTests/src/bkr/inttest/server/kickstarts/RedHatEnterpriseLinux6-scheduler-manual.expected b/IntegrationTests/src/bkr/inttest/server/kickstarts/RedHatEnterpriseLinux6-scheduler-manual.expected
index efab3ac..6aedce0 100644
--- a/IntegrationTests/src/bkr/inttest/server/kickstarts/RedHatEnterpriseLinux6-scheduler-manual.expected
+++ b/IntegrationTests/src/bkr/inttest/server/kickstarts/RedHatEnterpriseLinux6-scheduler-manual.expected
@@ -309,7 +309,7 @@ fi
# fill the yum cache and redirect output to /dev/null
# This speeds up yum because of a bug where it will update stdout too often.
# http://lists.baseurl.org/pipermail/yum-devel/2011-December/008857.html
-$package_command check-update > /dev/null 2>&1 || true
+$package_command check-update -y > /dev/null 2>&1 || true
if command -v dnf >/dev/null ; then
package_command="dnf"
else
diff --git a/IntegrationTests/src/bkr/inttest/server/kickstarts/RedHatEnterpriseLinux7-scheduler-defaults.expected b/IntegrationTests/src/bkr/inttest/server/kickstarts/RedHatEnterpriseLinux7-scheduler-defaults.expected
index 8266b97..303aba1 100644
--- a/IntegrationTests/src/bkr/inttest/server/kickstarts/RedHatEnterpriseLinux7-scheduler-defaults.expected
+++ b/IntegrationTests/src/bkr/inttest/server/kickstarts/RedHatEnterpriseLinux7-scheduler-defaults.expected
@@ -332,7 +332,7 @@ fi
# fill the yum cache and redirect output to /dev/null
# This speeds up yum because of a bug where it will update stdout too often.
# http://lists.baseurl.org/pipermail/yum-devel/2011-December/008857.html
-$package_command check-update > /dev/null 2>&1 || true
+$package_command check-update -y > /dev/null 2>&1 || true
if command -v dnf >/dev/null ; then
package_command="dnf"
else
diff --git a/IntegrationTests/src/bkr/inttest/server/kickstarts/RedHatEnterpriseLinux7-scheduler-manual.expected b/IntegrationTests/src/bkr/inttest/server/kickstarts/RedHatEnterpriseLinux7-scheduler-manual.expected
index 90ba3e4..833b3ab 100644
--- a/IntegrationTests/src/bkr/inttest/server/kickstarts/RedHatEnterpriseLinux7-scheduler-manual.expected
+++ b/IntegrationTests/src/bkr/inttest/server/kickstarts/RedHatEnterpriseLinux7-scheduler-manual.expected
@@ -286,7 +286,7 @@ fi
# fill the yum cache and redirect output to /dev/null
# This speeds up yum because of a bug where it will update stdout too often.
# http://lists.baseurl.org/pipermail/yum-devel/2011-December/008857.html
-$package_command check-update > /dev/null 2>&1 || true
+$package_command check-update -y > /dev/null 2>&1 || true
if command -v dnf >/dev/null ; then
package_command="dnf"
else
diff --git a/IntegrationTests/src/bkr/inttest/server/kickstarts/RedHatEnterpriseLinuxAlternateArchitectures7-scheduler-defaults.expected b/IntegrationTests/src/bkr/inttest/server/kickstarts/RedHatEnterpriseLinuxAlternateArchitectures7-scheduler-defaults.expected
index b93c1b6..37d4276 100644
--- a/IntegrationTests/src/bkr/inttest/server/kickstarts/RedHatEnterpriseLinuxAlternateArchitectures7-scheduler-defaults.expected
+++ b/IntegrationTests/src/bkr/inttest/server/kickstarts/RedHatEnterpriseLinuxAlternateArchitectures7-scheduler-defaults.expected
@@ -332,7 +332,7 @@ fi
# fill the yum cache and redirect output to /dev/null
# This speeds up yum because of a bug where it will update stdout too often.
# http://lists.baseurl.org/pipermail/yum-devel/2011-December/008857.html
-$package_command check-update > /dev/null 2>&1 || true
+$package_command check-update -y > /dev/null 2>&1 || true
if command -v dnf >/dev/null ; then
package_command="dnf"
else
diff --git a/IntegrationTests/src/bkr/inttest/server/kickstarts/RedHatEnterpriseLinuxServer5-scheduler-defaults.expected b/IntegrationTests/src/bkr/inttest/server/kickstarts/RedHatEnterpriseLinuxServer5-scheduler-defaults.expected
index 8b104a1..864bee9 100644
--- a/IntegrationTests/src/bkr/inttest/server/kickstarts/RedHatEnterpriseLinuxServer5-scheduler-defaults.expected
+++ b/IntegrationTests/src/bkr/inttest/server/kickstarts/RedHatEnterpriseLinuxServer5-scheduler-defaults.expected
@@ -321,7 +321,7 @@ fi
# fill the yum cache and redirect output to /dev/null
# This speeds up yum because of a bug where it will update stdout too often.
# http://lists.baseurl.org/pipermail/yum-devel/2011-December/008857.html
-$package_command check-update > /dev/null 2>&1 || true
+$package_command check-update -y > /dev/null 2>&1 || true
if command -v dnf >/dev/null ; then
package_command="dnf"
else
diff --git a/LabController/setup.py b/LabController/setup.py
index 0b4572d..e5e25b3 100644
--- a/LabController/setup.py
+++ b/LabController/setup.py
@@ -49,7 +49,7 @@ else:
setup(
name='beaker-lab-controller',
- version='27.2',
+ version='27.3',
description='Daemons for controlling a Beaker lab',
author='Red Hat, Inc.',
author_email='beaker-devel@lists.fedorahosted.org',
diff --git a/Server/bkr/server/snippets/rhts_post b/Server/bkr/server/snippets/rhts_post
index b5c2714..1377ff5 100644
--- a/Server/bkr/server/snippets/rhts_post
+++ b/Server/bkr/server/snippets/rhts_post
@@ -126,7 +126,7 @@ fi
# fill the yum cache and redirect output to /dev/null
# This speeds up yum because of a bug where it will update stdout too often.
# http://lists.baseurl.org/pipermail/yum-devel/2011-December/008857.html
-$package_command check-update > /dev/null 2>&1 || true
+$package_command check-update -y > /dev/null 2>&1 || true
{% if harness == 'beah' %}
{% snippet 'beah' %}
{% else %}
diff --git a/Server/setup.py b/Server/setup.py
index 00b07cf..f5efec7 100644
--- a/Server/setup.py
+++ b/Server/setup.py
@@ -186,7 +186,7 @@ else:
setup(
name='beaker-server',
namespace_packages = ['bkr'],
- version='27.2',
+ version='27.3',
description='Beaker scheduler and web interface',
long_description=
'Beaker is a system for full stack software integration testing '
diff --git a/beaker.spec b/beaker.spec
index c268b5e..08a419c 100644
--- a/beaker.spec
+++ b/beaker.spec
@@ -15,10 +15,10 @@
# not representable in RPM. For example, a release candidate might be 0.15.0rc1
# but that is not usable for the RPM Version because it sorts higher than
# 0.15.0, so the RPM will have Version 0.15.0 and Release 0.rc1 in that case.
-%global upstream_version 27.2
+%global upstream_version 27.3
Name: beaker
-Version: 27.2
+Version: 27.3
Release: 1%{?dist}
Summary: Full-stack software and hardware integration testing system
Group: Applications/Internet
diff --git a/documentation/whats-new/release-27.rst b/documentation/whats-new/release-27.rst
index af4b736..3731325 100644
--- a/documentation/whats-new/release-27.rst
+++ b/documentation/whats-new/release-27.rst
@@ -217,3 +217,14 @@ Beaker 27.2
* | :issue:`1793655`: Beaker-client is now using `distribution/check-install` task
for all OS distributions. This is a replacement for `distribution/install`.
| (Contributed by Martin Styk)
+
+
+Beaker 27.3
+~~~~~~~~~~~
+* | :issue:`1814761`: Updated default values for kickstart. This change is
+ necessary to enable provision on Fedora 32+.
+ | (Contributed by Martin Styk)
+* | :issue:`1814784`: Improved stability in beaker-proxy. Now, WSGI layer
+ of beaker-proxy is capable of closing all sockets imminently after
+ request is finished.
+ | (Contributed by Martin Styk) \ No newline at end of file