Skip to content

Commit d609804

Browse files
committed
Use Also= in greenboot-healtcheck to auto enable success target
No need to manually enable greenboot-success target CI tests updated
1 parent 47b697d commit d609804

5 files changed

Lines changed: 6 additions & 6 deletions

File tree

.github/spellcheck-ignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@ ro
88
rw
99
RO
1010
RW
11-
grubenv
11+
grubenv
12+
msdos

tests/greenboot-bootc-anaconda-iso.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ FROM ${BASE_IMAGE_URL}
168168
COPY greenboot-*.rpm /tmp/
169169
RUN dnf install -y \
170170
/tmp/greenboot-*.rpm && \
171-
systemctl enable greenboot-healthcheck.service greenboot-rollback.service greenboot-success.target
171+
systemctl enable greenboot-healthcheck.service
172172
RUN sed -i "s/GREENBOOT_MAX_BOOT_ATTEMPTS=3/GREENBOOT_MAX_BOOT_ATTEMPTS=5/g" /etc/greenboot/greenboot.conf
173173
RUN sed -i 's#DISABLED_HEALTHCHECKS=()#DISABLED_HEALTHCHECKS=("01_repository_dns_check.sh" "not_exit.sh")#g' /etc/greenboot/greenboot.conf
174174
COPY passing_binary /etc/greenboot/check/required.d/

tests/greenboot-bootc-qcow2.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ FROM ${BASE_IMAGE_URL}
168168
COPY greenboot-*.rpm /tmp/
169169
RUN dnf install -y \
170170
/tmp/greenboot-*.rpm && \
171-
systemctl enable greenboot-healthcheck.service greenboot-rollback.service greenboot-success.target
171+
systemctl enable greenboot-healthcheck.service
172172
RUN sed -i "s/GREENBOOT_MAX_BOOT_ATTEMPTS=3/GREENBOOT_MAX_BOOT_ATTEMPTS=5/g" /etc/greenboot/greenboot.conf
173173
RUN sed -i 's#DISABLED_HEALTHCHECKS=()#DISABLED_HEALTHCHECKS=("01_repository_dns_check.sh" "not_exit.sh")#g' /etc/greenboot/greenboot.conf
174174
COPY passing_binary /etc/greenboot/check/required.d/

tests/greenboot-ostree.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ sudo systemctl start libvirtd
129129
sudo virsh list --all > /dev/null
130130

131131
# Set a customized dnsmasq configuration for libvirt so we always get the
132-
# same address on bootup.
132+
# same address on boot up.
133133
greenprint "💡 Setup libvirt network"
134134
sudo tee /tmp/integration.xml > /dev/null << EOF
135135
<network xmlns:dnsmasq='http://libvirt.org/schemas/network/dnsmasq/1.0'>
@@ -320,8 +320,6 @@ version = "*"
320320
name = "sssd"
321321
version = "*"
322322
323-
[customizations.services]
324-
enabled = ["greenboot-success.target"]
325323
326324
[[customizations.user]]
327325
name = "${SSH_USER}"

usr/lib/systemd/system/greenboot-healthcheck.service

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,4 @@ PrivateMounts=yes
1717
[Install]
1818
RequiredBy=boot-complete.target
1919
WantedBy=multi-user.target
20+
Also=greenboot-success.target

0 commit comments

Comments
 (0)