summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmit Saha <asaha@redhat.com>2014-06-13 15:33:10 +1000
committerAmit Saha <asaha@redhat.com>2014-06-13 15:35:22 +1000
commited0fcc2ab00f245ce277fdb449b80a780e78b08c (patch)
tree3e1be9243f8295f4c426ae008ab730c55dedcc8b
parenteb0d7c7ff1e176d076cf1ac40b120e47e8b6d0c9 (diff)
Include remote_post before reporting postinstall_done
(The original patch introduced this in 1479a07) Bug: 1099231
-rw-r--r--Server/bkr/server/kickstarts/Fedora1
-rw-r--r--Server/bkr/server/kickstarts/RedHatEnterpriseLinux31
-rw-r--r--Server/bkr/server/kickstarts/RedHatEnterpriseLinux42
-rw-r--r--Server/bkr/server/kickstarts/RedHatEnterpriseLinux61
-rw-r--r--Server/bkr/server/kickstarts/RedHatEnterpriseLinux71
-rw-r--r--Server/bkr/server/kickstarts/RedHatEnterpriseLinuxClient51
-rw-r--r--Server/bkr/server/kickstarts/RedHatEnterpriseLinuxServer51
-rw-r--r--Server/bkr/server/kickstarts/RedHatStorage21
-rw-r--r--Server/bkr/server/snippets/rhts_post1
9 files changed, 2 insertions, 8 deletions
diff --git a/Server/bkr/server/kickstarts/Fedora b/Server/bkr/server/kickstarts/Fedora
index 9db599d..964a210 100644
--- a/Server/bkr/server/kickstarts/Fedora
+++ b/Server/bkr/server/kickstarts/Fedora
@@ -99,7 +99,6 @@ chrony
{% snippet 'rhts_post' %}
{% snippet 'Fedora_post' %}
{% snippet 'system_post' %}
-{% snippet 'remote_post' %}
%end
{{ ks_appends|join('\n') }}
diff --git a/Server/bkr/server/kickstarts/RedHatEnterpriseLinux3 b/Server/bkr/server/kickstarts/RedHatEnterpriseLinux3
index 6a26931..3070eb0 100644
--- a/Server/bkr/server/kickstarts/RedHatEnterpriseLinux3
+++ b/Server/bkr/server/kickstarts/RedHatEnterpriseLinux3
@@ -79,7 +79,6 @@ PATH=/usr/bin:$PATH
{% snippet 'rhts_post' %}
{% snippet 'RedHatEnterpriseLinux3_post' %}
{% snippet 'system_post' %}
-{% snippet 'remote_post' %}
) 2>&1 | /usr/bin/tee /dev/console
{{ ks_appends|join('\n') }}
diff --git a/Server/bkr/server/kickstarts/RedHatEnterpriseLinux4 b/Server/bkr/server/kickstarts/RedHatEnterpriseLinux4
index a5e5b0a..591c315 100644
--- a/Server/bkr/server/kickstarts/RedHatEnterpriseLinux4
+++ b/Server/bkr/server/kickstarts/RedHatEnterpriseLinux4
@@ -88,7 +88,7 @@ lvm2
{% snippet 'rhts_post' %}
{% snippet 'RedHatEnterpriseLinux4_post' %}
{% snippet 'system_post' %}
-{% snippet 'remote_post' %}
+
{{ ks_appends|join('\n') }}
{% snippet 'post_s390_reboot' %}
diff --git a/Server/bkr/server/kickstarts/RedHatEnterpriseLinux6 b/Server/bkr/server/kickstarts/RedHatEnterpriseLinux6
index e46fa4e..42eead1 100644
--- a/Server/bkr/server/kickstarts/RedHatEnterpriseLinux6
+++ b/Server/bkr/server/kickstarts/RedHatEnterpriseLinux6
@@ -90,7 +90,6 @@ unsupported_hardware
{% if recipe.systemtype == 'Virtual' %}
{% snippet 'virt_console_post' %}
{% endif %}
-{% snippet 'remote_post' %}
%end
{{ ks_appends|join('\n') }}
diff --git a/Server/bkr/server/kickstarts/RedHatEnterpriseLinux7 b/Server/bkr/server/kickstarts/RedHatEnterpriseLinux7
index 8024150..2a899bf 100644
--- a/Server/bkr/server/kickstarts/RedHatEnterpriseLinux7
+++ b/Server/bkr/server/kickstarts/RedHatEnterpriseLinux7
@@ -86,7 +86,6 @@ chrony
{% snippet 'rhts_post' %}
{% snippet 'RedHatEnterpriseLinux7_post' %}
{% snippet 'system_post' %}
-{% snippet 'remote_post' %}
%end
{{ ks_appends|join('\n') }}
diff --git a/Server/bkr/server/kickstarts/RedHatEnterpriseLinuxClient5 b/Server/bkr/server/kickstarts/RedHatEnterpriseLinuxClient5
index bf9bb67..2e545a1 100644
--- a/Server/bkr/server/kickstarts/RedHatEnterpriseLinuxClient5
+++ b/Server/bkr/server/kickstarts/RedHatEnterpriseLinuxClient5
@@ -106,7 +106,6 @@ xkeyboard-config
{% snippet 'rhts_post' %}
{% snippet 'RedHatEnterpriseLinuxClient5_post' %}
{% snippet 'system_post' %}
-{% snippet 'remote_post' %}
{{ ks_appends|join('\n') }}
{% snippet 'post_s390_reboot' %}
diff --git a/Server/bkr/server/kickstarts/RedHatEnterpriseLinuxServer5 b/Server/bkr/server/kickstarts/RedHatEnterpriseLinuxServer5
index f7b239d..0427517 100644
--- a/Server/bkr/server/kickstarts/RedHatEnterpriseLinuxServer5
+++ b/Server/bkr/server/kickstarts/RedHatEnterpriseLinuxServer5
@@ -105,7 +105,6 @@ xkeyboard-config
{% snippet 'rhts_post' %}
{% snippet 'RedHatEnterpriseLinuxServer5_post' %}
{% snippet 'system_post' %}
-{% snippet 'remote_post' %}
{{ ks_appends|join('\n') }}
{% snippet 'post_s390_reboot' %}
diff --git a/Server/bkr/server/kickstarts/RedHatStorage2 b/Server/bkr/server/kickstarts/RedHatStorage2
index fbd46fb..19e4e70 100644
--- a/Server/bkr/server/kickstarts/RedHatStorage2
+++ b/Server/bkr/server/kickstarts/RedHatStorage2
@@ -86,7 +86,6 @@ unsupported_hardware
{% snippet 'rhts_post' %}
{% snippet 'RedHatStorage2_post' %}
{% snippet 'system_post' %}
-{% snippet 'remote_post' %}
%end
{{ ks_appends|join('\n') }}
diff --git a/Server/bkr/server/snippets/rhts_post b/Server/bkr/server/snippets/rhts_post
index dc091f4..79f2b34 100644
--- a/Server/bkr/server/snippets/rhts_post
+++ b/Server/bkr/server/snippets/rhts_post
@@ -146,6 +146,7 @@ useradd --password '$6$oIW3o2Mr$XbWZKaM7nA.cQqudfDJScupXOia5h1u517t6Htx/Q/MgXm82
{% snippet 'mvebu' %}
{% endif %}
{% if recipe %}
+{% snippet 'remote_post' %}
# Check in with Beaker Server, record our postinstall time.
{% if distro is osmajor('RedHatEnterpriseLinux3', 'RedHatEnterpriseLinux4', 'RedHatEnterpriseLinuxServer5', 'RedHatEnterpriseLinuxServerGrid5', 'RedHatEnterpriseLinuxClient5') %}
wget -O - http://{{ lab_controller.fqdn }}:8000/postinstall_done/{{ recipe.id }}