Skip to content

Commit

Permalink
*: Fix whitespace at the end of line & missing empty line at end of file
Browse files Browse the repository at this point in the history
  • Loading branch information
travier committed Apr 15, 2024
1 parent d35fed3 commit 68af6ee
Show file tree
Hide file tree
Showing 20 changed files with 21 additions and 24 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ After=ignition-fetch.service
After=coreos-kargs-reboot.service

# There is race condition about checkin and coreos-ignition-unique-boot.
# Removal of the virtual CD might cause Unique Boot Filesystem
# service failed, as could not find `/dev/sr0`, so need to wait until
# Removal of the virtual CD might cause Unique Boot Filesystem
# service failed, as could not find `/dev/sr0`, so need to wait until
# after coreos-ignition-unique-boot.
After=coreos-ignition-unique-boot.service

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ RemainAfterExit=yes
WorkingDirectory=/sysroot
ExecStart=/bin/bash -c 'if ! findmnt boot &>/dev/null; then mount --bind sysroot/boot boot; echo enabled dracut fips workaround; fi'

# No install section, this is only pulled in by rhcos-fips-finish.service
# No install section, this is only pulled in by rhcos-fips-finish.service
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,3 @@ PrivateTmp=true
ProtectSystem=full
RestrictNamespaces=true
RestrictRealtime=true

Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,3 @@ Persistent=true

[Install]
WantedBy=timers.target

Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,3 @@ function tuned_pre_udev_main() {
}

tuned_pre_udev_main

4 changes: 2 additions & 2 deletions tests/kola/afterburn/platform-id
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash
## kola:
## platforms: aws gcp
## description: Verify afterburn works with old kernel argument
## description: Verify afterburn works with old kernel argument
## ignition.platform.id=ec2/gce.
## https://issues.redhat.com/browse/OCPBUGS-7733

Expand Down Expand Up @@ -50,7 +50,7 @@ rebooted)
;;
*) echo "unhandled platform ${platform} ?"; exit 1 ;;
esac

ok "afterburn.service starts successfully with ignition.platform.id=${platform}"
;;
*)
Expand Down
4 changes: 2 additions & 2 deletions tests/kola/console/console-login-helper-service
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
## kola:
## exclusive: false
## description: >
## Verify that we have the proper presets for
## Verify that we have the proper presets for
## console-login-helper-messages in RHCOS.
## Verify versions of CLHM prior to v0.21 have `issuegen`-related
## Verify versions of CLHM prior to v0.21 have `issuegen`-related
## systemd units.
## This is RHCOS only.

Expand Down
2 changes: 1 addition & 1 deletion tests/kola/disk/iscsi-initiatorname-service
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash
## kola:
## exclusive: false
## description: Verify coreos-generate-iscsi-initiatorname.service
## description: Verify coreos-generate-iscsi-initiatorname.service
## is enabled by default on RHCOS (disabled on FCOS).
## https://github.com/openshift/os/pull/453

Expand Down
2 changes: 1 addition & 1 deletion tests/kola/disk/nvme-compat-symlink
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
## platforms: qemu
## # qemu on s390x does not support nvme emulation
## architectures: "!s390x"
## description: Verify that we are compatible with the old symlinks
## description: Verify that we are compatible with the old symlinks
## for NVME disks.
## https://github.com/openshift/os/pull/1243

Expand Down
2 changes: 1 addition & 1 deletion tests/kola/files/conntrack-tools
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash
## kola:
## exclusive: false
## description: Verify conntrack-tools is installed by default
## description: Verify conntrack-tools is installed by default
## on RHCOS (not installed on FCOS).

set -xeuo pipefail
Expand Down
2 changes: 1 addition & 1 deletion tests/kola/files/env-godebug
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash
## kola:
## exclusive: false
## description: Verify environment variable `GODEBUG=x509ignoreCN=0`
## description: Verify environment variable `GODEBUG=x509ignoreCN=0`
## found in initrd.
## https://bugzilla.redhat.com/show_bug.cgi?id=1886134
## https://github.com/openshift/os/pull/441
Expand Down
4 changes: 2 additions & 2 deletions tests/kola/files/kata-osbuilder
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#!/bin/bash
## kola:
## exclusive: false
## description: Verify `kata-osbuilder-generate.service` is
## part of the default presets, defined in
## description: Verify `kata-osbuilder-generate.service` is
## part of the default presets, defined in
## /usr/lib/systemd/system-preset/45-rhcos-extensions.preset
## https://bugzilla.redhat.com/show_bug.cgi?id=1941342
## https://github.com/openshift/os/pull/524
Expand Down
2 changes: 1 addition & 1 deletion tests/kola/files/trust-cpu
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# This test can be removed when RHCOS gets to kernel version 6.2+
# https://github.com/coreos/fedora-coreos-tracker/issues/1369
# https://github.com/coreos/fedora-coreos-config/pull/2155
# https://bugzilla.redhat.com/show_bug.cgi?id=1830280
# https://bugzilla.redhat.com/show_bug.cgi?id=1830280

set -xeuo pipefail

Expand Down
2 changes: 1 addition & 1 deletion tests/kola/rpm-ostree/replace-rt-kernel
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
## # We've seen some OOM when 1024M is used in similar tests:
## # https://github.com/coreos/fedora-coreos-tracker/issues/1506
## minMemory: 2048
## description: Verify replacing the current kernel with an
## description: Verify replacing the current kernel with an
## older centos kernel and replacing with kernel-rt.

set -euo pipefail
Expand Down
2 changes: 1 addition & 1 deletion tests/kola/systemd/journal-compat
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash
## kola:
## # Since we pull a container image
## tags: "needs-internet"
## tags: "needs-internet"
## timeoutMin: 30
## description: Verify that rhel8 journalctl can still read our journals.
## https://issues.redhat.com/browse/OCPBUGS-11492
Expand Down
2 changes: 1 addition & 1 deletion tests/kola/version/drop-azure-ptp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash
## kola:
## exclusive: false
## description: Verify we should not have 50-azure-ptp.rules.
## description: Verify we should not have 50-azure-ptp.rules.

set -xeuo pipefail

Expand Down
2 changes: 1 addition & 1 deletion tests/kola/version/rhaos-pkgs-match-openshift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash
## kola:
## exclusive: false
## description: Verify that packages coming from the rhaos
## description: Verify that packages coming from the rhaos
## branches match the OpenShift version.
## This is RHCOS only.

Expand Down
2 changes: 1 addition & 1 deletion tests/kola/version/rhel-major-version
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash
## kola:
## exclusive: false
## description: Verify that only packages from the RHEL major
## description: Verify that only packages from the RHEL major
## version are included.

set -xeuo pipefail
Expand Down
2 changes: 1 addition & 1 deletion tests/kola/version/rhel-matches-rhcos-build
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash
## kola:
## exclusive: false
## description: Verify that the OS version (C9S, RHEL 9.x) matches
## description: Verify that the OS version (C9S, RHEL 9.x) matches
## the version stored in /etc/os-release.
## tags: openshift

Expand Down
2 changes: 1 addition & 1 deletion zram-no-defaults.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ remove-from-packages:
# zram-generator-0.3.2 (shipped in centOS 9) provides a default
# zram-generator config, we want to disable it
- - zram-generator
- "/usr/lib/systemd/zram-generator.conf"
- "/usr/lib/systemd/zram-generator.conf"

0 comments on commit 68af6ee

Please sign in to comment.