From d7da4558a35c57047c7abe1f2b9b17a88f58547d Mon Sep 17 00:00:00 2001 From: Gregory Giguashvili Date: Thu, 19 Dec 2024 17:55:06 +0200 Subject: [PATCH 1/4] Raise the base greenboot timeout to 600s --- docs/contributor/greenboot.md | 4 ++-- packaging/greenboot/functions.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/contributor/greenboot.md b/docs/contributor/greenboot.md index ca0cbe447a..c46be797f7 100644 --- a/docs/contributor/greenboot.md +++ b/docs/contributor/greenboot.md @@ -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 ... ... @@ -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 ... ... diff --git a/packaging/greenboot/functions.sh b/packaging/greenboot/functions.sh index 5e94f0a2df..23e374bcd6 100644 --- a/packaging/greenboot/functions.sh +++ b/packaging/greenboot/functions.sh @@ -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 From 5eaf83ac79fae3a994f7a8d28337983448605efb Mon Sep 17 00:00:00 2001 From: Gregory Giguashvili Date: Thu, 19 Dec 2024 17:58:07 +0200 Subject: [PATCH 2/4] Remove MICROSHIFT_WAIT_TIMEOUT_SEC setting from ostree tests --- .../layer1-base/group2/rhel94-microshift-yminus2.toml | 10 ---------- .../group3/rhel94-microshift-previous-minor.toml | 10 ---------- .../layer1-base/group4/rhel94-crel-with-optionals.toml | 10 ---------- .../layer1-base/group4/rhel94-crel.toml | 10 ---------- .../layer2-presubmit/group1/rhel94-source-base.toml | 10 ---------- .../group1/rhel94-source-fake-next-minor.toml | 10 ---------- .../layer2-presubmit/group1/rhel94-source-tuned.toml | 10 ---------- .../group1/rhel94-source-with-optionals.toml | 10 ---------- .../layer2-presubmit/group1/rhel94-source.toml | 10 ---------- .../layer3-periodic/group1/rhel94-source-isolated.toml | 10 ---------- 10 files changed, 100 deletions(-) diff --git a/test/image-blueprints/layer1-base/group2/rhel94-microshift-yminus2.toml b/test/image-blueprints/layer1-base/group2/rhel94-microshift-yminus2.toml index 90147290b2..94fbc92d7d 100644 --- a/test/image-blueprints/layer1-base/group2/rhel94-microshift-yminus2.toml +++ b/test/image-blueprints/layer1-base/group2/rhel94-microshift-yminus2.toml @@ -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 -""" diff --git a/test/image-blueprints/layer1-base/group3/rhel94-microshift-previous-minor.toml b/test/image-blueprints/layer1-base/group3/rhel94-microshift-previous-minor.toml index 5d4d24385c..003994292b 100644 --- a/test/image-blueprints/layer1-base/group3/rhel94-microshift-previous-minor.toml +++ b/test/image-blueprints/layer1-base/group3/rhel94-microshift-previous-minor.toml @@ -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 -""" diff --git a/test/image-blueprints/layer1-base/group4/rhel94-crel-with-optionals.toml b/test/image-blueprints/layer1-base/group4/rhel94-crel-with-optionals.toml index f99150333f..465d6e1b75 100644 --- a/test/image-blueprints/layer1-base/group4/rhel94-crel-with-optionals.toml +++ b/test/image-blueprints/layer1-base/group4/rhel94-crel-with-optionals.toml @@ -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 -}} diff --git a/test/image-blueprints/layer1-base/group4/rhel94-crel.toml b/test/image-blueprints/layer1-base/group4/rhel94-crel.toml index 6f320e944e..b6e8ba8a47 100644 --- a/test/image-blueprints/layer1-base/group4/rhel94-crel.toml +++ b/test/image-blueprints/layer1-base/group4/rhel94-crel.toml @@ -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 -}} diff --git a/test/image-blueprints/layer2-presubmit/group1/rhel94-source-base.toml b/test/image-blueprints/layer2-presubmit/group1/rhel94-source-base.toml index f5965156dd..4657b9b2ef 100644 --- a/test/image-blueprints/layer2-presubmit/group1/rhel94-source-base.toml +++ b/test/image-blueprints/layer2-presubmit/group1/rhel94-source-base.toml @@ -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 -""" diff --git a/test/image-blueprints/layer2-presubmit/group1/rhel94-source-fake-next-minor.toml b/test/image-blueprints/layer2-presubmit/group1/rhel94-source-fake-next-minor.toml index f5f6c2b7a2..7b2c90621e 100644 --- a/test/image-blueprints/layer2-presubmit/group1/rhel94-source-fake-next-minor.toml +++ b/test/image-blueprints/layer2-presubmit/group1/rhel94-source-fake-next-minor.toml @@ -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 -""" diff --git a/test/image-blueprints/layer2-presubmit/group1/rhel94-source-tuned.toml b/test/image-blueprints/layer2-presubmit/group1/rhel94-source-tuned.toml index 25b3c5bd82..b462682c14 100644 --- a/test/image-blueprints/layer2-presubmit/group1/rhel94-source-tuned.toml +++ b/test/image-blueprints/layer2-presubmit/group1/rhel94-source-tuned.toml @@ -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 = """ diff --git a/test/image-blueprints/layer2-presubmit/group1/rhel94-source-with-optionals.toml b/test/image-blueprints/layer2-presubmit/group1/rhel94-source-with-optionals.toml index e37123b8f8..df83818074 100644 --- a/test/image-blueprints/layer2-presubmit/group1/rhel94-source-with-optionals.toml +++ b/test/image-blueprints/layer2-presubmit/group1/rhel94-source-with-optionals.toml @@ -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 -""" diff --git a/test/image-blueprints/layer2-presubmit/group1/rhel94-source.toml b/test/image-blueprints/layer2-presubmit/group1/rhel94-source.toml index 82530769b4..29f46f3214 100644 --- a/test/image-blueprints/layer2-presubmit/group1/rhel94-source.toml +++ b/test/image-blueprints/layer2-presubmit/group1/rhel94-source.toml @@ -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 -""" diff --git a/test/image-blueprints/layer3-periodic/group1/rhel94-source-isolated.toml b/test/image-blueprints/layer3-periodic/group1/rhel94-source-isolated.toml index 611d4a7d02..ea706170ee 100644 --- a/test/image-blueprints/layer3-periodic/group1/rhel94-source-isolated.toml +++ b/test/image-blueprints/layer3-periodic/group1/rhel94-source-isolated.toml @@ -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" From 27213bd0cc33c4ac4d08a3b916e4c38acbbf0b90 Mon Sep 17 00:00:00 2001 From: Gregory Giguashvili Date: Thu, 19 Dec 2024 18:00:53 +0200 Subject: [PATCH 3/4] Remove MICROSHIFT_WAIT_TIMEOUT_SEC setting from kickstart --- test/kickstart-templates/includes/post-greenboot.cfg | 6 ------ test/kickstart-templates/kickstart-centos.ks.template | 3 --- 2 files changed, 9 deletions(-) delete mode 100644 test/kickstart-templates/includes/post-greenboot.cfg diff --git a/test/kickstart-templates/includes/post-greenboot.cfg b/test/kickstart-templates/includes/post-greenboot.cfg deleted file mode 100644 index e4cf66c136..0000000000 --- a/test/kickstart-templates/includes/post-greenboot.cfg +++ /dev/null @@ -1,6 +0,0 @@ -# Extend Greenboot wait timeout to 10m for MicroShift to be ready -if [ ! -f "/etc/greenboot/greenboot.conf" ] ; then - echo "ERROR: The /etc/greenboot/greenboot.conf file does not exist" - exit 1 -fi -printf "\nMICROSHIFT_WAIT_TIMEOUT_SEC=600\n" >> /etc/greenboot/greenboot.conf diff --git a/test/kickstart-templates/kickstart-centos.ks.template b/test/kickstart-templates/kickstart-centos.ks.template index 7967d1224a..efd3f1a4a8 100644 --- a/test/kickstart-templates/kickstart-centos.ks.template +++ b/test/kickstart-templates/kickstart-centos.ks.template @@ -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 From cc3c9e7c0c7552bbba985813833493a850c02c0e Mon Sep 17 00:00:00 2001 From: Gregory Giguashvili Date: Thu, 19 Dec 2024 18:07:26 +0200 Subject: [PATCH 4/4] Remove MICROSHIFT_WAIT_TIMEOUT_SEC setting from bootc tests --- .../group2/rhel94-bootc-crel-optionals.containerfile | 5 ----- .../layer1-base/group2/rhel94-bootc-crel.containerfile | 5 ----- .../layer1-base/group2/rhel94-bootc-prel.containerfile | 5 ----- .../layer2-source/group1/cos9-bootc-source.containerfile | 5 ----- .../group1/rhel94-bootc-source-base.containerfile | 5 ----- .../layer2-source/group1/rhel94-bootc-source.containerfile | 5 ----- ...4-bootc-source-ostree-parent-previous-minor.containerfile | 5 ----- .../rhel94-bootc-source-ostree-parent-yminus2.containerfile | 5 ----- 8 files changed, 40 deletions(-) diff --git a/test/image-blueprints-bootc/layer1-base/group2/rhel94-bootc-crel-optionals.containerfile b/test/image-blueprints-bootc/layer1-base/group2/rhel94-bootc-crel-optionals.containerfile index 9646aacc29..4a03c80dba 100644 --- a/test/image-blueprints-bootc/layer1-base/group2/rhel94-bootc-crel-optionals.containerfile +++ b/test/image-blueprints-bootc/layer1-base/group2/rhel94-bootc-crel-optionals.containerfile @@ -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 && \ diff --git a/test/image-blueprints-bootc/layer1-base/group2/rhel94-bootc-crel.containerfile b/test/image-blueprints-bootc/layer1-base/group2/rhel94-bootc-crel.containerfile index b43a07d6ad..4b838f6c13 100644 --- a/test/image-blueprints-bootc/layer1-base/group2/rhel94-bootc-crel.containerfile +++ b/test/image-blueprints-bootc/layer1-base/group2/rhel94-bootc-crel.containerfile @@ -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 && \ diff --git a/test/image-blueprints-bootc/layer1-base/group2/rhel94-bootc-prel.containerfile b/test/image-blueprints-bootc/layer1-base/group2/rhel94-bootc-prel.containerfile index 1dc73027eb..d69c7e1c36 100644 --- a/test/image-blueprints-bootc/layer1-base/group2/rhel94-bootc-prel.containerfile +++ b/test/image-blueprints-bootc/layer1-base/group2/rhel94-bootc-prel.containerfile @@ -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 && \ diff --git a/test/image-blueprints-bootc/layer2-source/group1/cos9-bootc-source.containerfile b/test/image-blueprints-bootc/layer2-source/group1/cos9-bootc-source.containerfile index 6095e2c82a..d871fb5d92 100644 --- a/test/image-blueprints-bootc/layer2-source/group1/cos9-bootc-source.containerfile +++ b/test/image-blueprints-bootc/layer2-source/group1/cos9-bootc-source.containerfile @@ -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 && \ diff --git a/test/image-blueprints-bootc/layer2-source/group1/rhel94-bootc-source-base.containerfile b/test/image-blueprints-bootc/layer2-source/group1/rhel94-bootc-source-base.containerfile index 34d2fd78ab..c20b6dce4d 100644 --- a/test/image-blueprints-bootc/layer2-source/group1/rhel94-bootc-source-base.containerfile +++ b/test/image-blueprints-bootc/layer2-source/group1/rhel94-bootc-source-base.containerfile @@ -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 && \ diff --git a/test/image-blueprints-bootc/layer2-source/group1/rhel94-bootc-source.containerfile b/test/image-blueprints-bootc/layer2-source/group1/rhel94-bootc-source.containerfile index 137e9eb029..ffc3b37f1c 100644 --- a/test/image-blueprints-bootc/layer2-source/group1/rhel94-bootc-source.containerfile +++ b/test/image-blueprints-bootc/layer2-source/group1/rhel94-bootc-source.containerfile @@ -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 && \ diff --git a/test/image-blueprints-bootc/layer2-source/group2/rhel94-bootc-source-ostree-parent-previous-minor.containerfile b/test/image-blueprints-bootc/layer2-source/group2/rhel94-bootc-source-ostree-parent-previous-minor.containerfile index f8101271c4..cdd1ff3676 100644 --- a/test/image-blueprints-bootc/layer2-source/group2/rhel94-bootc-source-ostree-parent-previous-minor.containerfile +++ b/test/image-blueprints-bootc/layer2-source/group2/rhel94-bootc-source-ostree-parent-previous-minor.containerfile @@ -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 && \ diff --git a/test/image-blueprints-bootc/layer2-source/group2/rhel94-bootc-source-ostree-parent-yminus2.containerfile b/test/image-blueprints-bootc/layer2-source/group2/rhel94-bootc-source-ostree-parent-yminus2.containerfile index ab84f25d4f..8a0d35aa34 100644 --- a/test/image-blueprints-bootc/layer2-source/group2/rhel94-bootc-source-ostree-parent-yminus2.containerfile +++ b/test/image-blueprints-bootc/layer2-source/group2/rhel94-bootc-source-ostree-parent-yminus2.containerfile @@ -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 && \