summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Styk <mastyk@redhat.com>2020-02-27 16:28:01 +0100
committerMartin Styk <mastyk@redhat.com>2020-02-27 16:28:01 +0100
commit1123e259a525cc750d22caa31edd93f2c0302798 (patch)
treebdfab78d056bead1407792cd46db10c5e13d24da
parent02884bbf65b02f6e493795bfe57612ae6aadc497 (diff)
parent351146a129e271c7d799f6b1cb888ea51dacd4a8 (diff)
Merge branch 'release-27' into develop
-rw-r--r--Client/setup.py2
-rw-r--r--Client/src/bkr/client/__init__.py22
-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/__init__.py5
-rw-r--r--IntegrationTests/src/bkr/inttest/client/test_harness_test.py7
-rw-r--r--IntegrationTests/src/bkr/inttest/client/test_machine_test.py10
-rw-r--r--IntegrationTests/src/bkr/inttest/client/test_workflow.py2
-rw-r--r--IntegrationTests/src/bkr/inttest/client/test_workflow_simple.py26
-rw-r--r--IntegrationTests/src/bkr/inttest/server/kickstarts/Fedora18-scheduler-defaults.expected15
-rw-r--r--IntegrationTests/src/bkr/inttest/server/kickstarts/RedHatEnterpriseLinux3-scheduler-defaults.expected15
-rw-r--r--IntegrationTests/src/bkr/inttest/server/kickstarts/RedHatEnterpriseLinux4-scheduler-defaults.expected15
-rw-r--r--IntegrationTests/src/bkr/inttest/server/kickstarts/RedHatEnterpriseLinux6-scheduler-defaults-beaker-create-kickstart.expected15
-rw-r--r--IntegrationTests/src/bkr/inttest/server/kickstarts/RedHatEnterpriseLinux6-scheduler-defaults.expected15
-rw-r--r--IntegrationTests/src/bkr/inttest/server/kickstarts/RedHatEnterpriseLinux6-scheduler-guest.expected15
-rw-r--r--IntegrationTests/src/bkr/inttest/server/kickstarts/RedHatEnterpriseLinux7-scheduler-defaults.expected15
-rw-r--r--IntegrationTests/src/bkr/inttest/server/kickstarts/RedHatEnterpriseLinuxAlternateArchitectures7-scheduler-defaults.expected15
-rw-r--r--IntegrationTests/src/bkr/inttest/server/kickstarts/RedHatEnterpriseLinuxServer5-scheduler-defaults.expected15
-rw-r--r--IntegrationTests/src/bkr/inttest/server/test_kickstart.py254
-rw-r--r--IntegrationTests/src/bkr/inttest/server/tools/test_create_kickstart.py2
-rw-r--r--LabController/setup.py2
-rw-r--r--Server/setup.py2
-rw-r--r--beaker.spec4
-rw-r--r--documentation/whats-new/release-27.rst10
25 files changed, 162 insertions, 327 deletions
diff --git a/Client/setup.py b/Client/setup.py
index 9e0089d..dad2350 100644
--- a/Client/setup.py
+++ b/Client/setup.py
@@ -22,7 +22,7 @@ def bash_completion_dir():
setup(
name='beaker-client',
- version='27.1',
+ version='27.2',
description='Command-line client for interacting with Beaker',
author='Red Hat, Inc.',
author_email='beaker-devel@lists.fedorahosted.org',
diff --git a/Client/src/bkr/client/__init__.py b/Client/src/bkr/client/__init__.py
index 61fbee2..29efc5d 100644
--- a/Client/src/bkr/client/__init__.py
+++ b/Client/src/bkr/client/__init__.py
@@ -635,29 +635,9 @@ class BeakerWorkflow(BeakerCommand):
"""
Returns the name of the task which is injected at the start of the recipe.
Its job is to check for any problems in the installation.
- We have two implementations:
+ We have one implementation:
/distribution/check-install is used by default
- /distribution/install is used on RHEL <= 7 and Fedora <= 28
"""
- older_families = [
- 'RedHatEnterpriseLinux3',
- 'RedHatEnterpriseLinux4',
- 'RedHatEnterpriseLinuxServer5',
- 'RedHatEnterpriseLinuxServerGrid5',
- 'RedHatEnterpriseLinuxClient5',
- 'RedHatEnterpriseLinux6',
- 'RedHatEnterpriseLinux7',
- 'CentOS4',
- 'CentOS5',
- 'CentOS6',
- 'CentOS7',
- 'RedHatStorage2',
- 'RedHatStorageSoftwareAppliance3',
- 'RedHatGlusterStorage3',
- 'RHVH4'] + ['Fedora%d' % n for n in range(1, 29)]
- family = self.getFamily(*args, **kwargs)
- if family in older_families:
- return '/distribution/install'
return '/distribution/check-install'
getInstallTaskName = get_install_task_name
diff --git a/Common/bkr/common/__init__.py b/Common/bkr/common/__init__.py
index 293d659..9dd3237 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.1'
+__version__ = '27.2'
diff --git a/Common/setup.py b/Common/setup.py
index b73f193..3d02e18 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.1',
+ version='27.2',
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 5116a50..1793d6a 100644
--- a/IntegrationTests/setup.py
+++ b/IntegrationTests/setup.py
@@ -12,7 +12,7 @@ def get_compose_layout():
setup(
name='beaker-integration-tests',
- version='27.1',
+ version='27.2',
description='Integration tests for Beaker',
author='Red Hat, Inc.',
author_email='beaker-devel@lists.fedorahosted.org',
diff --git a/IntegrationTests/src/bkr/inttest/__init__.py b/IntegrationTests/src/bkr/inttest/__init__.py
index 5429378..07debbd 100644
--- a/IntegrationTests/src/bkr/inttest/__init__.py
+++ b/IntegrationTests/src/bkr/inttest/__init__.py
@@ -414,11 +414,6 @@ def setup_package():
if not LabController.query.count():
data_setup.create_labcontroller()
if not Task.query.count():
- data_setup.create_task(name=u'/distribution/install', requires=
- u'make gcc nfs-utils wget procmail redhat-lsb ntp '
- u'@development-tools @development-libs @development '
- u'@desktop-platform-devel @server-platform-devel '
- u'libxml2-python expect pyOpenSSL'.split())
data_setup.create_task(name=u'/distribution/check-install')
data_setup.create_task(name=u'/distribution/reservesys',
requires=u'emacs vim-enhanced unifdef sendmail'.split())
diff --git a/IntegrationTests/src/bkr/inttest/client/test_harness_test.py b/IntegrationTests/src/bkr/inttest/client/test_harness_test.py
index 7022720..2facf53 100644
--- a/IntegrationTests/src/bkr/inttest/client/test_harness_test.py
+++ b/IntegrationTests/src/bkr/inttest/client/test_harness_test.py
@@ -45,9 +45,7 @@ class HarnessTest(ClientTestCase):
# each recipe should contain only the install checking task
# and nothing more.
with session.begin():
- # This one will use /distribution/check-install
data_setup.create_distro_tree(osmajor=u'Fedorarawhide')
- # This one will use /distribution/install
data_setup.create_distro_tree(osmajor=u'RedHatEnterpriseLinux7')
out = run_client(['bkr', 'harness-test'])
self.assertIn("Submitted:", out)
@@ -56,12 +54,11 @@ class HarnessTest(ClientTestCase):
# There will be one recipe per OS major that exists in the database,
# which is potentially a large number left from earlier tests.
# What we care about is that every recipe must have one task,
- # either /distribution/check-install (default)
- # or /distribution/install (on known, older distros).
+ # /distribution/check-install
self.assertGreater(len(new_job.recipesets), 1)
for recipe in new_job.all_recipes:
self.assertEqual(len(recipe.tasks), 1)
if recipe.installation.osmajor == 'Fedorarawhide':
self.assertEqual(recipe.tasks[0].name, '/distribution/check-install')
if recipe.installation.osmajor == 'RedHatEnterpriseLinux7':
- self.assertEqual(recipe.tasks[0].name, '/distribution/install')
+ self.assertEqual(recipe.tasks[0].name, '/distribution/check-install')
diff --git a/IntegrationTests/src/bkr/inttest/client/test_machine_test.py b/IntegrationTests/src/bkr/inttest/client/test_machine_test.py
index 68298ba..6d03918 100644
--- a/IntegrationTests/src/bkr/inttest/client/test_machine_test.py
+++ b/IntegrationTests/src/bkr/inttest/client/test_machine_test.py
@@ -104,10 +104,8 @@ class MachineTestTest(ClientTestCase):
for recipeset in new_job.recipesets:
tasks = recipeset.recipes[0].tasks
self.assertEqual(len(tasks), 3)
- # First task will be /distribution/install or
- # /distribution/check-install depending on the family
- self.assertIn(tasks[0].name,
- ['/distribution/install', '/distribution/check-install'])
+ # First task will be /distribution/check-install
+ self.assertIn(tasks[0].name, '/distribution/check-install')
self.assertEqual(tasks[1].name, str(task.name))
self.assertEqual(tasks[2].name, u'/distribution/inventory')
@@ -116,9 +114,7 @@ class MachineTestTest(ClientTestCase):
# options) each recipe should contain only the install checking task
# and nothing more.
with session.begin():
- # This one will use /distribution/check-install
data_setup.create_distro_tree(osmajor=u'Fedorarawhide')
- # This one will use /distribution/install
data_setup.create_distro_tree(osmajor=u'RedHatEnterpriseLinux7')
out = run_client(['bkr', 'machine-test',
'--machine', self.system.fqdn,
@@ -135,4 +131,4 @@ class MachineTestTest(ClientTestCase):
rhel7_recipe = new_job.recipesets[1].recipes[0]
self.assertEqual(rhel7_recipe.installation.osmajor, u'RedHatEnterpriseLinux7')
self.assertEqual(len(rhel7_recipe.tasks), 1)
- self.assertEqual(rhel7_recipe.tasks[0].name, '/distribution/install')
+ self.assertEqual(rhel7_recipe.tasks[0].name, '/distribution/check-install')
diff --git a/IntegrationTests/src/bkr/inttest/client/test_workflow.py b/IntegrationTests/src/bkr/inttest/client/test_workflow.py
index e96caa9..114519d 100644
--- a/IntegrationTests/src/bkr/inttest/client/test_workflow.py
+++ b/IntegrationTests/src/bkr/inttest/client/test_workflow.py
@@ -41,7 +41,7 @@ class WorkflowTest(unittest.TestCase):
'<hostRequires/>'
'<repos/>'
'<partitions/>'
- '<task name="/distribution/install" role="STANDALONE">'
+ '<task name="/distribution/check-install" role="STANDALONE">'
'<params/>'
'</task>'
'<task name="/example" role="STANDALONE">'
diff --git a/IntegrationTests/src/bkr/inttest/client/test_workflow_simple.py b/IntegrationTests/src/bkr/inttest/client/test_workflow_simple.py
index 0aa1dca..1ceacb1 100644
--- a/IntegrationTests/src/bkr/inttest/client/test_workflow_simple.py
+++ b/IntegrationTests/src/bkr/inttest/client/test_workflow_simple.py
@@ -552,11 +552,7 @@ install
self.assertNotIn(ignored_task.name, out)
self.assertIn(included_task.name, out)
- # https://bugzilla.redhat.com/show_bug.cgi?id=1188539
- def test_uses_new_check_install_task_by_default(self):
- with session.begin():
- distro = data_setup.create_distro(osmajor=u'Fedora29')
- data_setup.create_distro_tree(distro=distro)
+ def _verify_check_install(self, distro):
out = run_client(['bkr', 'workflow-simple',
'--distro', distro.name,
'--task', self.task.name])
@@ -571,19 +567,15 @@ install
self.assertEqual(tasks[1].name, self.task.name)
# https://bugzilla.redhat.com/show_bug.cgi?id=1188539
+ def test_uses_new_check_install_task_by_default(self):
+ with session.begin():
+ distro = data_setup.create_distro(osmajor=u'Fedora29')
+ data_setup.create_distro_tree(distro=distro)
+ self._verify_check_install(distro=distro)
+
+ # https://bugzilla.redhat.com/show_bug.cgi?id=1806987
def test_uses_original_install_task_on_older_distros(self):
with session.begin():
distro = data_setup.create_distro(osmajor=u'RedHatEnterpriseLinux7')
data_setup.create_distro_tree(distro=distro)
- out = run_client(['bkr', 'workflow-simple',
- '--distro', distro.name,
- '--task', self.task.name])
- self.assertIn('Submitted:', out)
- m = re.search('J:(\d+)', out)
- job_id = m.group(1)
- with session.begin():
- job = Job.by_id(job_id)
- tasks = job.recipesets[0].recipes[0].tasks
- self.assertEqual(len(tasks), 2)
- self.assertEqual(tasks[0].name, '/distribution/install')
- self.assertEqual(tasks[1].name, self.task.name)
+ self._verify_check_install(distro=distro)
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 b51596f..ddd12a2 100644
--- a/IntegrationTests/src/bkr/inttest/server/kickstarts/Fedora18-scheduler-defaults.expected
+++ b/IntegrationTests/src/bkr/inttest/server/kickstarts/Fedora18-scheduler-defaults.expected
@@ -38,25 +38,10 @@ autopart
# no snippet data for system
%packages --ignoremissing
-@desktop-platform-devel
-@development
-@development-libs
-@development-tools
-@server-platform-devel
emacs
-expect
-gcc
-libxml2-python
-make
-nfs-utils
-ntp
-procmail
-pyOpenSSL
-redhat-lsb
sendmail
unifdef
vim-enhanced
-wget
# no snippet data for packages
chrony
%end
diff --git a/IntegrationTests/src/bkr/inttest/server/kickstarts/RedHatEnterpriseLinux3-scheduler-defaults.expected b/IntegrationTests/src/bkr/inttest/server/kickstarts/RedHatEnterpriseLinux3-scheduler-defaults.expected
index c31e800..1fc201e 100644
--- a/IntegrationTests/src/bkr/inttest/server/kickstarts/RedHatEnterpriseLinux3-scheduler-defaults.expected
+++ b/IntegrationTests/src/bkr/inttest/server/kickstarts/RedHatEnterpriseLinux3-scheduler-defaults.expected
@@ -31,25 +31,10 @@ autopart
# no snippet data for system
%packages --resolvedeps --ignoremissing
-@desktop-platform-devel
-@development
-@development-libs
-@development-tools
-@server-platform-devel
emacs
-expect
-gcc
-libxml2-python
-make
-nfs-utils
-ntp
-procmail
-pyOpenSSL
-redhat-lsb
sendmail
unifdef
vim-enhanced
-wget
# no snippet data for packages
diff --git a/IntegrationTests/src/bkr/inttest/server/kickstarts/RedHatEnterpriseLinux4-scheduler-defaults.expected b/IntegrationTests/src/bkr/inttest/server/kickstarts/RedHatEnterpriseLinux4-scheduler-defaults.expected
index 952c22a..aadb924 100644
--- a/IntegrationTests/src/bkr/inttest/server/kickstarts/RedHatEnterpriseLinux4-scheduler-defaults.expected
+++ b/IntegrationTests/src/bkr/inttest/server/kickstarts/RedHatEnterpriseLinux4-scheduler-defaults.expected
@@ -32,25 +32,10 @@ autopart
# no snippet data for system
%packages --resolvedeps --ignoremissing
-@desktop-platform-devel
-@development
-@development-libs
-@development-tools
-@server-platform-devel
emacs
-expect
-gcc
-libxml2-python
-make
-nfs-utils
-ntp
-procmail
-pyOpenSSL
-redhat-lsb
sendmail
unifdef
vim-enhanced
-wget
# no snippet data for packages
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 db16184..688569a 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
@@ -44,25 +44,10 @@ autopart
# no snippet data for system
%packages --ignoremissing
-@desktop-platform-devel
-@development
-@development-libs
-@development-tools
-@server-platform-devel
emacs
-expect
-gcc
-libxml2-python
-make
-nfs-utils
-ntp
-procmail
-pyOpenSSL
-redhat-lsb
sendmail
unifdef
vim-enhanced
-wget
# no snippet data for packages
%end
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 9514701..9e6fee2 100644
--- a/IntegrationTests/src/bkr/inttest/server/kickstarts/RedHatEnterpriseLinux6-scheduler-defaults.expected
+++ b/IntegrationTests/src/bkr/inttest/server/kickstarts/RedHatEnterpriseLinux6-scheduler-defaults.expected
@@ -44,25 +44,10 @@ autopart
# no snippet data for system
%packages --ignoremissing
-@desktop-platform-devel
-@development
-@development-libs
-@development-tools
-@server-platform-devel
emacs
-expect
-gcc
-libxml2-python
-make
-nfs-utils
-ntp
-procmail
-pyOpenSSL
-redhat-lsb
sendmail
unifdef
vim-enhanced
-wget
# no snippet data for packages
%end
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 c6009c8..98b911c 100644
--- a/IntegrationTests/src/bkr/inttest/server/kickstarts/RedHatEnterpriseLinux6-scheduler-guest.expected
+++ b/IntegrationTests/src/bkr/inttest/server/kickstarts/RedHatEnterpriseLinux6-scheduler-guest.expected
@@ -44,25 +44,10 @@ autopart
# no snippet data for system
%packages --ignoremissing
-@desktop-platform-devel
-@development
-@development-libs
-@development-tools
-@server-platform-devel
emacs
-expect
-gcc
-libxml2-python
-make
-nfs-utils
-ntp
-procmail
-pyOpenSSL
-redhat-lsb
sendmail
unifdef
vim-enhanced
-wget
# no snippet data for packages
%end
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 efa9c2c..8266b97 100644
--- a/IntegrationTests/src/bkr/inttest/server/kickstarts/RedHatEnterpriseLinux7-scheduler-defaults.expected
+++ b/IntegrationTests/src/bkr/inttest/server/kickstarts/RedHatEnterpriseLinux7-scheduler-defaults.expected
@@ -40,25 +40,10 @@ autopart
# no snippet data for system
%packages --ignoremissing
-@desktop-platform-devel
-@development
-@development-libs
-@development-tools
-@server-platform-devel
emacs
-expect
-gcc
-libxml2-python
-make
-nfs-utils
-ntp
-procmail
-pyOpenSSL
-redhat-lsb
sendmail
unifdef
vim-enhanced
-wget
# no snippet data for packages
chrony
%end
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 af28c62..b93c1b6 100644
--- a/IntegrationTests/src/bkr/inttest/server/kickstarts/RedHatEnterpriseLinuxAlternateArchitectures7-scheduler-defaults.expected
+++ b/IntegrationTests/src/bkr/inttest/server/kickstarts/RedHatEnterpriseLinuxAlternateArchitectures7-scheduler-defaults.expected
@@ -40,25 +40,10 @@ autopart
# no snippet data for system
%packages --ignoremissing
-@desktop-platform-devel
-@development
-@development-libs
-@development-tools
-@server-platform-devel
emacs
-expect
-gcc
-libxml2-python
-make
-nfs-utils
-ntp
-procmail
-pyOpenSSL
-redhat-lsb
sendmail
unifdef
vim-enhanced
-wget
# no snippet data for packages
chrony
%end
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 037685a..8b104a1 100644
--- a/IntegrationTests/src/bkr/inttest/server/kickstarts/RedHatEnterpriseLinuxServer5-scheduler-defaults.expected
+++ b/IntegrationTests/src/bkr/inttest/server/kickstarts/RedHatEnterpriseLinuxServer5-scheduler-defaults.expected
@@ -35,25 +35,10 @@ autopart
# no snippet data for system
%packages --resolvedeps --ignoremissing
-@desktop-platform-devel
-@development
-@development-libs
-@development-tools
-@server-platform-devel
emacs
-expect
-gcc
-libxml2-python
-make
-nfs-utils
-ntp
-procmail
-pyOpenSSL
-redhat-lsb
sendmail
unifdef
vim-enhanced
-wget
# no snippet data for packages
diff --git a/IntegrationTests/src/bkr/inttest/server/test_kickstart.py b/IntegrationTests/src/bkr/inttest/server/test_kickstart.py
index f00e1d7..6c27633 100644
--- a/IntegrationTests/src/bkr/inttest/server/test_kickstart.py
+++ b/IntegrationTests/src/bkr/inttest/server/test_kickstart.py
@@ -589,7 +589,7 @@ class KickstartTest(unittest.TestCase):
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
<task name="/distribution/reservesys" />
</recipe>
</recipeSet>
@@ -610,7 +610,7 @@ class KickstartTest(unittest.TestCase):
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
<task name="/distribution/reservesys" />
</recipe>
</recipeSet>
@@ -631,7 +631,7 @@ class KickstartTest(unittest.TestCase):
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
<task name="/distribution/reservesys" />
</recipe>
</recipeSet>
@@ -652,7 +652,7 @@ class KickstartTest(unittest.TestCase):
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
<task name="/distribution/reservesys" />
</recipe>
</recipeSet>
@@ -672,7 +672,7 @@ class KickstartTest(unittest.TestCase):
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
<task name="/distribution/reservesys" />
</recipe>
</recipeSet>
@@ -692,7 +692,7 @@ class KickstartTest(unittest.TestCase):
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
<task name="/distribution/reservesys" />
</recipe>
</recipeSet>
@@ -717,7 +717,7 @@ class KickstartTest(unittest.TestCase):
<repo name="custom"
url="http://repos.fedorapeople.org/repos/beaker/server/RedHatEnterpriseLinuxServer5/"/>
</repos>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
<task name="/distribution/reservesys" />
</recipe>
</recipeSet>
@@ -746,7 +746,7 @@ class KickstartTest(unittest.TestCase):
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
<task name="/distribution/reservesys" />
</recipe>
</recipeSet>
@@ -767,7 +767,7 @@ class KickstartTest(unittest.TestCase):
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
<task name="/distribution/reservesys" />
</recipe>
</recipeSet>
@@ -788,7 +788,7 @@ class KickstartTest(unittest.TestCase):
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
<task name="/distribution/reservesys" />
</recipe>
</recipeSet>
@@ -811,7 +811,7 @@ class KickstartTest(unittest.TestCase):
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
<task name="/distribution/reservesys" />
</recipe>
</recipeSet>
@@ -842,7 +842,7 @@ class KickstartTest(unittest.TestCase):
<partitions>
<partition fs="ext4" name="home" size="5" />
</partitions>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
<task name="/distribution/reservesys" />
</recipe>
</recipeSet>
@@ -874,7 +874,7 @@ class KickstartTest(unittest.TestCase):
<repo name="custom"
url="http://repos.fedorapeople.org/repos/beaker/server/RedHatEnterpriseLinux6/"/>
</repos>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
<task name="/distribution/reservesys" />
</recipe>
</recipeSet>
@@ -898,7 +898,7 @@ class KickstartTest(unittest.TestCase):
<distro_arch op="=" value="s390x" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
<task name="/distribution/reservesys" />
</recipe>
</recipeSet>
@@ -934,7 +934,7 @@ class KickstartTest(unittest.TestCase):
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
<task name="/distribution/reservesys" />
</recipe>
</recipeSet>
@@ -956,7 +956,7 @@ class KickstartTest(unittest.TestCase):
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
<task name="/distribution/reservesys" />
</guestrecipe>
<distroRequires>
@@ -964,7 +964,7 @@ class KickstartTest(unittest.TestCase):
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
<task name="/distribution/reservesys" />
</recipe>
</recipeSet>
@@ -986,7 +986,7 @@ class KickstartTest(unittest.TestCase):
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
<task name="/distribution/reservesys" />
</recipe>
</recipeSet>
@@ -1009,7 +1009,7 @@ class KickstartTest(unittest.TestCase):
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
<task name="/distribution/reservesys" />
</recipe>
</recipeSet>
@@ -1030,7 +1030,7 @@ class KickstartTest(unittest.TestCase):
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
<task name="/distribution/reservesys" />
</recipe>
</recipeSet>
@@ -1052,7 +1052,7 @@ class KickstartTest(unittest.TestCase):
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
<task name="/distribution/reservesys" />
</recipe>
</recipeSet>
@@ -1079,7 +1079,7 @@ class KickstartTest(unittest.TestCase):
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
<task name="/distribution/reservesys" />
</recipe>
</recipeSet>
@@ -1105,7 +1105,7 @@ class KickstartTest(unittest.TestCase):
<repo name="custom"
url="http://repos.fedorapeople.org/repos/beaker/server/RedHatEnterpriseLinux7/"/>
</repos>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
<task name="/distribution/reservesys" />
</recipe>
</recipeSet>
@@ -1128,7 +1128,7 @@ class KickstartTest(unittest.TestCase):
<distro_arch op="=" value="s390x" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
<task name="/distribution/reservesys" />
</recipe>
</recipeSet>
@@ -1161,7 +1161,7 @@ class KickstartTest(unittest.TestCase):
<distro_arch op="=" value="s390x" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
<task name="/distribution/reservesys" />
</recipe>
</recipeSet>
@@ -1183,7 +1183,7 @@ class KickstartTest(unittest.TestCase):
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
<task name="/distribution/reservesys" />
</recipe>
</recipeSet>
@@ -1204,7 +1204,7 @@ class KickstartTest(unittest.TestCase):
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
<task name="/distribution/reservesys" />
</recipe>
</recipeSet>
@@ -1231,7 +1231,7 @@ class KickstartTest(unittest.TestCase):
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
<task name="/distribution/reservesys" />
</recipe>
</recipeSet>
@@ -1262,7 +1262,7 @@ class KickstartTest(unittest.TestCase):
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
<task name="/distribution/reservesys" />
</recipe>
</recipeSet>
@@ -1289,7 +1289,7 @@ class KickstartTest(unittest.TestCase):
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
<task name="/distribution/reservesys" />
</recipe>
</recipeSet>
@@ -1309,7 +1309,7 @@ class KickstartTest(unittest.TestCase):
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
<task name="/distribution/reservesys" />
</recipe>
</recipeSet>
@@ -1333,7 +1333,7 @@ class KickstartTest(unittest.TestCase):
<repo name="custom"
url="http://repos.fedorapeople.org/repos/beaker/server/Fedora18/"/>
</repos>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
<task name="/distribution/reservesys" />
</recipe>
</recipeSet>
@@ -1356,7 +1356,7 @@ class KickstartTest(unittest.TestCase):
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
<task name="/distribution/reservesys" />
</recipe>
</recipeSet>
@@ -1377,7 +1377,7 @@ class KickstartTest(unittest.TestCase):
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
<task name="/distribution/reservesys" />
</recipe>
</recipeSet>
@@ -1398,7 +1398,7 @@ class KickstartTest(unittest.TestCase):
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
<task name="/distribution/reservesys" />
</recipe>
</recipeSet>
@@ -1448,13 +1448,13 @@ class KickstartTest(unittest.TestCase):
<packages>
<package name="python-glanceclient" />
</packages>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
<task name="/distribution/reservesys" />
</recipe>
</recipeSet>
</job>
''', self.system)
- self.assertIn('%packages --ignoremissing\npython-glanceclient\n@desktop-platform-devel',
+ self.assertIn('%packages --ignoremissing\npython-glanceclient\nemacs\n',
recipe.installation.rendered_kickstart.kickstart)
self.assertIn('python-glanceclient',
recipe.installation.rendered_kickstart.kickstart)
@@ -1473,7 +1473,7 @@ class KickstartTest(unittest.TestCase):
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
<task name="/distribution/reservesys" />
</recipe>
</recipeSet>
@@ -1498,7 +1498,7 @@ class KickstartTest(unittest.TestCase):
<package name="python-glanceclient" />
<package name="-mariadb-galera-server" />
</packages>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
<task name="/distribution/reservesys" />
</recipe>
</recipeSet>
@@ -1552,7 +1552,7 @@ python-glanceclient
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
<task name="/distribution/reservesys" />
</recipe>
</recipeSet>
@@ -1588,7 +1588,7 @@ python-glanceclient
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
<task name="/distribution/reservesys" />
</recipe>
</recipeSet>
@@ -1616,7 +1616,7 @@ python-glanceclient
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
<task name="/distribution/reservesys" />
</recipe>
</recipeSet>
@@ -1643,7 +1643,7 @@ python-glanceclient
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
<task name="/distribution/reservesys" />
</recipe>
</recipeSet>
@@ -1671,7 +1671,7 @@ python-glanceclient
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
<task name="/distribution/reservesys" />
</recipe>
</recipeSet>
@@ -1697,7 +1697,7 @@ python-glanceclient
<distro_arch op="=" value="ppc64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
<task name="/distribution/reservesys" />
</recipe>
</recipeSet>
@@ -1743,7 +1743,7 @@ python-glanceclient
<distro_arch op="=" value="ppc64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
</recipe>
</recipeSet>
</job>
@@ -1766,7 +1766,7 @@ python-glanceclient
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
<task name="/distribution/reservesys" />
</recipe>
</recipeSet>
@@ -1789,7 +1789,7 @@ python-glanceclient
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
<task name="/distribution/reservesys" />
</recipe>
</recipeSet>
@@ -1814,7 +1814,7 @@ python-glanceclient
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
<task name="/distribution/reservesys" />
</recipe>
</recipeSet>
@@ -1839,7 +1839,7 @@ python-glanceclient
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
<task name="/distribution/reservesys" />
</recipe>
</recipeSet>
@@ -1864,7 +1864,7 @@ python-glanceclient
<partitions>
<partition type="lvm" fs="btrfs" name="butter" size="25" />
</partitions>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
<task name="/distribution/reservesys" />
</recipe>
</recipeSet>
@@ -1901,7 +1901,7 @@ logvol /butter --name=butter --vgname=TestVolume001 --size=25600 --fstype btrfs
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
<task name="/distribution/reservesys" />
</recipe>
</recipeSet>
@@ -1936,7 +1936,7 @@ chmod go-w /root /root/.ssh /root/.ssh/authorized_keys
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
<task name="/distribution/reservesys" />
</recipe>
</recipeSet>
@@ -1969,7 +1969,7 @@ chmod go-w /root /root/.ssh /root/.ssh/authorized_keys
<distro_arch op="=" value="s390x" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
<task name="/distribution/reservesys" />
</recipe>
</recipeSet>
@@ -1998,7 +1998,7 @@ chmod go-w /root /root/.ssh /root/.ssh/authorized_keys
echo Hello World
%end</ks_append>
</ks_appends>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
<task name="/distribution/reservesys" />
</recipe>
</recipeSet>
@@ -2036,7 +2036,7 @@ bootloader --location=mbr
mysillypackage
%end
]]></kickstart>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
<task name="/distribution/reservesys" />
</recipe>
</recipeSet>
@@ -2097,7 +2097,7 @@ bootloader --location=mbr
mysillypackage
%end
]]></kickstart>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
<task name="/distribution/reservesys" />
</recipe>
</recipeSet>
@@ -2217,7 +2217,7 @@ bootloader --location=mbr
mysillypackage
%end
]]></kickstart>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
<task name="/distribution/reservesys" />
</recipe>
</recipeSet>
@@ -2276,7 +2276,7 @@ install
mysillypackage
%end
]]></kickstart>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
<task name="/distribution/reservesys" />
</recipe>
</recipeSet>
@@ -2318,7 +2318,7 @@ install
# tree url is {{ distro_tree.url_in_lab(lab_controller, required=True) }}
# recipe id is {{ recipe.id }}
]]></kickstart>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
</recipe>
</recipeSet>
</job>
@@ -2485,7 +2485,7 @@ install
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
<task name="/distribution/reservesys" />
</recipe>
</recipeSet>
@@ -2510,7 +2510,7 @@ install
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
<task name="/distribution/reservesys" />
</recipe>
</recipeSet>
@@ -2535,7 +2535,7 @@ install
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
<task name="/distribution/reservesys" />
</recipe>
</recipeSet>
@@ -2560,7 +2560,7 @@ install
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
<task name="/distribution/reservesys" />
</recipe>
</recipeSet>
@@ -2587,7 +2587,7 @@ install
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
<task name="/distribution/reservesys" />
</recipe>
</recipeSet>
@@ -2620,7 +2620,7 @@ install
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
<task name="/distribution/reservesys" />
</recipe>
</recipeSet>
@@ -2647,7 +2647,7 @@ install
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
<task name="/distribution/reservesys" />
</recipe>
</recipeSet>
@@ -2674,7 +2674,7 @@ install
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
</recipe>
</recipeSet>
</job>
@@ -2694,7 +2694,7 @@ install
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
</recipe>
</recipeSet>
</job>
@@ -2727,7 +2727,7 @@ sed -i -e '/\[updates\]/,/^\[/s/enabled=1/enabled=0/' /etc/yum.repos.d/fedora-up
<repos>
<repo name="custom" url="http://example.com/$releasever/"/>
</repos>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
</recipe>
</recipeSet>
</job>
@@ -2748,7 +2748,7 @@ sed -i -e '/\[updates\]/,/^\[/s/enabled=1/enabled=0/' /etc/yum.repos.d/fedora-up
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
<task name="/distribution/reservesys" />
</recipe>
</recipeSet>
@@ -2773,7 +2773,7 @@ sed -i -e '/\[updates\]/,/^\[/s/enabled=1/enabled=0/' /etc/yum.repos.d/fedora-up
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
<task name="/distribution/reservesys" />
</recipe>
</recipeSet>
@@ -2809,7 +2809,7 @@ sed -i -e '/\[updates\]/,/^\[/s/enabled=1/enabled=0/' /etc/yum.repos.d/fedora-up
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
<task name="/distribution/reservesys" />
</recipe>
</recipeSet>
@@ -2861,7 +2861,7 @@ sed -i -e '/\[updates\]/,/^\[/s/enabled=1/enabled=0/' /etc/yum.repos.d/fedora-up
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
</recipe>
</recipeSet>
</job>
@@ -2884,7 +2884,7 @@ sed -i -e '/\[updates\]/,/^\[/s/enabled=1/enabled=0/' /etc/yum.repos.d/fedora-up
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
<task name="/distribution/reservesys" />
</recipe>
</recipeSet>
@@ -2911,7 +2911,7 @@ sed -i -e '/\[updates\]/,/^\[/s/enabled=1/enabled=0/' /etc/yum.repos.d/fedora-up
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
</recipe>
</recipeSet>
</job>
@@ -2938,7 +2938,7 @@ part swap --recommended
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
</recipe>
</recipeSet>
</job>
@@ -2963,7 +2963,7 @@ part swap --recommended
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
<task name="/distribution/reservesys" />
</recipe>
</recipeSet>
@@ -2987,7 +2987,7 @@ part swap --recommended
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
</recipe>
</recipeSet>
</job>
@@ -3012,7 +3012,7 @@ network --bootproto=static --device=66:77:88:99:aa:bb --ip=192.168.100.1 --netma
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
</recipe>
</recipeSet>
</job>
@@ -3038,7 +3038,7 @@ network --bootproto=dhcp --device=66:77:88:99:aa:bb
<distro_arch op="=" value="armhfp" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
</recipe>
</recipeSet>
</job>
@@ -3061,7 +3061,7 @@ network --bootproto=dhcp --device=66:77:88:99:aa:bb
<distro_arch op="=" value="armhfp" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
</recipe>
</recipeSet>
</job>
@@ -3087,7 +3087,7 @@ network --bootproto=dhcp --device=66:77:88:99:aa:bb
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
</recipe>
</recipeSet>
</job>
@@ -3141,7 +3141,7 @@ network --bootproto=dhcp --device=66:77:88:99:aa:bb
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
</recipe>
</recipeSet>
</job>
@@ -3196,7 +3196,7 @@ httpd
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
</recipe>
</recipeSet>
</job>
@@ -3223,7 +3223,7 @@ done
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
</recipe>
</recipeSet>
</job>
@@ -3249,7 +3249,7 @@ done
<distro_arch op="=" value="ia64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
</recipe>
</recipeSet>
</job>''')
@@ -3276,7 +3276,7 @@ done
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
</recipe>
</recipeSet>
</job>
@@ -3300,7 +3300,7 @@ done
<partition fs="btrfs" name="mnt/testarea1" size="10" type="part"/>
<partition fs="btrfs" name="mnt/testarea2" size="10" type="part"/>
</partitions>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
<task name="/distribution/reservesys" />
</recipe>
</recipeSet>
@@ -3343,7 +3343,7 @@ btrfs /mnt/testarea2 --label=mnt_testarea2 btrfs.mnt_testarea2
<partition fs="btrfs" name="mnt/testarea1" size="10" type="part"/>
<partition fs="btrfs" name="mnt/testarea2" size="10" type="part"/>
</partitions>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
<task name="/distribution/reservesys" />
</recipe>
</recipeSet>
@@ -3387,7 +3387,7 @@ part /mnt/testarea2 --size=10240 --fstype btrfs
<partitions>
<partition fs="ext4" name="mnt" size="10" />
</partitions>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
</recipe>
</recipeSet>
</job>
@@ -3410,7 +3410,7 @@ part /mnt/testarea2 --size=10240 --fstype btrfs
<partitions>
<partition fs="ext4" name="mnt" size="10" />
</partitions>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
</recipe>
</recipeSet>
</job>
@@ -3440,7 +3440,7 @@ part /mnt/testarea2 --size=10240 --fstype btrfs
<partitions>
<partition fs="ext4" name="mnt" size="10" />
</partitions>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
</recipe>
</recipeSet>
</job>
@@ -3465,7 +3465,7 @@ part /mnt/testarea2 --size=10240 --fstype btrfs
<partitions>
<partition fs="ext4" name="mnt" size="10" />
</partitions>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
</recipe>
</recipeSet>
</job>
@@ -3487,7 +3487,7 @@ part /mnt/testarea2 --size=10240 --fstype btrfs
<partitions>
<partition fs="ext4" name="mnt" size="10" />
</partitions>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
</recipe>
</recipeSet>
</job>
@@ -3513,7 +3513,7 @@ part /mnt/testarea2 --size=10240 --fstype btrfs
<partitions>
<partition fs="ext4" name="mnt" size="10" />
</partitions>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
</recipe>
</recipeSet>
</job>
@@ -3536,7 +3536,7 @@ part /boot --recommended --asprimary
</distroRequires>
<hostRequires/>
<partitions/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
</recipe>
</recipeSet>
</job>
@@ -3564,7 +3564,7 @@ part /boot --recommended --asprimary --fstype ext4 --ondisk=vdb
<partitions>
<partition fs="ext4" name="mnt" size="10" />
</partitions>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
</recipe>
</recipeSet>
</job>
@@ -3586,7 +3586,7 @@ part /boot --recommended --asprimary --fstype ext4 --ondisk=vdb
<partitions>
<partition fs="ext4" name="mnt" size="10" />
</partitions>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
</recipe>
</recipeSet>
</job>
@@ -3610,7 +3610,7 @@ part /boot --recommended --asprimary --fstype ext4 --ondisk=vdb
<distro_arch op="=" value="ppc64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
</recipe>
</recipeSet>
</job>
@@ -3639,7 +3639,7 @@ part /boot --recommended --asprimary --fstype ext4 --ondisk=vdb
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
</recipe>
</recipeSet>
</job>
@@ -3657,7 +3657,7 @@ part /boot --recommended --asprimary --fstype ext4 --ondisk=vdb
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
</recipe>
</recipeSet>
</job>
@@ -3675,7 +3675,7 @@ part /boot --recommended --asprimary --fstype ext4 --ondisk=vdb
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
</recipe>
</recipeSet>
</job>
@@ -3692,7 +3692,7 @@ part /boot --recommended --asprimary --fstype ext4 --ondisk=vdb
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
</recipe>
</recipeSet>
</job>
@@ -3710,7 +3710,7 @@ part /boot --recommended --asprimary --fstype ext4 --ondisk=vdb
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
</recipe>
</recipeSet>
</job>
@@ -3731,7 +3731,7 @@ part /boot --recommended --asprimary --fstype ext4 --ondisk=vdb
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
</recipe>
</recipeSet>
</job>
@@ -3752,7 +3752,7 @@ part /boot --recommended --asprimary --fstype ext4 --ondisk=vdb
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
<task name="/distribution/reservesys" />
</recipe>
</recipeSet>
@@ -3776,14 +3776,14 @@ part /boot --recommended --asprimary --fstype ext4 --ondisk=vdb
<distro_arch op="=" value="ia64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
</guestrecipe>
<distroRequires>
<distro_name op="=" value="RHEL5-Server-U8" />
<distro_arch op="=" value="ia64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
</recipe>
</recipeSet>
</job>''')
@@ -3804,7 +3804,7 @@ part /boot --recommended --asprimary --fstype ext4 --ondisk=vdb
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
</recipe>
</recipeSet>
</job>''')
@@ -3823,7 +3823,7 @@ part /boot --recommended --asprimary --fstype ext4 --ondisk=vdb
<distro_arch op="=" value="ia64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
</recipe>
</recipeSet>
</job>''')
@@ -3845,7 +3845,7 @@ part /boot --recommended --asprimary --fstype ext4 --ondisk=vdb
<partitions>
<partition fs="ext4" name="mnt" size="10" />
</partitions>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
</recipe>
</recipeSet>
</job>
@@ -3865,7 +3865,7 @@ part /boot --recommended --asprimary --fstype ext4 --ondisk=vdb
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
</recipe>
</recipeSet>
</job>
@@ -3928,13 +3928,13 @@ part /boot --recommended --asprimary --fstype ext4 --ondisk=vdb
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
</guestrecipe>
<distroRequires>
<distro_name op="=" value="RHEL-6.2" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
</recipe>
</recipeSet>
</job>''')
@@ -3953,7 +3953,7 @@ part /boot --recommended --asprimary --fstype ext4 --ondisk=vdb
<distro_name op="=" value="Fedora-18" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
</recipe>
</recipeSet>
</job>''', virt=True)
@@ -3976,13 +3976,13 @@ part /boot --recommended --asprimary --fstype ext4 --ondisk=vdb
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
</guestrecipe>
<distroRequires>
<distro_name op="=" value="RHEL-6.2" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
</recipe>
</recipeSet>
</job>''')
@@ -4004,7 +4004,7 @@ part /boot --recommended --asprimary --fstype ext4 --ondisk=vdb
<distro_name op="=" value="Fedora-18" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
</recipe>
</recipeSet>
</job>''', virt=True)
@@ -4025,7 +4025,7 @@ part /boot --recommended --asprimary --fstype ext4 --ondisk=vdb
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
</recipe>
</recipeSet>
</job>
@@ -4045,7 +4045,7 @@ part /boot --recommended --asprimary --fstype ext4 --ondisk=vdb
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
</recipe>
</recipeSet>
</job>
@@ -4088,7 +4088,7 @@ part /boot --recommended --asprimary --fstype ext4 --ondisk=vdb
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
</recipe>
</recipeSet>
</job>''')
@@ -4107,7 +4107,7 @@ part /boot --recommended --asprimary --fstype ext4 --ondisk=vdb
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
</recipe>
</recipeSet>
</job>''')
@@ -4126,7 +4126,7 @@ part /boot --recommended --asprimary --fstype ext4 --ondisk=vdb
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
</recipe>
</recipeSet>
</job>''')
@@ -4146,7 +4146,7 @@ part /boot --recommended --asprimary --fstype ext4 --ondisk=vdb
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
</recipe>
</recipeSet>
</job>
@@ -4195,7 +4195,7 @@ part raid.03 --size=20480 --ondisk=sdc
volgroup bootvg --pesize=32768 pv.01
</ks_append>
</ks_appends>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
<task name="/distribution/reservesys" />
</recipe>
</recipeSet>
@@ -4224,7 +4224,7 @@ volgroup bootvg --pesize=32768 pv.01
<distro_arch op="=" value="x86_64" />
</distroRequires>
<hostRequires/>
- <task name="/distribution/install" />
+ <task name="/distribution/check-install" />
</recipe>
</recipeSet>
</job>
diff --git a/IntegrationTests/src/bkr/inttest/server/tools/test_create_kickstart.py b/IntegrationTests/src/bkr/inttest/server/tools/test_create_kickstart.py
index e5d36e3..1a447a4 100644
--- a/IntegrationTests/src/bkr/inttest/server/tools/test_create_kickstart.py
+++ b/IntegrationTests/src/bkr/inttest/server/tools/test_create_kickstart.py
@@ -36,7 +36,7 @@ class CreateKickstartTest(DatabaseTestCase):
def _create_recipe(self, system=None):
with session.begin():
- install_task = Task.by_name(u'/distribution/install')
+ install_task = Task.by_name(u'/distribution/check-install')
reserve_task = Task.by_name(u'/distribution/reservesys')
lc = create_lab_controller()
rhel62_server_x86_64 = create_rhel62_server_x86_64(lab_controller=lc)
diff --git a/LabController/setup.py b/LabController/setup.py
index fc3e670..0b4572d 100644
--- a/LabController/setup.py
+++ b/LabController/setup.py
@@ -49,7 +49,7 @@ else:
setup(
name='beaker-lab-controller',
- version='27.1',
+ version='27.2',
description='Daemons for controlling a Beaker lab',
author='Red Hat, Inc.',
author_email='beaker-devel@lists.fedorahosted.org',
diff --git a/Server/setup.py b/Server/setup.py
index 5010e7a..00b07cf 100644
--- a/Server/setup.py
+++ b/Server/setup.py
@@ -186,7 +186,7 @@ else:
setup(
name='beaker-server',
namespace_packages = ['bkr'],
- version='27.1',
+ version='27.2',
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 2385715..245571b 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.1
+%global upstream_version 27.2
Name: beaker
-Version: 27.1
+Version: 27.2
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 98a4afc..af4b736 100644
--- a/documentation/whats-new/release-27.rst
+++ b/documentation/whats-new/release-27.rst
@@ -207,3 +207,13 @@ Beaker 27.1
| (Contributed by Martin Styk)
* | :issue:`1778643`: Improved kernel panic detection.
| (Contributed by Renan Rodrigo Barbosa)
+
+
+Beaker 27.2
+~~~~~~~~~~~
+* | :issue:`1807755`: Added support to remove OpenStack Keystone Trust even
+ when OpenStack integration is disabled.
+ | (Contributed by Martin Styk)
+* | :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)