Skip to content

Backport changes needed to have linux-pkg run on 6.0/migration#155

Merged
5 commits merged into6.0/migrationfrom
unknown repository
May 5, 2021
Merged

Backport changes needed to have linux-pkg run on 6.0/migration#155
5 commits merged into6.0/migrationfrom
unknown repository

Conversation

@ghost
Copy link
Copy Markdown

@ghost ghost commented May 3, 2021

Context:

https://jira.delphix.com/browse/TOOL-7953 tracks the removal of all Jenkins jobs from non devops-gate repositories. This includes the build-package job. The build-package job can only be removed from branches that support the new linux-pkg build system 6.0/migration is the last in-use branch that does not support linux-pkg.

Problem:

6.0/migration does not support the linux-pkg build system

Solution:

Backport support to this branch

Testing

  1. Start the ops container
  2. Run generate-jobs and modify the jobs.json blob to contain a link to my fork (http://github.com/jtamagnan-delphix/linux-pkg.git)
  3. Run http://collins.d.delphix.com:20460/job/devops-gate/job/master/job/upgrade-verify/job/master/job/post-push/1/ job to generate an artifact that would be used later on
  4. Start the bulid-package job:

http://collins.d.delphix.com:20460/job/devops-gate/job/master/job/linux-pkg/job/6.0/job/migration/job/build-packages/job/pre-push/9/console

  1. Once the build-packages job finished I was able to kick off appliance-build-orchestrator-pre-push:
  • set UPSTREAM_PRODUCT_BRANCH=6.0/migration
  • set COMBINED_PACKAGES_S3_URL=s3://dev-de-images/builds/jenkins-ops.jtamagnan/devops-gate/master/linux-pkg/6.0/migration/combine-packages/pre-push/3

http://selfservice.jenkins.delphix.com/job/devops-gate/job/master/job/appliance-build-orchestrator-pre-push/5187/console

Notes about the appliance-build-orchestrator-pre-push job:

Implementation:

I backported four diffs that were sent to me by Prakash:

I also found that I needed to backport:

Related diffs:

Pipeline-shared change to mark 6.0/migration as a linux-pkg branch: http://reviews.delphix.com/r/68916/

Deployment Plan:

For the moment my plan will be to:

  • Push this change
  • Push the pipeline shared change
  • [at this point the changes will take effect others diffs will be cleanup]
  • Push the change to remove the build-package job usage from the devops-gate
  • Remove the build-package job from the dms-core-gate and dlpx-app-gate

@ghost ghost marked this pull request as ready for review May 4, 2021 17:47
@ghost
Copy link
Copy Markdown
Author

ghost commented May 4, 2021

Requesting reviews from @pzakha and @prakashsurya

@prakashsurya
Copy link
Copy Markdown
Contributor

Changes seem reasonable, it's just pulling things from other branches.

I don't know how the 6.0/migration branch is maintained, so I can't say if this is OK to land or not; will have to defer to others on that.

I don't think you can land the changes to main.pkgs at the same time you land the changes to add those packages to the linux-pkg ecosystem. I think you need to first add the packages to linux-pkg, then go a build the packages via Jenkins, then add the package names to main.pkgs.

Copy link
Copy Markdown
Contributor

@pzakha pzakha left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks for landing this.

I don't think you can land the changes to main.pkgs at the same time you land the changes to add those packages to the linux-pkg ecosystem. I think you need to first add the packages to linux-pkg, then go a build the packages via Jenkins, then add the package names to main.pkgs.

@prakashsurya that's right, you shouldn't be doing this on any active branch as once this lands the combine-packages job will be failing until generate-jobs is run and the new packages are built and published, however given that the 6.0/migration branch is on standby and the are no pending builds it's okay to do it in this case.

@ghost ghost merged commit 3f684c6 into delphix:6.0/migration May 5, 2021
This pull request was closed.
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.

2 participants