search

linux-system-roles / auto-maintenance

Linux system roles wide automated repo maintenance
MIT License
25 stars 15 forks source link

script to help sync between two dist-git repos #293

Closed richm closed 1 year ago

spetrosi commented 1 year ago

Can you provide some more info on when to use this?

richm commented 1 year ago

Can you provide some more info on when to use this?

Right now I'm using it to ensure the Fedora eln branch https://src.fedoraproject.org/rpms/linux-system-roles/tree/eln is in sync with the centos stream c9s branch https://gitlab.com/redhat/centos-stream/rpms/rhel-system-roles/-/tree/c9s?ref_type=heads when I update the c9s branch, I run the script to apply the changes to the eln branch

spetrosi commented 1 year ago

Do you run the script from a fedora or from centos repo? And how exactly do you run it? I'll use it for syncing ansible-collection-microsoft-sql too.

richm commented 1 year ago

Do you run the script from a fedora or from centos repo? And how exactly do you run it? I'll use it for syncing ansible-collection-microsoft-sql too.

I have a local directory in which I work on rpm packaging for all of fedora, centos, and rhel. I have git remotes for all of them. It was originally cloned from fedora dist-git linux-system-roles, then I added remotes for centos and rhel.

> pwd
~/fedpkg/linux-system-roles
> git remote -v
cs      https://gitlab.com/redhat/centos-stream/rpms/rhel-system-roles.git (fetch)
cs      https://gitlab.com/redhat/centos-stream/rpms/rhel-system-roles.git (push)
cs-richm        git+ssh://git@gitlab.com/richm2/rhel-system-roles.git (fetch)
cs-richm        git+ssh://git@gitlab.com/richm2/rhel-system-roles.git (push)
origin  ssh://rmeggins@pkgs.fedoraproject.org/rpms/linux-system-roles (fetch)
origin  ssh://rmeggins@pkgs.fedoraproject.org/rpms/linux-system-roles (push)
rh      ssh://rmeggins@RH_DIST_GIT/rpms/rhel-system-roles (fetch)
rh      ssh://rmeggins@RH_DIST_GIT/rpms/rhel-system-roles (push)
rh-gl-richm     ssh://git@gitlab.com/richm2/rh-rhel-system-roles.git (fetch)
rh-gl-richm     ssh://git@gitlab.com/richm2/rh-rhel-system-roles.git (push)
rmeggins        ssh://rmeggins@pkgs.fedoraproject.org/forks/rmeggins/rpms/linux-system-roles.git (fetch)
rmeggins        ssh://rmeggins@pkgs.fedoraproject.org/forks/rmeggins/rpms/linux-system-roles.git (push)

The remote cs is centos and has the c9s branch. This assumes you have already done the update in centos, and done a git pull so that your local cs/c9s branch is up-to-date. so I run the script like this:

dry_run=false ~/linux-system-roles/auto-maintenance/sync-with-dist-git.sh -s c9s origin eln

Once this is done, you will be in the eln branch, and can do a fedpkg build.