Skip to content

[release-4.18] OCPBUGS-47463: Raise the default greenboot timeout to 600s #4341

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Dec 23, 2024
Merged

[release-4.18] OCPBUGS-47463: Raise the default greenboot timeout to 600s #4341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d7da455
Raise the base greenboot timeout to 600s
ggiguash Dec 19, 2024
5eaf83a
Remove MICROSHIFT_WAIT_TIMEOUT_SEC setting from ostree tests
ggiguash Dec 19, 2024
27213bd
Remove MICROSHIFT_WAIT_TIMEOUT_SEC setting from kickstart
ggiguash Dec 19, 2024
cc3c9e7
Remove MICROSHIFT_WAIT_TIMEOUT_SEC setting from bootc tests
ggiguash Dec 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docs/contributor/greenboot.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ boot_indeterminate=0
boot_counter=2
...
...
Waiting 300s for MicroShift service to be active and not failed
Waiting 600s for MicroShift service to be active and not failed
FAILURE
...
...
Expand Down Expand Up @@ -181,7 +181,7 @@ Running Required Health Check Scripts...
STARTED
...
...
Waiting 300s for 1 pod(s) from the 'openshift-ingress' namespace to be in 'Ready' state
Waiting 600s for 1 pod(s) from the 'openshift-ingress' namespace to be in 'Ready' state
FAILURE
...
...
Expand Down
4 changes: 2 additions & 2 deletions packaging/greenboot/functions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,10 @@ function get_wait_timeout() {
[ -f "${conf_file}" ] && source ${conf_file}

# Read and verify the wait timeout value, allowing for the [60..9999] range
local base_timeout=${MICROSHIFT_WAIT_TIMEOUT_SEC:-300}
local base_timeout=${MICROSHIFT_WAIT_TIMEOUT_SEC:-600}
local reSecs='^[1-9]{1}[0-9]{0,3}$'
if [[ ! ${base_timeout} =~ ${reSecs} ]] ; then
base_timeout=300
base_timeout=600
>&2 echo "Could not parse MICROSHIFT_WAIT_TIMEOUT_SEC value '${MICROSHIFT_WAIT_TIMEOUT_SEC}': using '${base_timeout}' instead"
fi
if [[ ${base_timeout} -lt 60 ]] ; then
Expand Down
5 changes: 0 additions & 5 deletions test/image-blueprints-bootc/layer1-base/group2/rhel94-bootc-crel-optionals.containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,6 @@ RUN dnf repoinfo --enabled && \
rm -vf /etc/yum.repos.d/microshift-*.repo && \
dnf clean all

# Extend Greenboot wait timeout to 10m for MicroShift to be ready.
# Greenboot configuration must come after RPM install to avoid
# /etc/greenboot/greenboot.conf overwrite by the package update.
RUN printf "\nMICROSHIFT_WAIT_TIMEOUT_SEC=600\n" >> /etc/greenboot/greenboot.conf

# Configure firewall
RUN firewall-offline-cmd --zone=public --add-port=22/tcp && \
firewall-offline-cmd --zone=trusted --add-source=10.42.0.0/16 && \
Expand Down
5 changes: 0 additions & 5 deletions test/image-blueprints-bootc/layer1-base/group2/rhel94-bootc-crel.containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,6 @@ RUN dnf repoinfo --enabled && \
rm -vf /etc/yum.repos.d/microshift-*.repo && \
dnf clean all

# Extend Greenboot wait timeout to 10m for MicroShift to be ready.
# Greenboot configuration must come after RPM install to avoid
# /etc/greenboot/greenboot.conf overwrite by the package update.
RUN printf "\nMICROSHIFT_WAIT_TIMEOUT_SEC=600\n" >> /etc/greenboot/greenboot.conf

# Configure firewall
RUN firewall-offline-cmd --zone=public --add-port=22/tcp && \
firewall-offline-cmd --zone=trusted --add-source=10.42.0.0/16 && \
Expand Down
5 changes: 0 additions & 5 deletions test/image-blueprints-bootc/layer1-base/group2/rhel94-bootc-prel.containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,6 @@ RUN dnf repoinfo --enabled && \
rm -vf /etc/yum.repos.d/microshift-*.repo && \
dnf clean all

# Extend Greenboot wait timeout to 10m for MicroShift to be ready.
# Greenboot configuration must come after RPM install to avoid
# /etc/greenboot/greenboot.conf overwrite by the package update.
RUN printf "\nMICROSHIFT_WAIT_TIMEOUT_SEC=600\n" >> /etc/greenboot/greenboot.conf

# Configure firewall
RUN firewall-offline-cmd --zone=public --add-port=22/tcp && \
firewall-offline-cmd --zone=trusted --add-source=10.42.0.0/16 && \
Expand Down
5 changes: 0 additions & 5 deletions test/image-blueprints-bootc/layer2-source/group1/cos9-bootc-source.containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,6 @@ RUN dnf repoinfo --enabled && \
rm -rvf $USHIFT_RPM_REPO_PATH && \
dnf clean all

# Extend Greenboot wait timeout to 10m for MicroShift to be ready.
# Greenboot configuration must come after RPM install to avoid
# /etc/greenboot/greenboot.conf overwrite by the package update.
RUN printf "\nMICROSHIFT_WAIT_TIMEOUT_SEC=600\n" >> /etc/greenboot/greenboot.conf

# Configure firewall
RUN firewall-offline-cmd --zone=public --add-port=22/tcp && \
firewall-offline-cmd --zone=trusted --add-source=10.42.0.0/16 && \
Expand Down
5 changes: 0 additions & 5 deletions test/image-blueprints-bootc/layer2-source/group1/rhel94-bootc-source-base.containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,6 @@ RUN dnf repoinfo --enabled && \
rm -rvf $USHIFT_RPM_REPO_PATH && \
dnf clean all

# Extend Greenboot wait timeout to 10m for MicroShift to be ready.
# Greenboot configuration must come after RPM install to avoid
# /etc/greenboot/greenboot.conf overwrite by the package update.
RUN printf "\nMICROSHIFT_WAIT_TIMEOUT_SEC=600\n" >> /etc/greenboot/greenboot.conf

# Configure firewall
RUN firewall-offline-cmd --zone=public --add-port=22/tcp && \
firewall-offline-cmd --zone=trusted --add-source=10.42.0.0/16 && \
Expand Down
5 changes: 0 additions & 5 deletions test/image-blueprints-bootc/layer2-source/group1/rhel94-bootc-source.containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,6 @@ RUN dnf repoinfo --enabled && \
rm -rvf $USHIFT_RPM_REPO_PATH && \
dnf clean all

# Extend Greenboot wait timeout to 10m for MicroShift to be ready.
# Greenboot configuration must come after RPM install to avoid
# /etc/greenboot/greenboot.conf overwrite by the package update.
RUN printf "\nMICROSHIFT_WAIT_TIMEOUT_SEC=600\n" >> /etc/greenboot/greenboot.conf

# Configure firewall
RUN firewall-offline-cmd --zone=public --add-port=22/tcp && \
firewall-offline-cmd --zone=trusted --add-source=10.42.0.0/16 && \
Expand Down
5 changes: 0 additions & 5 deletions ...bootc/layer2-source/group2/rhel94-bootc-source-ostree-parent-previous-minor.containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,6 @@ RUN dnf repoinfo --enabled && \
rm -rvf $USHIFT_RPM_REPO_PATH && \
dnf clean all

# Extend Greenboot wait timeout to 10m for MicroShift to be ready.
# Greenboot configuration must come after RPM install to avoid
# /etc/greenboot/greenboot.conf overwrite by the package update.
RUN printf "\nMICROSHIFT_WAIT_TIMEOUT_SEC=600\n" >> /etc/greenboot/greenboot.conf

# Configure firewall
RUN firewall-offline-cmd --zone=public --add-port=22/tcp && \
firewall-offline-cmd --zone=trusted --add-source=10.42.0.0/16 && \
Expand Down
5 changes: 0 additions & 5 deletions ...prints-bootc/layer2-source/group2/rhel94-bootc-source-ostree-parent-yminus2.containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,6 @@ RUN dnf repoinfo --enabled && \
rm -rvf $USHIFT_RPM_REPO_PATH && \
dnf clean all

# Extend Greenboot wait timeout to 10m for MicroShift to be ready.
# Greenboot configuration must come after RPM install to avoid
# /etc/greenboot/greenboot.conf overwrite by the package update.
RUN printf "\nMICROSHIFT_WAIT_TIMEOUT_SEC=600\n" >> /etc/greenboot/greenboot.conf

# Configure firewall
RUN firewall-offline-cmd --zone=public --add-port=22/tcp && \
firewall-offline-cmd --zone=trusted --add-source=10.42.0.0/16 && \
Expand Down
10 changes: 0 additions & 10 deletions test/image-blueprints/layer1-base/group2/rhel94-microshift-yminus2.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,3 @@ enabled = ["mdns", "ssh", "http", "https"]
[[customizations.firewall.zones]]
name = "trusted"
sources = ["10.42.0.0/16", "169.254.169.1", "fd01::/48"]

# Extend Greenboot wait timeout to 10m for MicroShift to be ready.
# Greenboot configuration must come after RPM install to avoid
# /etc/greenboot/greenboot.conf overwrite by the package update.
[[customizations.files]]
path = "/etc/greenboot/greenboot.conf"
data = """
GREENBOOT_WATCHDOG_CHECK_ENABLED=true
MICROSHIFT_WAIT_TIMEOUT_SEC=600
"""
10 changes: 0 additions & 10 deletions test/image-blueprints/layer1-base/group3/rhel94-microshift-previous-minor.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,3 @@ enabled = ["mdns", "ssh", "http", "https"]
[[customizations.firewall.zones]]
name = "trusted"
sources = ["10.42.0.0/16", "169.254.169.1", "fd01::/48"]

# Extend Greenboot wait timeout to 10m for MicroShift to be ready.
# Greenboot configuration must come after RPM install to avoid
# /etc/greenboot/greenboot.conf overwrite by the package update.
[[customizations.files]]
path = "/etc/greenboot/greenboot.conf"
data = """
GREENBOOT_WATCHDOG_CHECK_ENABLED=true
MICROSHIFT_WAIT_TIMEOUT_SEC=600
"""
10 changes: 0 additions & 10 deletions test/image-blueprints/layer1-base/group4/rhel94-crel-with-optionals.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,14 +67,4 @@ enabled = ["mdns", "ssh", "http", "https"]
[[customizations.firewall.zones]]
name = "trusted"
sources = ["10.42.0.0/16", "169.254.169.1", "fd01::/48"]

# Extend Greenboot wait timeout to 10m for MicroShift to be ready.
# Greenboot configuration must come after RPM install to avoid
# /etc/greenboot/greenboot.conf overwrite by the package update.
[[customizations.files]]
path = "/etc/greenboot/greenboot.conf"
data = """
GREENBOOT_WATCHDOG_CHECK_ENABLED=true
MICROSHIFT_WAIT_TIMEOUT_SEC=600
"""
{{- end -}}
10 changes: 0 additions & 10 deletions test/image-blueprints/layer1-base/group4/rhel94-crel.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,4 @@ enabled = ["mdns", "ssh", "http", "https"]
[[customizations.firewall.zones]]
name = "trusted"
sources = ["10.42.0.0/16", "169.254.169.1", "fd01::/48"]

# Extend Greenboot wait timeout to 10m for MicroShift to be ready.
# Greenboot configuration must come after RPM install to avoid
# /etc/greenboot/greenboot.conf overwrite by the package update.
[[customizations.files]]
path = "/etc/greenboot/greenboot.conf"
data = """
GREENBOOT_WATCHDOG_CHECK_ENABLED=true
MICROSHIFT_WAIT_TIMEOUT_SEC=600
"""
{{- end -}}
10 changes: 0 additions & 10 deletions test/image-blueprints/layer2-presubmit/group1/rhel94-source-base.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,3 @@ enabled = ["mdns", "ssh", "http", "https"]
[[customizations.firewall.zones]]
name = "trusted"
sources = ["10.42.0.0/16", "169.254.169.1", "fd01::/48"]

# Extend Greenboot wait timeout to 10m for MicroShift to be ready.
# Greenboot configuration must come after RPM install to avoid
# /etc/greenboot/greenboot.conf overwrite by the package update.
[[customizations.files]]
path = "/etc/greenboot/greenboot.conf"
data = """
GREENBOOT_WATCHDOG_CHECK_ENABLED=true
MICROSHIFT_WAIT_TIMEOUT_SEC=600
"""
10 changes: 0 additions & 10 deletions test/image-blueprints/layer2-presubmit/group1/rhel94-source-fake-next-minor.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,3 @@ enabled = ["mdns", "ssh", "http", "https"]
[[customizations.firewall.zones]]
name = "trusted"
sources = ["10.42.0.0/16", "169.254.169.1", "fd01::/48"]

# Extend Greenboot wait timeout to 10m for MicroShift to be ready.
# Greenboot configuration must come after RPM install to avoid
# /etc/greenboot/greenboot.conf overwrite by the package update.
[[customizations.files]]
path = "/etc/greenboot/greenboot.conf"
data = """
GREENBOOT_WATCHDOG_CHECK_ENABLED=true
MICROSHIFT_WAIT_TIMEOUT_SEC=600
"""
10 changes: 0 additions & 10 deletions test/image-blueprints/layer2-presubmit/group1/rhel94-source-tuned.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,16 +52,6 @@ enabled = ["mdns", "ssh", "http", "https"]
name = "trusted"
sources = ["10.42.0.0/16", "169.254.169.1", "fd01::/48"]

# Extend Greenboot wait timeout to 10m for MicroShift to be ready.
# Greenboot configuration must come after RPM install to avoid
# /etc/greenboot/greenboot.conf overwrite by the package update.
[[customizations.files]]
path = "/etc/greenboot/greenboot.conf"
data = """
GREENBOOT_WATCHDOG_CHECK_ENABLED=true
MICROSHIFT_WAIT_TIMEOUT_SEC=600
"""

[[customizations.files]]
path = "/etc/microshift/config.yaml"
data = """
Expand Down
10 changes: 0 additions & 10 deletions test/image-blueprints/layer2-presubmit/group1/rhel94-source-with-optionals.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,3 @@ enabled = ["mdns", "ssh", "http", "https"]
[[customizations.firewall.zones]]
name = "trusted"
sources = ["10.42.0.0/16", "169.254.169.1", "fd01::/48"]

# Extend Greenboot wait timeout to 10m for MicroShift to be ready.
# Greenboot configuration must come after RPM install to avoid
# /etc/greenboot/greenboot.conf overwrite by the package update.
[[customizations.files]]
path = "/etc/greenboot/greenboot.conf"
data = """
GREENBOOT_WATCHDOG_CHECK_ENABLED=true
MICROSHIFT_WAIT_TIMEOUT_SEC=600
"""
10 changes: 0 additions & 10 deletions test/image-blueprints/layer2-presubmit/group1/rhel94-source.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,3 @@ enabled = ["mdns", "ssh", "http", "https"]
[[customizations.firewall.zones]]
name = "trusted"
sources = ["10.42.0.0/16", "169.254.169.1", "fd01::/48"]

# Extend Greenboot wait timeout to 10m for MicroShift to be ready.
# Greenboot configuration must come after RPM install to avoid
# /etc/greenboot/greenboot.conf overwrite by the package update.
[[customizations.files]]
path = "/etc/greenboot/greenboot.conf"
data = """
GREENBOOT_WATCHDOG_CHECK_ENABLED=true
MICROSHIFT_WAIT_TIMEOUT_SEC=600
"""
10 changes: 0 additions & 10 deletions test/image-blueprints/layer3-periodic/group1/rhel94-source-isolated.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,16 +68,6 @@ data = """
BLOCK_RPCS=
FSFREEZE_HOOK_PATHNAME=/etc/qemu-ga/fsfreeze-hook"""

# Extend Greenboot wait timeout to 10m for MicroShift to be ready.
# Greenboot configuration must come after RPM install to avoid
# /etc/greenboot/greenboot.conf overwrite by the package update.
[[customizations.files]]
path = "/etc/greenboot/greenboot.conf"
data = """
GREENBOOT_WATCHDOG_CHECK_ENABLED=true
MICROSHIFT_WAIT_TIMEOUT_SEC=600
"""

[[containers]]
source = "quay.io/microshift/busybox:1.36"

Expand Down
6 changes: 0 additions & 6 deletions test/kickstart-templates/includes/post-greenboot.cfg
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions test/kickstart-templates/kickstart-centos.ks.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@
%include /post-network.cfg

%include /post-cos9rpm.cfg
# Greenboot configuration must come after RPM install to avoid
# /etc/greenboot/greenboot.conf overwrite by the package update
%include /post-greenboot.cfg

%end

Expand Down