kernel January 2024

kernel@lists.fedoraproject.org

5 participants
85 discussions

[OS-BUILD PATCH 0/3] Add libperf packages and build kernel tools for Fedora
by Justin M. Forbes (via Email Bridge) 23 Jan '24

23 Jan '24

From: Justin M. Forbes on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2907 When kernel-tools was split out to a separate package in Fedora, it was due to several factors. Most of those issues have been mitigated in other ways, and there are advantages to building tools with the kernel build. Let's turn on tools for Fedora. To do so, we need to add the libperf packages, but this enables them for Fedora only. It is worth noting that the Fedora package for bpftool will retain the upstream kernel versioning. This is because the bpftool versioning scheme is incompatible with the stable Fedora process. --- redhat/kernel.spec.template | 83 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 80 insertions(+), 3 deletions(-)

1 3

[OS-BUILD PATCH 0/3] configs: netfilter: update settings
by Florian Westphal (via Email Bridge) 23 Jan '24

23 Jan '24

From: Florian Westphal on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2823 Disable DCCP conntrack and the old iptables-32-bit-compat interface in all configurations. Set CONFIG_NETFILTER_NETLINK_HOOK=m in all configurations (only enabled in rhel so far) and disable CONFIG_NF_CT_PROTO_DCCP and CONFIG_NETFILTER_XTABLES_COMPAT in all configurations. Signed-off-by: Florian Westphal <fwestpha(a)redhat.com> --- redhat/configs/rhel/generic/CONFIG_NETFILTER_NETLINK_HOOK => redhat/configs/common/generic/CONFIG_NETFILTER_NETLINK_HOOK | 0 redhat/configs/rhel/generic/CONFIG_NETFILTER_XTABLES_COMPAT => redhat/configs/common/generic/CONFIG_NETFILTER_XTABLES_COMPAT | 0 redhat/configs/common/generic/CONFIG_NF_CT_PROTO_DCCP | 2 +- redhat/configs/fedora/generic/CONFIG_NETFILTER_NETLINK_HOOK | 1 - redhat/configs/fedora/generic/CONFIG_NETFILTER_XTABLES_COMPAT | 1 - 5 files changed, 1 insertions(+), 3 deletions(-)

2 4

[OS-BUILD PATCHv7] Add new os-build targets: rt-devel and automotive-devel
by Don Zickus (via Email Bridge) 23 Jan '24

23 Jan '24

From: Don Zickus <dzickus(a)redhat.com> Add new os-build targets: rt-devel and automotive-devel This is an attempt to automate the rt and automotive devel branches using the upstream linux-rt-devel tree as the base combined with os-build. The overall process isn't too complicated but there are enough steps to make it compilicated. Steps: * map upstream linux-rt-devel to master-rt branch * update os-build * grab linux version from master-rt and os-build * if version the same then merge os-build and master-rt to os-build-rt-automated * else merge tag kernel-N.V.0-0 and master-rt to os-build-rt-automated until master-rt is update to os-build * merge os-build-rt-automated into os-build-rt-devel * merge os-build-rt-automated into os-build-automotive-devel * run the generate pending-rhel config scripts on rt-devel and automotive-devel The script has beginning logic to handle rebasing if necessary when the rt-devel branch transitions from os-build-stable (linux-stable) to linux master again. NOTE: The script uses kernel-N.V.0-0 which is rebased after os-build linux-x.y GA is created but before linux-x.y+1 pre-rc1 merges happen. The reason for this is because linux-stable-x.y doesn't exist until linux-x.y+1-rc1 exists thus leaving linux-stable-x.y-1 in the meantime. An awkward gap exists, use kernel-N.V.0-0 as the base. The script has no effect on the day-to-day operations of os-build. They are designed to be run from a gitlab cron job and update in the background. Once they are deemed stable, adding ARK MRs that target either os-build-rt-devel or os-build-automotive-devel will be possible and those branches can start proper parallel developement with os-build. Signed-off-by: Don Zickus <dzickus(a)redhat.com> diff --git a/redhat/scripts/ci/ark-ci-env.sh b/redhat/scripts/ci/ark-ci-env.sh index blahblah..blahblah 100644 --- a/redhat/scripts/ci/ark-ci-env.sh +++ b/redhat/scripts/ci/ark-ci-env.sh @@ -19,6 +19,156 @@ ci_pre_check() git diff-index --quiet HEAD || die "Dirty tree, please clean before merging." } +# GitLab can only mirror one project at a time. This wrapper function does +# the mirroring for any other branches. +ark_git_mirror() +{ + target_branch=$1 + upstream_tree=$2 + source_branch=$3 + reset_branch=$4 + + prev_branch="$(git rev-parse --abbrev-ref HEAD)" + remote_branch="$upstream_tree/$source_branch" + git checkout "$target_branch" + git fetch "$upstream_tree" "$source_branch" + if test -z "$reset_branch"; then + git merge "$remote_branch" || die "git merge $remote_branch failed" + else + git reset --hard "$remote_branch" || die "git reset $remote_branch failed" + fi + git checkout "$prev_branch" +} + +# Merge wrapper in case issues arise +ark_git_merge() +{ + source_branch=$1 + target_branch=$2 + reset_branch=$3 + + prev_branch="$(git rev-parse --abbrev-ref HEAD)" + git checkout "${target_branch}" + if test -n "$reset_branch"; then + # there are cases when the initial merge is a reset + git reset --hard "$source_branch" || die "git reset $source_branch failed" + elif ! git merge -m "Merge '$source_branch' into '$target_branch'" "$source_branch"; then + git merge --abort + printf "Merge conflict; halting!\n" + printf "To reproduce:\n" + printf "* git checkout %s\n" "${target_branch}" + printf "* git merge %s\n" "${source_branch}" + die "Merge conflicts" + fi + + git checkout "$prev_branch" + return 0 +} + +ark_git_rebase() +{ + branch=$1 + upstream=$2 + base=$3 + + prev_branch="$(git rev-parse --abbrev-ref HEAD)" + git checkout "${branch}" + if ! git rebase --onto "$base" "$upstream"; then + git rebase --abort + printf "Rebase conflict; halting!\n" + printf "To reproduce:\n" + printf "* git checkout %s\n" "${branch}" + printf "* git rebase --onto %s %s\n" "${base}" "${upstream}" + die "Rebase conflicts" + fi + git checkout "$prev_branch" + return 0 +} + +ark_update_configs() +{ + branch=$1 + skip_configs=$2 + + prev_branch="$(git rev-parse --abbrev-ref HEAD)" + git checkout "${branch}" + + # Generates and commits all the pending configs + make -j FLAVOR=fedora dist-configs-commit + # Skip executing gen_config_patches.sh for new Fedora configs + + old_head="$(git rev-parse HEAD)" + make -j FLAVOR=rhel dist-configs-commit + new_head="$(git rev-parse HEAD)" + + + # Converts each new pending config from above into its finalized git + # configs/<date>/<config> branch. These commits are used for Merge + # Requests. + [ "$old_head" != "$new_head" ] && CONFIGS_ADDED="1" || CONFIGS_ADDED="" + + if test "$CONFIGS_ADDED"; then + if test -z "$skip_configs"; then + git checkout "$prev_branch" + ./redhat/scripts/genspec/gen_config_patches.sh "$branch" + fi + else + printf "No new configuration values exposed from " + printf "merging %s into $BRANCH\n" "$UPSTREAM_REF" + fi + + git checkout "$prev_branch" + test -z "$CONFIGS_ADDED" && return 0 || return 1 +} + +ark_push_changes() +{ + branch=$1 + skip_configs=$2 + + prev_branch="$(git rev-parse --abbrev-ref HEAD)" + git checkout "${branch}" + + TMPFILE=".push-warnings" + touch "$TMPFILE" + + test "$TO_PUSH" && PUSH_VERB="Pushing" || PUSH_VERB="To push" + PUSH_STR="branch ${branch} to ${GITLAB_URL}" + PUSH_CMD="git push gitlab ${branch}" + PUSH_CONFIG_STR="config update branches" + PUSH_CONFIG_CMD="for conf_branch in \$(git branch | grep configs/${branch}/\"\$(date +%F)\"); do + git push \\ + -o merge_request.create \\ + -o merge_request.target=\"$branch\" \\ + -o merge_request.remove_source_branch \\ + gitlab \"\$conf_branch\" 2>&1 | tee -a $TMPFILE + done + " + + #Push branch + echo "# $PUSH_VERB $PUSH_STR" + echo "$PUSH_CMD" + test "$TO_PUSH" && eval "$PUSH_CMD" + + #Push config branches if created + if test -z "$skip_configs"; then + echo + echo "# $PUSH_VERB $PUSH_CONFIG_STR" + echo "$PUSH_CONFIG_CMD" + test "$TO_PUSH" && eval "$PUSH_CONFIG_CMD" + fi + + # GitLab server side warnings do not fail git-push but leave verbose + # WARNING messages. Grep for those and consider it a script + # failure. Make sure all branches are pushed first as follow up + # git-pushes may succeed. + grep -q "remote:[ ]* WARNINGS" "$TMPFILE" && die "Server side warnings" + + rm "$TMPFILE" + git checkout "$prev_branch" + return 0 +} + # Common variables for all CI scripts UPSTREAM_REF=${1:-"master"} BRANCH=${2:-"os-build"} diff --git a/redhat/scripts/ci/ark-merge-rt.sh b/redhat/scripts/ci/ark-merge-rt.sh new file mode 100755 index blahblah..blahblah 100755 --- /dev/null +++ b/redhat/scripts/ci/ark-merge-rt.sh @@ -0,0 +1,134 @@ +#!/bin/bash +# +# This script is intended to sync up the RT and automotive branch (derivative +# of RT). It adds the extra twist of detecting the right upstream rt branch +# to sync with depending on the existance of the next branch. Sometimes the +# rt-devel branch waits until -rc1/2 to create new branches. +# Finally the code handles the rebases in those cases where newer branches +# are available. +# +# Why the complexity? +# Development branches will need to be periodically rebased unfortunately. +# Using 'git rebase --onto <new head> <old_head>' only works with one common +# branch to rebase from not two. Meanwhile, the -devel branches are formed +# from two upstream branches, os-build and linux-rt-devel. The idea is +# to merge the two branches into a single throwaway branch that can be +# recreated from scratch anytime then use that as the base for -devel. + +set -e + +# source common CI functions and variables +# shellcheck disable=SC1091 +. "$(dirname "$0")"/ark-ci-env.sh + +#Upstream RT tree git://git.kernel.org/pub/scm/linux/kernel/git/rt/linux-rt-devel.git +UPSTREAM_RT_TREE_NAME="linux-rt-devel" +DOWNSTREAM_RT_BRANCH="master-rt-devel" +RT_PREP_BRANCH="os-build-rt-automated" +RT_DEVEL_BRANCH="os-build-rt-devel" +AUTOMOTIVE_DEVEL_BRANCH="os-build-automotive-devel" + +# grab the os-build base branches +ark_git_mirror "os-build" "origin" "os-build" +ark_git_mirror "master" "origin" "master" + +# make sure tags are available for git-describe to correctly work +git fetch -t origin + +# upstream -rt devel branches are aligned with version numbers and are not +# always up to date with master. Figure out which branch to mirror based on +# version number and existance. We may have to trigger a rebase. + +# what are the current versions of rt-devel and os-build (use 'master' to +# avoid fedora tagging of kernel-X.Y.0.0.....) +# use git tags which are always 'vX.Y-rcZ-aaa-gbbbbb' or 'vX.Y-aaa-gbbbbb' +# where X.Y is the version number that maps to linux-rt's branch of +# 'linux-X.Y.y' +get_upstream_version() +{ + branch=$1 + upstream="master" + + # Thanks to pre-rc1 merging, we have a 2 week window with an + # incorrect version number. Detect and correct. + mergebase="$(git merge-base "$branch" "$upstream")" + raw_version="$(git describe "$mergebase")" + version="$(git show "$branch":Makefile | sed -ne '/^VERSION\ =\ /{s///;p;q}')" + patchlevel="$(git show "$branch":Makefile | sed -ne '/^PATCHLEVEL\ =\ /{s///;p;q}')" + kver="${version}.${patchlevel}" + + #-rc indicates no tricks necessary, return version + if echo "${raw_version}" | grep -q -- "-rc"; then + echo "$kver" + return + fi + + #if -gXXX is _not_ there, must be a GA release, use version + if ! echo "${raw_version}" | grep -q -- "-g"; then + echo "$kver" + return + fi + + #must be a post tag release with -g but not -rcX, IOW an rc0. + #Add a 1 to the version number + echo "${version}.$((patchlevel + 1))" +} + +RT_DEVEL_VER="$(get_upstream_version "$DOWNSTREAM_RT_BRANCH")" +RT_PREP_VER="$(get_upstream_version $RT_PREP_BRANCH)" +OS_BUILD_VER="$(get_upstream_version os-build)" + +# Grab possible rt branches to choose from +RT_FETCH_BRANCH="linux-${RT_DEVEL_VER}.y-rt" +RT_REBASE_FETCH_BRANCH="linux-${OS_BUILD_VER}.y-rt" +RT_MERGE_BRANCH="$RT_FETCH_BRANCH" +OS_BUILD_BASE_BRANCH="os-build" + +if test "$RT_DEVEL_VER" != "$OS_BUILD_VER"; then + # does the newer version branch exist in linux-rt-devel yet? + if ! git fetch "$UPSTREAM_RT_TREE_NAME" "$RT_REBASE_FETCH_BRANCH"; then + # no newer upstream branch to rebase onto, continue with an + # os-build stable tag + OS_BUILD_BASE_BRANCH="kernel-${RT_DEVEL_VER}.0-0" + RT_REBASE="" + else + # rebase time + RT_MERGE_BRANCH="$RT_REBASE_FETCH_BRANCH" + RT_REBASE="yes" + fi +fi + +# sanity check, sometimes broken scripts leave a mess +if test "$RT_DEVEL_VER" != "$RT_PREP_VER"; then + RT_REBASE="yes" +fi + +## PREP the upstream branches +# on a rebase, propogate all the git resets +# fetch the determined rt-devel branch +ark_git_mirror "$DOWNSTREAM_RT_BRANCH" "$UPSTREAM_RT_TREE_NAME" "$RT_MERGE_BRANCH" "$RT_REBASE" +# finally merge the two correct branches +old_RT_PREP_BRANCH="$(git rev-parse $RT_PREP_BRANCH)" # for ark_git_rebase +ark_git_merge "$OS_BUILD_BASE_BRANCH" "$RT_PREP_BRANCH" "$RT_REBASE" +ark_git_merge "$DOWNSTREAM_RT_BRANCH" "$RT_PREP_BRANCH" + +## MERGE the upstream branches to the development branches +if test -n "$RT_REBASE"; then + # handle the rebase + ark_git_rebase "$RT_DEVEL_BRANCH" "$old_RT_PREP_BRANCH" "$RT_PREP_BRANCH" + ark_git_rebase "$AUTOMOTIVE_DEVEL_BRANCH" "$old_RT_PREP_BRANCH" "$RT_PREP_BRANCH" +fi + +## Build -rt-devel branch, generate pending-rhel configs +ark_git_merge "$RT_PREP_BRANCH" "$RT_DEVEL_BRANCH" +# don't care if configs were added or not hence '|| true' +ark_update_configs "$RT_DEVEL_BRANCH" || true +# skip pushing config update MRs, keep them in pending-rhel +ark_push_changes "$RT_DEVEL_BRANCH" "skip" + +## Build -automotive-devel branch, generate pending-rhel configs +ark_git_merge "$RT_PREP_BRANCH" "$AUTOMOTIVE_DEVEL_BRANCH" +# don't care if configs were added or not hence '|| true' +ark_update_configs "$AUTOMOTIVE_DEVEL_BRANCH" || true +# skip pushing config update MRs, keep them in pending-rhel +ark_push_changes "$AUTOMOTIVE_DEVEL_BRANCH" "skip" -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2732

2 1

[OS-BUILD PATCH] gitlab-ci: merge ark-latest before building in MR pipelines
by Michael Hofmann (via Email Bridge) 23 Jan '24

23 Jan '24

From: Michael Hofmann <mhofmann(a)redhat.com> gitlab-ci: merge ark-latest before building in MR pipelines Fixes https://gitlab.com/cki-project/kernel-ark/-/issues/110 Signed-off-by: Michael Hofmann <mhofmann(a)redhat.com> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index blahblah..blahblah 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -161,6 +161,11 @@ workflow: - *only-cki-gating-head - *on-success +.merge_ark_latest: + variables: + merge_tree: ${CI_MERGE_REQUEST_PROJECT_URL}.git + merge_branch: ark-latest + # variants .rawhide_up: variables: @@ -254,35 +259,35 @@ workflow: # Rawhide CI ark_merge_request: - extends: [.merge_request, .trigger_rawhide, .no_tests, .srpm_for_bot, + extends: [.merge_request, .trigger_rawhide, .no_tests, .merge_ark_latest, .srpm_for_bot, .rawhide_up] ark_debug_merge_request: - extends: [.merge_request, .trigger_rawhide, .no_tests, .manual_for_bot, + extends: [.merge_request, .trigger_rawhide, .no_tests, .merge_ark_latest, .manual_for_bot, .rawhide_up_debug] ark_16k_merge_request: - extends: [.merge_request, .trigger_rawhide, .no_tests, .manual_for_bot, + extends: [.merge_request, .trigger_rawhide, .no_tests, .merge_ark_latest, .manual_for_bot, .rawhide_16k] ark_16k_debug_merge_request: - extends: [.merge_request, .trigger_rawhide, .no_tests, .manual_for_bot, + extends: [.merge_request, .trigger_rawhide, .no_tests, .merge_ark_latest, .manual_for_bot, .rawhide_16k_debug] ark_clang_merge_request: - extends: [.merge_request, .trigger_rawhide, .no_tests, .manual_for_bot, + extends: [.merge_request, .trigger_rawhide, .no_tests, .merge_ark_latest, .manual_for_bot, .rawhide_clang_up] ark_clang_debug_merge_request: - extends: [.merge_request, .trigger_rawhide, .no_tests, .manual_for_bot, + extends: [.merge_request, .trigger_rawhide, .no_tests, .merge_ark_latest, .manual_for_bot, .rawhide_clang_up_debug] ark_clanglto_merge_request: - extends: [.merge_request, .trigger_rawhide, .no_tests, .manual_for_bot, + extends: [.merge_request, .trigger_rawhide, .no_tests, .merge_ark_latest, .manual_for_bot, .rawhide_clanglto_up] ark_clanglto_debug_merge_request: - extends: [.merge_request, .trigger_rawhide, .no_tests, .manual_for_bot, + extends: [.merge_request, .trigger_rawhide, .no_tests, .merge_ark_latest, .manual_for_bot, .rawhide_clanglto_up_debug] # Rawhide baselines @@ -320,7 +325,7 @@ ark_clanglto_debug_baseline: # Rawhide CKI container image gating ark_cki_gating: - extends: [.baseline, .trigger_rawhide, .no_tests, .cki_gating_head, + extends: [.baseline, .trigger_rawhide, .no_tests, .merge_ark_latest, .cki_gating_head, .rawhide_up, .cki_gating_overrides] # ELN CI -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2867

1 0

[OS-BUILD PATCHv6] Add new os-build targets: rt-devel and automotive-devel
by Don Zickus (via Email Bridge) 22 Jan '24

22 Jan '24

From: Don Zickus <dzickus(a)redhat.com> Add new os-build targets: rt-devel and automotive-devel This is an attempt to automate the rt and automotive devel branches using the upstream linux-rt-devel tree as the base combined with os-build. The overall process isn't too complicated but there are enough steps to make it compilicated. Steps: * map upstream linux-rt-devel to master-rt branch * update os-build * grab linux version from master-rt and os-build * if version the same then merge os-build and master-rt to os-build-rt-automated * else merge tag kernel-N.V.0-0 and master-rt to os-build-rt-automated until master-rt is update to os-build * merge os-build-rt-automated into os-build-rt-devel * merge os-build-rt-automated into os-build-automotive-devel * run the generate pending-rhel config scripts on rt-devel and automotive-devel The script has beginning logic to handle rebasing if necessary when the rt-devel branch transitions from os-build-stable (linux-stable) to linux master again. NOTE: The script uses kernel-N.V.0-0 which is rebased after os-build linux-x.y GA is created but before linux-x.y+1 pre-rc1 merges happen. The reason for this is because linux-stable-x.y doesn't exist until linux-x.y+1-rc1 exists thus leaving linux-stable-x.y-1 in the meantime. An awkward gap exists, use kernel-N.V.0-0 as the base. The script has no effect on the day-to-day operations of os-build. They are designed to be run from a gitlab cron job and update in the background. Once they are deemed stable, adding ARK MRs that target either os-build-rt-devel or os-build-automotive-devel will be possible and those branches can start proper parallel developement with os-build. Signed-off-by: Don Zickus <dzickus(a)redhat.com> diff --git a/redhat/scripts/ci/ark-ci-env.sh b/redhat/scripts/ci/ark-ci-env.sh index blahblah..blahblah 100644 --- a/redhat/scripts/ci/ark-ci-env.sh +++ b/redhat/scripts/ci/ark-ci-env.sh @@ -19,6 +19,156 @@ ci_pre_check() git diff-index --quiet HEAD || die "Dirty tree, please clean before merging." } +# GitLab can only mirror one project at a time. This wrapper function does +# the mirroring for any other branches. +ark_git_mirror() +{ + target_branch=$1 + upstream_tree=$2 + source_branch=$3 + reset_branch=$4 + + prev_branch="$(git rev-parse --abbrev-ref HEAD)" + remote_branch="$upstream_tree/$source_branch" + git checkout "$target_branch" + git fetch -t "$upstream_tree" "$source_branch" + if test -z "$reset_branch"; then + git merge "$remote_branch" || die "git merge $remote_branch failed" + else + git reset --hard "$remote_branch" || die "git reset $remote_branch failed" + fi + git checkout "$prev_branch" +} + +# Merge wrapper in case issues arise +ark_git_merge() +{ + source_branch=$1 + target_branch=$2 + reset_branch=$3 + + prev_branch="$(git rev-parse --abbrev-ref HEAD)" + git checkout "${target_branch}" + if test -n "$reset_branch"; then + # there are cases when the initial merge is a reset + git reset --hard "$source_branch" || die "git reset $source_branch failed" + elif ! git merge -m "Merge '$source_branch' into '$target_branch'" "$source_branch"; then + git merge --abort + printf "Merge conflict; halting!\n" + printf "To reproduce:\n" + printf "* git checkout %s\n" "${target_branch}" + printf "* git merge %s\n" "${source_branch}" + die "Merge conflicts" + fi + + git checkout "$prev_branch" + return 0 +} + +ark_git_rebase() +{ + branch=$1 + upstream=$2 + base=$3 + + prev_branch="$(git rev-parse --abbrev-ref HEAD)" + git checkout "${branch}" + if ! git rebase --onto "$base" "$upstream"; then + git rebase --abort + printf "Rebase conflict; halting!\n" + printf "To reproduce:\n" + printf "* git checkout %s\n" "${branch}" + printf "* git rebase --onto %s %s\n" "${base}" "${upstream}" + die "Rebase conflicts" + fi + git checkout "$prev_branch" + return 0 +} + +ark_update_configs() +{ + branch=$1 + skip_configs=$2 + + prev_branch="$(git rev-parse --abbrev-ref HEAD)" + git checkout "${branch}" + + # Generates and commits all the pending configs + make -j FLAVOR=fedora dist-configs-commit + # Skip executing gen_config_patches.sh for new Fedora configs + + old_head="$(git rev-parse HEAD)" + make -j FLAVOR=rhel dist-configs-commit + new_head="$(git rev-parse HEAD)" + + + # Converts each new pending config from above into its finalized git + # configs/<date>/<config> branch. These commits are used for Merge + # Requests. + [ "$old_head" != "$new_head" ] && CONFIGS_ADDED="1" || CONFIGS_ADDED="" + + if test "$CONFIGS_ADDED"; then + if test -z "$skip_configs"; then + git checkout "$prev_branch" + ./redhat/scripts/genspec/gen_config_patches.sh "$branch" + fi + else + printf "No new configuration values exposed from " + printf "merging %s into $BRANCH\n" "$UPSTREAM_REF" + fi + + git checkout "$prev_branch" + test -z "$CONFIGS_ADDED" && return 0 || return 1 +} + +ark_push_changes() +{ + branch=$1 + skip_configs=$2 + + prev_branch="$(git rev-parse --abbrev-ref HEAD)" + git checkout "${branch}" + + TMPFILE=".push-warnings" + touch "$TMPFILE" + + test "$TO_PUSH" && PUSH_VERB="Pushing" || PUSH_VERB="To push" + PUSH_STR="branch ${branch} to ${GITLAB_URL}" + PUSH_CMD="git push gitlab ${branch}" + PUSH_CONFIG_STR="config update branches" + PUSH_CONFIG_CMD="for conf_branch in \$(git branch | grep configs/${branch}/\"\$(date +%F)\"); do + git push \\ + -o merge_request.create \\ + -o merge_request.target=\"$branch\" \\ + -o merge_request.remove_source_branch \\ + gitlab \"\$conf_branch\" 2>&1 | tee -a $TMPFILE + done + " + + #Push branch + echo "# $PUSH_VERB $PUSH_STR" + echo "$PUSH_CMD" + test "$TO_PUSH" && eval "$PUSH_CMD" + + #Push config branches if created + if test -z "$skip_configs"; then + echo + echo "# $PUSH_VERB $PUSH_CONFIG_STR" + echo "$PUSH_CONFIG_CMD" + test "$TO_PUSH" && eval "$PUSH_CONFIG_CMD" + fi + + # GitLab server side warnings do not fail git-push but leave verbose + # WARNING messages. Grep for those and consider it a script + # failure. Make sure all branches are pushed first as follow up + # git-pushes may succeed. + grep -q "remote:[ ]* WARNINGS" "$TMPFILE" && die "Server side warnings" + + rm "$TMPFILE" + git checkout "$prev_branch" + return 0 +} + # Common variables for all CI scripts UPSTREAM_REF=${1:-"master"} BRANCH=${2:-"os-build"} diff --git a/redhat/scripts/ci/ark-merge-rt.sh b/redhat/scripts/ci/ark-merge-rt.sh new file mode 100755 index blahblah..blahblah 100755 --- /dev/null +++ b/redhat/scripts/ci/ark-merge-rt.sh @@ -0,0 +1,131 @@ +#!/bin/bash +# +# This script is intended to sync up the RT and automotive branch (derivative +# of RT). It adds the extra twist of detecting the right upstream rt branch +# to sync with depending on the existance of the next branch. Sometimes the +# rt-devel branch waits until -rc1/2 to create new branches. +# Finally the code handles the rebases in those cases where newer branches +# are available. +# +# Why the complexity? +# Development branches will need to be periodically rebased unfortunately. +# Using 'git rebase --onto <new head> <old_head>' only works with one common +# branch to rebase from not two. Meanwhile, the -devel branches are formed +# from two upstream branches, os-build and linux-rt-devel. The idea is +# to merge the two branches into a single throwaway branch that can be +# recreated from scratch anytime then use that as the base for -devel. + +set -e + +# source common CI functions and variables +# shellcheck disable=SC1091 +. "$(dirname "$0")"/ark-ci-env.sh + +#Upstream RT tree git://git.kernel.org/pub/scm/linux/kernel/git/rt/linux-rt-devel.git +UPSTREAM_RT_TREE_NAME="linux-rt-devel" +DOWNSTREAM_RT_BRANCH="master-rt-devel" +RT_PREP_BRANCH="os-build-rt-automated" +RT_DEVEL_BRANCH="os-build-rt-devel" +AUTOMOTIVE_DEVEL_BRANCH="os-build-automotive-devel" + +# grab the os-build base branches +ark_git_mirror "os-build" "origin" "os-build" +ark_git_mirror "master" "origin" "master" + +# upstream -rt devel branches are aligned with version numbers and are not +# always up to date with master. Figure out which branch to mirror based on +# version number and existance. We may have to trigger a rebase. + +# what are the current versions of rt-devel and os-build (use 'master' to +# avoid fedora tagging of kernel-X.Y.0.0.....) +# use git tags which are always 'vX.Y-rcZ-aaa-gbbbbb' or 'vX.Y-aaa-gbbbbb' +# where X.Y is the version number that maps to linux-rt's branch of +# 'linux-X.Y.y' +get_upstream_version() +{ + branch=$1 + upstream="master" + + # Thanks to pre-rc1 merging, we have a 2 week window with an + # incorrect version number. Detect and correct. + mergebase="$(git merge-base "$branch" "$upstream")" + raw_version="$(git describe "$mergebase")" + version="$(git show "$branch":Makefile | sed -ne '/^VERSION\ =\ /{s///;p;q}')" + patchlevel="$(git show "$branch":Makefile | sed -ne '/^PATCHLEVEL\ =\ /{s///;p;q}')" + kver="${version}.${patchlevel}" + + #-rc indicates no tricks necessary, return version + if echo "${raw_version}" | grep -q -- "-rc"; then + echo "$kver" + return + fi + + #if -gXXX is _not_ there, must be a GA release, use version + if ! echo "${raw_version}" | grep -q -- "-g"; then + echo "$kver" + return + fi + + #must be a post tag release with -g but not -rcX, IOW an rc0. + #Add a 1 to the version number + echo "${version}.$((patchlevel + 1))" +} + +RT_DEVEL_VER="$(get_upstream_version "$DOWNSTREAM_RT_BRANCH")" +RT_PREP_VER="$(get_upstream_version $RT_PREP_BRANCH)" +OS_BUILD_VER="$(get_upstream_version os-build)" + +# Grab possible rt branches to choose from +RT_FETCH_BRANCH="linux-${RT_DEVEL_VER}.y-rt" +RT_REBASE_FETCH_BRANCH="linux-${OS_BUILD_VER}.y-rt" +RT_MERGE_BRANCH="$RT_FETCH_BRANCH" +OS_BUILD_BASE_BRANCH="os-build" + +if test "$RT_DEVEL_VER" != "$OS_BUILD_VER"; then + # does the newer version branch exist in linux-rt-devel yet? + if ! git fetch "$UPSTREAM_RT_TREE_NAME" "$RT_REBASE_FETCH_BRANCH"; then + # no newer upstream branch to rebase onto, continue with an + # os-build stable tag + OS_BUILD_BASE_BRANCH="kernel-${RT_DEVEL_VER}.0-0" + RT_REBASE="" + else + # rebase time + RT_MERGE_BRANCH="$RT_REBASE_FETCH_BRANCH" + RT_REBASE="yes" + fi +fi + +# sanity check, sometimes broken scripts leave a mess +if test "$RT_DEVEL_VER" != "$RT_PREP_VER"; then + RT_REBASE="yes" +fi + +## PREP the upstream branches +# on a rebase, propogate all the git resets +# fetch the determined rt-devel branch +ark_git_mirror "$DOWNSTREAM_RT_BRANCH" "$UPSTREAM_RT_TREE_NAME" "$RT_MERGE_BRANCH" "$RT_REBASE" +# finally merge the two correct branches +old_RT_PREP_BRANCH="$(git rev-parse $RT_PREP_BRANCH)" # for ark_git_rebase +ark_git_merge "$OS_BUILD_BASE_BRANCH" "$RT_PREP_BRANCH" "$RT_REBASE" +ark_git_merge "$DOWNSTREAM_RT_BRANCH" "$RT_PREP_BRANCH" + +## MERGE the upstream branches to the development branches +if test -n "$RT_REBASE"; then + # handle the rebase + ark_git_rebase "$RT_DEVEL_BRANCH" "$old_RT_PREP_BRANCH" "$RT_PREP_BRANCH" + ark_git_rebase "$AUTOMOTIVE_DEVEL_BRANCH" "$old_RT_PREP_BRANCH" "$RT_PREP_BRANCH" +fi + +## Build -rt-devel branch, generate pending-rhel configs +ark_git_merge "$RT_PREP_BRANCH" "$RT_DEVEL_BRANCH" +# don't care if configs were added or not hence '|| true' +ark_update_configs "$RT_DEVEL_BRANCH" || true +# skip pushing config update MRs, keep them in pending-rhel +ark_push_changes "$RT_DEVEL_BRANCH" "skip" + +## Build -automotive-devel branch, generate pending-rhel configs +ark_git_merge "$RT_PREP_BRANCH" "$AUTOMOTIVE_DEVEL_BRANCH" +# don't care if configs were added or not hence '|| true' +ark_update_configs "$AUTOMOTIVE_DEVEL_BRANCH" || true +# skip pushing config update MRs, keep them in pending-rhel +ark_push_changes "$AUTOMOTIVE_DEVEL_BRANCH" "skip" -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2732

1 0

[OS-BUILD PATCH] Flip values for FSCACHE and NETFS_SUPPORT to avoid mismatch
by Justin M. Forbes (via Email Bridge) 22 Jan '24

22 Jan '24

From: Justin M. Forbes <jforbes(a)fedoraproject.org> Flip values for FSCACHE and NETFS_SUPPORT to avoid mismatch Upstream commit 915cd30cdea88 combines fscache and netfs. This resulted in a config mismatch. This update puts us back to where we were within the new code. Signed-off-by: Justin M. Forbes <jforbes(a)fedoraproject.org> diff --git a/redhat/configs/pending-rhel/generic/CONFIG_FSCACHE b/redhat/configs/rhel/generic/CONFIG_FSCACHE rename from redhat/configs/pending-rhel/generic/CONFIG_FSCACHE rename to redhat/configs/rhel/generic/CONFIG_FSCACHE index blahblah..blahblah 100644 --- a/redhat/configs/pending-rhel/generic/CONFIG_FSCACHE +++ b/redhat/configs/rhel/generic/CONFIG_FSCACHE diff --git a/redhat/configs/pending-rhel/generic/CONFIG_NETFS_SUPPORT b/redhat/configs/rhel/generic/CONFIG_NETFS_SUPPORT rename from redhat/configs/pending-rhel/generic/CONFIG_NETFS_SUPPORT rename to redhat/configs/rhel/generic/CONFIG_NETFS_SUPPORT index blahblah..blahblah 100644 --- a/redhat/configs/pending-rhel/generic/CONFIG_NETFS_SUPPORT +++ b/redhat/configs/rhel/generic/CONFIG_NETFS_SUPPORT diff --git a/redhat/configs/pending-rhel/generic/s390x/zfcpdump/CONFIG_CACHEFILES b/redhat/configs/rhel/generic/s390x/zfcpdump/CONFIG_CACHEFILES rename from redhat/configs/pending-rhel/generic/s390x/zfcpdump/CONFIG_CACHEFILES rename to redhat/configs/rhel/generic/s390x/zfcpdump/CONFIG_CACHEFILES index blahblah..blahblah 100644 --- a/redhat/configs/pending-rhel/generic/s390x/zfcpdump/CONFIG_CACHEFILES +++ b/redhat/configs/rhel/generic/s390x/zfcpdump/CONFIG_CACHEFILES -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2904

1 0

Re: 2024-01-22 @ 16:00 UTC - Fedora QA Meeting
by Luna Jernberg 22 Jan '24

22 Jan '24

Hey! Will try to join today, has so far helped a bit during the Kernel 6.7 test week that goes on at the moment Den sön 21 jan. 2024 kl 18:32 skrev Adam Williamson <awilliam(a)redhat.com>: > > # Fedora Quality Assurance Meeting > # Date: 2024-01-22 > # Time: 16:00 UTC > (https://fedoraproject.org/wiki/Infrastructure/UTCHowto) > # Location: > https://matrix.to/#/#meeting:fedoraproject.org?web-instance[element.io]=cha… > > Greetings testers! It's meeting time again, and once again we'll > be on Matrix. > > If anyone has any other items for the agenda, please reply to this > email and suggest them! Thanks. > > == Proposed Agenda Topics == > > 1. Previous meeting follow-up > 2. Fedora 40 Change review and check-in > 3. Test Day / community event status > 4. Open floor > -- > Adam Williamson (he/him/his) > Fedora QA > Fedora Chat: @adamwill:fedora.im | Mastodon: @adamw@fosstodon.org > https://www.happyassassin.net > > > > -- > _______________________________________________ > test mailing list -- test(a)lists.fedoraproject.org > To unsubscribe send an email to test-leave(a)lists.fedoraproject.org > Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ > List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines > List Archives: https://lists.fedoraproject.org/archives/list/test@lists.fedoraproject.org > Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue

1 0

✅ PASS (MISSED 5 of 118): Test report for 6.7.1-200.fc39 (kernel-fedora)
by cki-project＠redhat.com 21 Jan '24

21 Jan '24

Hi, we tested your kernel and here are the results: Overall result: PASSED Merge: OK Compile: OK Test: OK Tested-by: CKI Project <cki-project(a)redhat.com> Kernel information: Brew / Koji Task ID: 112112719 You can find all the details about the test run at https://datawarehouse.cki-project.org/kcidb/checkouts/124582 One or more kernel tests failed: We also see the following known issues which are not related to your changes: Issue: NFS Connectathon: SELinux prevents rpcbind URL: https://bugzilla.redhat.com/1758147 Affected tests: x86_64 - Filesystem - NFS Connectathon Tests that were not ran because of internal issues: s390x - stress: stress-ng - interrupt s390x - stress: stress-ng - cpu s390x - stress: stress-ng - cpu-cache s390x - stress: stress-ng - memory s390x - Reboot test If you find a failure unrelated to your changes, please ask the test maintainer to review it. This will prevent the failures from being incorrectly reported in the future. Please reply to this email if you have any questions about the tests that we ran or if you have any suggestions on how to make future tests more effective. ,-. ,-. ( C ) ( K ) Continuous `-',-.`-' Kernel ( I ) Integration `-' ______________________________________________________________________________

1 0

[OS-BUILD PATCHv7 0/3] redhat/Makefile: fix and clean up some of the logic
by Ondrej Mosnáček (via Email Bridge) 21 Jan '24

21 Jan '24

From: Ondrej Mosnáček on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2892 (see individual commits for explanation) Signed-off-by: Ondrej Mosnacek <omosnace(a)redhat.com> --- redhat/self-test/data/centos-2585cf9dfaad.el7 | 4 ++-- redhat/self-test/data/centos-2585cf9dfaad.fc25 | 4 ++-- redhat/self-test/data/centos-78e36f3b0dae.el7 | 4 ++-- redhat/self-test/data/centos-78e36f3b0dae.fc25 | 4 ++-- redhat/self-test/data/centos-df0cc57e057f.el7 | 4 ++-- redhat/self-test/data/centos-df0cc57e057f.fc25 | 4 ++-- redhat/self-test/data/centos-fce15c45d3fb.el7 | 4 ++-- redhat/self-test/data/centos-fce15c45d3fb.fc25 | 4 ++-- redhat/self-test/data/create-data.sh | 2 +- redhat/self-test/data/fedora-2585cf9dfaad.el7 | 4 ++-- redhat/self-test/data/fedora-2585cf9dfaad.fc25 | 4 ++-- redhat/self-test/data/fedora-78e36f3b0dae.el7 | 4 ++-- redhat/self-test/data/fedora-78e36f3b0dae.fc25 | 4 ++-- redhat/self-test/data/fedora-df0cc57e057f.el7 | 4 ++-- redhat/self-test/data/fedora-df0cc57e057f.fc25 | 4 ++-- redhat/self-test/data/fedora-fce15c45d3fb.el7 | 4 ++-- redhat/self-test/data/fedora-fce15c45d3fb.fc25 | 4 ++-- redhat/self-test/data/rhel-2585cf9dfaad.el7 | 4 ++-- redhat/self-test/data/rhel-2585cf9dfaad.fc25 | 4 ++-- redhat/self-test/data/rhel-78e36f3b0dae.el7 | 4 ++-- redhat/self-test/data/rhel-78e36f3b0dae.fc25 | 4 ++-- redhat/self-test/data/rhel-df0cc57e057f.el7 | 4 ++-- redhat/self-test/data/rhel-df0cc57e057f.fc25 | 4 ++-- redhat/self-test/data/rhel-fce15c45d3fb.el7 | 4 ++-- redhat/self-test/data/rhel-fce15c45d3fb.fc25 | 4 ++-- redhat/Makefile | 26 +++++++++++++------------- 26 files changed, 62 insertions(+), 62 deletions(-)

1 3

[OS-BUILD PATCHv6 0/3] redhat/Makefile: fix and clean up some of the logic
by Ondrej Mosnáček (via Email Bridge) 21 Jan '24

21 Jan '24

From: Ondrej Mosnáček on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2892 (see individual commits for explanation) Signed-off-by: Ondrej Mosnacek <omosnace(a)redhat.com> --- redhat/self-test/data/centos-2585cf9dfaad.el7 | 4 ++-- redhat/self-test/data/centos-2585cf9dfaad.fc25 | 4 ++-- redhat/self-test/data/centos-78e36f3b0dae.el7 | 4 ++-- redhat/self-test/data/centos-78e36f3b0dae.fc25 | 4 ++-- redhat/self-test/data/centos-df0cc57e057f.el7 | 4 ++-- redhat/self-test/data/centos-df0cc57e057f.fc25 | 4 ++-- redhat/self-test/data/centos-fce15c45d3fb.el7 | 4 ++-- redhat/self-test/data/centos-fce15c45d3fb.fc25 | 4 ++-- redhat/self-test/data/fedora-2585cf9dfaad.el7 | 4 ++-- redhat/self-test/data/fedora-2585cf9dfaad.fc25 | 4 ++-- redhat/self-test/data/fedora-78e36f3b0dae.el7 | 4 ++-- redhat/self-test/data/fedora-78e36f3b0dae.fc25 | 4 ++-- redhat/self-test/data/fedora-df0cc57e057f.el7 | 4 ++-- redhat/self-test/data/fedora-df0cc57e057f.fc25 | 4 ++-- redhat/self-test/data/fedora-fce15c45d3fb.el7 | 4 ++-- redhat/self-test/data/fedora-fce15c45d3fb.fc25 | 4 ++-- redhat/self-test/data/rhel-2585cf9dfaad.el7 | 4 ++-- redhat/self-test/data/rhel-2585cf9dfaad.fc25 | 4 ++-- redhat/self-test/data/rhel-78e36f3b0dae.el7 | 4 ++-- redhat/self-test/data/rhel-78e36f3b0dae.fc25 | 4 ++-- redhat/self-test/data/rhel-df0cc57e057f.el7 | 4 ++-- redhat/self-test/data/rhel-df0cc57e057f.fc25 | 4 ++-- redhat/self-test/data/rhel-fce15c45d3fb.el7 | 4 ++-- redhat/self-test/data/rhel-fce15c45d3fb.fc25 | 4 ++-- redhat/Makefile | 26 +++++++++++++------------- 25 files changed, 61 insertions(+), 61 deletions(-)

1 3

← Newer
1
2
3
4
5
6
7
8
9
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

kernel January 2024