Skip to content
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.

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

[stable] tree: promote changes from testing at e1ce9f2a55f46b6de565cb76e6d82adb157c68db #2994

Merged
merged 2 commits into from
May 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/add-override.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ jobs:
echo "COMMIT_TITLE=${title}" >> ${GITHUB_ENV}
echo "PR_TITLE=${pr_title}" >> ${GITHUB_ENV}
- name: Open pull request
uses: peter-evans/create-pull-request@v4.2.3
uses: peter-evans/create-pull-request@v6
with:
token: ${{ secrets.COREOSBOT_RELENG_TOKEN }}
branch: ${{ env.BRANCH_NAME }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/openshift-os.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ jobs:
EOF

- name: Open pull request
uses: peter-evans/create-pull-request@v6.0.0
uses: peter-evans/create-pull-request@v6
with:
token: ${{ secrets.COREOSBOT_RELENG_TOKEN }}
push-to-fork: coreosbot-releng/os
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/remove-graduated-overrides.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ jobs:
-m "Triggered by remove-graduated-overrides GitHub Action."
fi
- name: Open pull request
uses: peter-evans/create-pull-request@v4.2.3
uses: peter-evans/create-pull-request@v6
with:
token: ${{ secrets.COREOSBOT_RELENG_TOKEN }}
branch: ${{ matrix.branch }}-graduation
Expand Down
54 changes: 50 additions & 4 deletions ci/find-whitespace
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,62 @@
set -euo pipefail

main() {
local files_with_whitespace
files_with_whitespace="$(find manifests overlay.d tests -type f -exec grep -El " +$" {} \;)"

local files_with_whitespace=""
local files_with_missing_empty_line_at_eof=""

while IFS= read -r -d '' f; do
echo "[+] Checking ${f}"

# Looking for whitespace at end of line
if grep -Eq " +$" "${f}"; then
# List of files to ignore
if \
[[ "${f}" == "./live/isolinux/boot.msg" ]] \
; then
echo "[+] Checking ${f}: Ignoring whitespace at end of line"
else
echo "[+] Checking ${f}: Found whitespace at end of line"
files_with_whitespace+=" ${f}"
fi
fi

# Looking for missing empty line at end of file
if [[ -n $(tail -c 1 "${f}") ]]; then
# List of files to ignore
if \
[[ "${f}" == "./tests/kola/ignition/resource/authenticated-gs/data/expected/"* ]] ||\
[[ "${f}" == "./tests/kola/ignition/resource/authenticated-s3/data/expected/"* ]] ||\
[[ "${f}" == "./tests/kola/ignition/resource/remote/data/expected/"* ]] \
; then
echo "[+] Checking ${f}: Ignoring missing empty line at end of file"
else
echo "[+] Checking ${f}: Missing empty line at end of file"
files_with_missing_empty_line_at_eof+=" ${f}"
fi
fi
done< <(find . -path "./.git" -prune -o -type f -print0)

echo ""
if [[ -n "${files_with_whitespace}" ]]; then
echo "[+] Found files with whitespace at the end of line"
echo "${files_with_whitespace}"
echo "${files_with_whitespace}" | tr ' ' '\n'
else
echo "[+] No files with whitespace at the end of line"
fi

echo ""
if [[ -n "${files_with_missing_empty_line_at_eof}" ]]; then
echo "[+] Found files with missing empty line at end of file"
echo "${files_with_missing_empty_line_at_eof}" | tr ' ' '\n'
else
echo "[+] No files with missing empty line at end of file"
fi

if [[ -n "${files_with_whitespace}" ]] || [[ -n "${files_with_missing_empty_line_at_eof}" ]]; then
exit 1
fi

echo "[+] No files with whitespace at the end of line"
exit 0
}

Expand Down
9 changes: 0 additions & 9 deletions image-base.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,6 @@ ignition-network-kcmdline: []
# Optional remote by which to prefix the deployed OSTree ref
ostree-remote: fedora

# opt in to using the `metadata_csum_seed` feature of the ext4 filesystem
# for the /boot filesystem. Support for this was only recently added to grub
# and isn't available everywhere yet so we'll gate it behind this image.yaml
# knob. It should be easy to know when RHEL/RHCOS supports this by just flipping
# this to `true` and doing a build. It should error when building the disk
# images if grub doesn't support it.
# https://lists.gnu.org/archive/html/grub-devel/2021-06/msg00031.html
bootfs_metadata_csum_seed: true

vmware-os-type: fedora64Guest
# VMware hardware versions: https://kb.vmware.com/s/article/1003746
# We use the newest version allowed by the oldest non-EOL VMware
Expand Down
17 changes: 1 addition & 16 deletions kola-denylist.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,27 +7,12 @@
tracker: https://github.com/coreos/coreos-assembler/pull/1478
- pattern: coreos.ignition.ssh.key
tracker: https://github.com/coreos/fedora-coreos-tracker/issues/1553
# snooze: 2024-04-15 (disabled on promotion)
# snooze: 2024-04-29 (disabled on promotion)
# warn: true (disabled on promotion)
platforms:
- azure
- pattern: ext.config.var-mount.scsi-id
tracker: https://github.com/coreos/fedora-coreos-tracker/issues/1670
# snooze: 2024-04-15 (disabled on promotion)
# warn: true (disabled on promotion)
streams:
- rawhide
- branched
- next
- next-devel
- pattern: coreos.boot-mirror*
tracker: https://github.com/coreos/fedora-coreos-tracker/issues/1659
# warn: true (disabled on promotion)
arches:
- ppc64le
- pattern: ext.config.kdump.crash
tracker: https://github.com/coreos/fedora-coreos-tracker/issues/1698
# snooze: 2024-04-07 (disabled on promotion)
# warn: true (disabled on promotion)
streams:
- rawhide
Loading
Loading