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

DLPX-91971 linux-pkg: Add support for os-upgrade branches #320

Conversation

palash-gandhi
Copy link
Contributor

@palash-gandhi palash-gandhi commented Aug 22, 2024

Problem

Ubuntu version upgrade projects require an "os-upgrade" branch in product repositories. Instead of requiring this branch in each repository, we can make the linux-pkg framework use the "develop" branch if the "os-upgrade" branch of a package repository does not exist. This makes branch management slightly easier. This also means that "os-upgrade" branches must be deleted after use.

Solution

Add logic to use "develop" when "os-upgrade" does not exist while building the package.

Testing Done

challenge-response (has an "os-upgrade" branch): http://ops.jenkins-palashgandhi.dcol2.delphix.com/job/linux-pkg/job/os-upgrade/job/build-package/job/challenge-response/job/post-push/5/console.
Failures are expected due to pending fixes on the os-upgrade branch: https://github.com/delphix/challenge-response/pull/5

bcc (does not have an "os-upgrade" branch): http://ops.jenkins-palashgandhi.dcol2.delphix.com/job/linux-pkg/job/os-upgrade/job/build-package/job/bcc/job/post-push/5/console

@palash-gandhi palash-gandhi force-pushed the dlpx/pr/palash-gandhi/9a4d3e3e-1a25-46b0-994b-1a0bfe34b0a7 branch 5 times, most recently from a2df1c5 to dbd5cdb Compare August 23, 2024 17:25
@palash-gandhi palash-gandhi changed the base branch from os-upgrade to develop August 27, 2024 17:25
@palash-gandhi palash-gandhi force-pushed the dlpx/pr/palash-gandhi/9a4d3e3e-1a25-46b0-994b-1a0bfe34b0a7 branch from dbd5cdb to d81ce6e Compare August 27, 2024 17:32
@palash-gandhi palash-gandhi marked this pull request as ready for review August 27, 2024 17:38
@palash-gandhi palash-gandhi force-pushed the dlpx/pr/palash-gandhi/9a4d3e3e-1a25-46b0-994b-1a0bfe34b0a7 branch from d81ce6e to 586cb7e Compare August 27, 2024 18:11
@palash-gandhi palash-gandhi force-pushed the dlpx/pr/palash-gandhi/9a4d3e3e-1a25-46b0-994b-1a0bfe34b0a7 branch from 586cb7e to d28c963 Compare August 27, 2024 18:30
@palash-gandhi palash-gandhi force-pushed the dlpx/pr/palash-gandhi/9a4d3e3e-1a25-46b0-994b-1a0bfe34b0a7 branch from d28c963 to f37b478 Compare August 27, 2024 18:59
@palash-gandhi palash-gandhi enabled auto-merge (squash) August 28, 2024 15:44
@palash-gandhi palash-gandhi merged commit b5cb3be into develop Aug 28, 2024
12 checks passed
@palash-gandhi palash-gandhi deleted the dlpx/pr/palash-gandhi/9a4d3e3e-1a25-46b0-994b-1a0bfe34b0a7 branch August 28, 2024 17:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

3 participants