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

fix(artifacts): don't output buildArtifacts as korkArtifacts #3417

Merged
merged 1 commit into from
Feb 7, 2020

Conversation

asher
Copy link
Contributor

@asher asher commented Feb 7, 2020

No description provided.

if (artifacts == null) {
artifacts = new ArrayList<>();
}
artifacts.addAll(stageDefinition.getBuildInfo().getArtifacts());
Copy link
Contributor Author

@asher asher Feb 7, 2020

Choose a reason for hiding this comment

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

@jervi This essentially reverts a small part of your recent PR, #3408. It appears to have triggered a latent regression in PackageInfo.findTargetPackage() that only surfaces when CreateBakeTask is passed a fully qualified package name with suffix (i.e. "orca-1.2358.0-h333.bb7d1a2-x86_64.deb" instead of just "orca"). This is a pattern in use by a few teams at Netflix, hence the revert here. I haven't succeeded at unwinding the behavior in findTargetPacakge that this impacts.

Copy link
Contributor

Choose a reason for hiding this comment

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

Hmm, I'll try to figure out a fix that let's us keep this without breaking your workflows. I'll assign the PR to you once it is ready :)

Copy link
Contributor

Choose a reason for hiding this comment

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

I guess you haven't enabled the artifact decorator in your Spinnaker installation? Because the deb decorator in Igor should have renamed that package to orca if it came from Jenkins

@asher asher requested review from jervi and emjburns February 7, 2020 00:38
Copy link
Contributor

@emjburns emjburns left a comment

Choose a reason for hiding this comment

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

Oooo nice find.

@asher asher added the ready to merge Approved and ready for merge label Feb 7, 2020
@mergify mergify bot merged commit df36cfe into spinnaker:master Feb 7, 2020
@mergify mergify bot added the auto merged Merged automatically by a bot label Feb 7, 2020
@asher asher deleted the artifacts branch February 7, 2020 01:06
jervi added a commit to jervi/orca that referenced this pull request Feb 10, 2020
jervi added a commit to jervi/orca that referenced this pull request Feb 10, 2020
Will only add artifacts that have been decorated in Igor (depends on the pending PR spinnaker/igor#582; but it is safe to merge this PR independent of that one)
@jervi
Copy link
Contributor

jervi commented Feb 10, 2020

@asher Can you please have a look at #3422? I think this fix will let us keep the new functionality without breaking anyone's workflow.

KathrynLewis pushed a commit to KathrynLewis/orca that referenced this pull request Jan 31, 2021
jervi added a commit to jervi/orca that referenced this pull request Feb 3, 2021
jervi added a commit to jervi/orca that referenced this pull request Feb 3, 2021
Will only add artifacts that have been decorated in Igor (depends on the pending PR spinnaker/igor#582; but it is safe to merge this PR independent of that one)
jervi added a commit to jervi/orca that referenced this pull request Mar 15, 2021
jervi added a commit to jervi/orca that referenced this pull request Mar 15, 2021
Will only add artifacts that have been decorated in Igor (depends on the pending PR spinnaker/igor#582; but it is safe to merge this PR independent of that one)
mergify bot added a commit that referenced this pull request Feb 4, 2022
…#3422)

* Revert "fix(artifacts): don't output buildArtifacts as korkArtifacts (#3417)"

This reverts commit df36cfe.

* fix(artifacts): Revert #3417, but only add decorated artifacts

Will only add artifacts that have been decorated in Igor (depends on the pending PR spinnaker/igor#582; but it is safe to merge this PR independent of that one)

* Add test for checking decorated flag

* Simplify the code a tiny bit

* Trigger new build

* Trigger new build

* Trigger new build

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
auto merged Merged automatically by a bot ready to merge Approved and ready for merge target-release/1.19
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants