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

Add support for Debian repos and new versioned repo structure. #106

Merged
merged 1 commit into from
May 21, 2019

Conversation

olifre
Copy link
Collaborator

@olifre olifre commented Feb 25, 2019

This PR adds two features:

  • Initial support for Debian and Ubuntu. Just adding the repositories is sufficient. We are using at least schedds on Ubuntu successfully. This adds puppetlabs/apt as a dependency.
  • Adapting to the new repository structure of HTCondor.

HTCondor restructured their repositories with 8.8 from the old previous / stable / development to versioned subdirectories. This means updates are significantly less surprising as compared to the past workflow when stable contained 8.4 and was suddenly replaced by 8.6 over night.

For backwards compatibility, the flag versioned_repositories is false by default, and the "old" repositories are still used. To accomodate the new URLs, condor_major_version (defaulting to 8.8 which is the first version in a versioned repository) can be set.

Things are still a bit awkward upstream, i.e. 8.7 is not versioned yet, so dev_repositories still has some relevance. For Debian / Ubuntu, though, I only implemented the versioned_repositories and from the repository path, the notion of stable and development is gone there since that's essentially contained in 8.7 or 8.8.

@kreczko
Copy link
Member

kreczko commented May 21, 2019

@olifre sorry for the delays seems that I am the only one left that still merges.

Would you be interested in elevated permissions for this repo? I've just added automated deployment to PuppetForge so only PRs & tags need to be taken care off.

@kreczko kreczko merged commit 038b288 into HEP-Puppet:master May 21, 2019
@olifre olifre deleted the debian_and_versioned_repos branch May 21, 2019 22:03
@olifre
Copy link
Collaborator Author

olifre commented May 22, 2019

Would you be interested in elevated permissions for this repo? I've just added automated deployment to PuppetForge so only PRs & tags need to be taken care off.

Took me a long time to answer here... Even though my time is also very limited and I only get to open PRs if we need something which is missing, I think it would be helpful to be allowed to merge PRs since it might reduce load on you. However, I also a strong fan of having a second pair of eyes checking code before it goes in, and since (often) most PRs are by myself, this rule would be violated 😉. That's what's making me unsure about it.

So after the automation, you basically only have to commit 7062f1f and everything happens automatically?
Is the changelog entry / commit message (partially) autogenerated with some tooling, or done manually?

@kreczko
Copy link
Member

kreczko commented May 23, 2019

However, I also a strong fan of having a second pair of eyes checking code before it goes in, and since (often) most PRs are by myself, this rule would be violated wink. That's what's making me unsure about it.

That's very good :). I was not implying to merge your own PRs, just the others, e.g. from @ccnifo .
Ideally, I would like to add @ccnifo to the maintainers as well, if they are interested.

So after the automation, you basically only have to commit 7062f1f and everything happens automatically?
Is the changelog entry / commit message (partially) autogenerated with some tooling, or done manually?

A new release can be created by

export RELEASE=X.Y.Z
export CHANGELOG_GITHUB_TOKEN=<your github token> # for creating the changelog
make release

make release will update the version number in the relevant places, run github_changelog_generator and printout a set of git commands that need to be run:

"Check everything and if OK, execute"
git add -u
git commit -m "tagged version ${RELEASE}"
git push upstream master
git tag v${RELEASE}
git push upstream v${RELEASE}

with $RELEASE filled in.

Some of this is available in the README, if more clarity is required I can add it there.

@olifre
Copy link
Collaborator Author

olifre commented May 23, 2019

I was not implying to merge your own PRs, just the others, e.g. from @ccnifo . Ideally, I would like to add @ccnifo to the maintainers as well, if they are interested.

Perfect - then I'm all for it! 👍

I did indeed completely miss the Makefile. Yes, that fully explains it ;-). Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants