From: Don Zickus <[email protected]> Enable merge-rt pipeline
Add the gitlab-ci.yaml changes to enable a scheduled pipeline. Also modify the ark-merge-rt.sh script to use OS_BUILD_BASE as the base for the rt and automotive branches if they don't already exist. This avoids the giant config creation output if we use upstream-rt as the base and merge in os-build. The problem with that output is it overflows the gitlab ci output buffer and you can't see the full output. This is only seen the first time it is created or when run locally for the first time. Signed-off-by: Don Zickus <[email protected]> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index blahblah..blahblah 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -446,6 +446,16 @@ rawhide_release: - *only-os-build-schedule - if: $RAWHIDE_RELEASE == "true" +merge_rt_automotive: + extends: .scheduled_setup + script: + - git remote add linux-rt-devel git://git.kernel.org/pub/scm/linux/kernel/git/rt/linux-rt-devel.git + - DIST_PUSH=1 redhat/scripts/ci/ark-merge-rt.sh + retry: 2 + rules: + - *only-os-build-schedule + - if: $RAWHIDE_RELEASE == "rt" + test_makefile: image: quay.io/fedora/fedora:rawhide variables: diff --git a/redhat/scripts/ci/ark-merge-rt.sh b/redhat/scripts/ci/ark-merge-rt.sh index blahblah..blahblah 100755 --- a/redhat/scripts/ci/ark-merge-rt.sh +++ b/redhat/scripts/ci/ark-merge-rt.sh @@ -103,18 +103,6 @@ else die "Neither version ($OS_BUILD_VER, $OS_BUILD_VER_prev) in upstream tree: $UPSTREAM_RT_TREE_NAME" fi -# verify the core branches exist or use provided defaults -UPSTREAM_RT_DEVEL_BRANCH="linux-${UPSTREAM_RT_DEVEL_VER}.y-rt" -ark_git_branch "$DOWNSTREAM_RT_BRANCH" "$UPSTREAM_RT_TREE_NAME/$UPSTREAM_RT_DEVEL_BRANCH" -ark_git_branch "$RT_AUTOMATED_BRANCH" "$UPSTREAM_RT_TREE_NAME/$UPSTREAM_RT_DEVEL_BRANCH" -ark_git_branch "$RT_DEVEL_BRANCH" "$UPSTREAM_RT_TREE_NAME/$UPSTREAM_RT_DEVEL_BRANCH" -ark_git_branch "$AUTOMOTIVE_DEVEL_BRANCH" "$UPSTREAM_RT_TREE_NAME/$UPSTREAM_RT_DEVEL_BRANCH" - -MASTER_RT_DEVEL_VER="$(get_upstream_version "$DOWNSTREAM_RT_BRANCH")" -RT_AUTOMATED_VER="$(get_upstream_version $RT_AUTOMATED_BRANCH)" -RT_DEVEL_VER="$(get_upstream_version $RT_DEVEL_BRANCH)" -AUTOMOTIVE_DEVEL_VER="$(get_upstream_version $AUTOMOTIVE_DEVEL_BRANCH)" - OS_BUILD_BASE_BRANCH="os-build" RT_REBASE="" @@ -124,6 +112,18 @@ if test "$UPSTREAM_RT_DEVEL_VER" != "$OS_BUILD_VER"; then OS_BUILD_BASE_BRANCH="kernel-${MASTER_RT_DEVEL_VER}.0-0" fi +# verify the core branches exist or use provided defaults +UPSTREAM_RT_DEVEL_BRANCH="linux-${UPSTREAM_RT_DEVEL_VER}.y-rt" +ark_git_branch "$DOWNSTREAM_RT_BRANCH" "$UPSTREAM_RT_TREE_NAME/$UPSTREAM_RT_DEVEL_BRANCH" +ark_git_branch "$RT_AUTOMATED_BRANCH" "$OS_BUILD_BASE_BRANCH" +ark_git_branch "$RT_DEVEL_BRANCH" "$OS_BUILD_BASE_BRANCH" +ark_git_branch "$AUTOMOTIVE_DEVEL_BRANCH" "$OS_BUILD_BASE_BRANCH" + +MASTER_RT_DEVEL_VER="$(get_upstream_version "$DOWNSTREAM_RT_BRANCH")" +RT_AUTOMATED_VER="$(get_upstream_version $RT_AUTOMATED_BRANCH)" +RT_DEVEL_VER="$(get_upstream_version $RT_DEVEL_BRANCH)" +AUTOMOTIVE_DEVEL_VER="$(get_upstream_version $AUTOMOTIVE_DEVEL_BRANCH)" + # sanity check, sometimes broken scripts leave a mess if test "$MASTER_RT_DEVEL_VER" != "$UPSTREAM_RT_DEVEL_VER" -o \ "$MASTER_RT_DEVEL_VER" != "$RT_AUTOMATED_VER" -o \ -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2942 -- _______________________________________________ kernel mailing list -- [email protected] To unsubscribe send an email to [email protected] 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/[email protected] Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
