[OS-BUILD PATCHv4] Export ark infrastructure files

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



From: Don Zickus <dzickus@xxxxxxxxxx>

Export ark infrastructure files

Allow developers to use the ark infrastructure work on upstream
git trees.  This change saves the redhat/ plus supporting files
on top of the 'master' branch.

A developer can then 'git merge ark-infra' to apply this
infrastructure.

"NO_CONFIGCHECKS make dist-configs" to create the configs. And
away they go.

Utilize the daily rawhide_release builds to create this branch.  It
fits with the theme and is quick and easy to do in this job.  Note
I use the 'ark-latest' as the source of the export.  This should
include any environment fixes for the developer.

Tested by copy-n-pasting manual each step in the script to generate
the original ark-infra branch.  The gitlab-ci.yml change should be
intuitive enough to skip testing.

V2: Use git-archive and better sed regexp
V3: remove git reset and sed
V4: added comment about kabi-module (no new changes)

diff a/.gitlab-ci.yml b/.gitlab-ci.yml
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -100,6 +100,7 @@ rawhide_release:
   script:
     - git checkout --track origin/master && git describe
     - git checkout --track origin/ark-latest && git describe
+    - git checkout --track origin/ark-infra && git describe
     - git checkout --track origin/os-build && git describe
     - export PROJECT_ID="$CI_PROJECT_ID"
     - redhat/scripts/ci/ark-create-release.sh "master" "$CI_PROJECT_ID" || exit_code=$?
@@ -117,6 +118,7 @@ rawhide_release:
     - git push gitlab "$(git describe)"
     - git push gitlab ark/*
     - git push -f gitlab ark-latest
+    - git push -f gitlab ark-infra
   retry: 2
   rules:
     - if: '$CI_PIPELINE_SOURCE == "schedule" && $RAWHIDE_RELEASE == "true"'
diff a/redhat/scripts/ci/ark-create-release.sh b/redhat/scripts/ci/ark-create-release.sh
--- a/redhat/scripts/ci/ark-create-release.sh
+++ b/redhat/scripts/ci/ark-create-release.sh
@@ -57,6 +57,24 @@ RELEASE=$(git describe)
 git checkout ark-latest
 git reset --hard "$RELEASE"
 
+# Update ark-infra branch
+git checkout ark-infra
+
+# Using ark-latest because it has latest fixes
+rm -rf makefile Makefile.rhelver redhat/
+git archive --format=tar ark-latest makefile Makefile.rhelver redhat/ | tar -x
+
+# Manually add hook instead of cherry-pick
+# Add to middle to avoid git merge conflicts
+# NOTE: commented out but left for future info to rebuild from scratch
+# sed -i '/# We are using a recursive / i include Makefile.rhelver\n' Makefile
+
+git add makefile Makefile.rhelver Makefile redhat
+# Future rebuid note, .gitkeep files are gitignored and need force adding
+# git add -f redhat/kabi/kabi-module/kabi*
+
+git commit -m "bulk merge ark-infra as of $(date)"
+
 printf "All done!
 
 To push all the release artifacts, run:

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/968
_______________________________________________
kernel mailing list -- kernel@xxxxxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to kernel-leave@xxxxxxxxxxxxxxxxxxxxxxx
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/kernel@xxxxxxxxxxxxxxxxxxxxxxx
Do not reply to spam on the list, report it: https://pagure.io/fedora-infrastructure




[Index of Archives]     [Fedora General Discussion]     [Older Fedora Users Archive]     [Fedora Advisory Board]     [Fedora Security]     [Fedora Devel Java]     [Fedora Legacy]     [Fedora Desktop]     [ATA RAID]     [Fedora Marketing]     [Fedora Mentors]     [Fedora Package Announce]     [Fedora Package Review]     [Fedora Music]     [Fedora Packaging]     [Centos]     [Fedora SELinux]     [Coolkey]     [Yum Users]     [Tux]     [Yosemite News]     [KDE Users]     [Fedora Art]     [Fedora Docs]     [USB]     [Asterisk PBX]

  Powered by Linux