Skip to content

TOOL-13555 disable syncing upstream with zfs master branch#230

Merged
prakashsurya merged 1 commit intomasterfrom
dlpx/pr/prakashsurya/775c265e-5f82-41cd-96de-e1ccf82207d4
Apr 21, 2022
Merged

TOOL-13555 disable syncing upstream with zfs master branch#230
prakashsurya merged 1 commit intomasterfrom
dlpx/pr/prakashsurya/775c265e-5f82-41cd-96de-e1ccf82207d4

Conversation

@prakashsurya
Copy link
Copy Markdown
Contributor

No description provided.

@prakashsurya prakashsurya marked this pull request as ready for review April 20, 2022 15:04
@prakashsurya prakashsurya requested review from grwilson and sebroy April 20, 2022 15:04
@prakashsurya
Copy link
Copy Markdown
Contributor Author

The code is a bit difficult to decipher, but I think with this code change landed to master, it'll disable this job from running: http://ops.jenkins.delphix.com/job/linux-pkg/job/master/job/update-package/job/zfs/

@sebroy
Copy link
Copy Markdown
Contributor

sebroy commented Apr 20, 2022

How does linux-pkg know what upstream repo and branch to sync 6.0/stage from?

@prakashsurya
Copy link
Copy Markdown
Contributor Author

prakashsurya commented Apr 20, 2022

How does linux-pkg know what upstream repo and branch to sync 6.0/stage from?

This is only changing the master branch, the 6.0/branch still has this logic.. so when we checkout the 6.0/branch of linux-pkg via Jenkins, to do the sync of upstream-master to downstream-6.0/stage, it'll have this logic..

Additionally, linux-pkg uses the DEFAULT_GIT_BRANCH variable to know which branch to sync upstream into.. on master that's configured to master, and on 6.0/stage that's configured to 6.0/stage.. So, I believe when we move the automation to sync upstream to 6.0/stage, it'll have UPSTREAM_GIT_BRANCH="master" still set (since we won't backport this change), and DEFAULT_GIT_BRANCH="6.0/stage" set..

With all that said, IMO at least, this is all difficult to reason about.. and has strange inter-dependencies between different components and scripts in linux-pkg and the devops-gate.. so honestly, I can't say that I'm sure I understand it all correctly.. but based on my reading so far, this is how I think the Rube Goldberg machine works..

@prakashsurya prakashsurya merged commit 762b9fd into master Apr 21, 2022
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