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

Report multibuild flavors if package is multibuild #12089

Merged
merged 2 commits into from
Jan 20, 2022

Conversation

vpereira
Copy link
Contributor

@vpereira vpereira commented Jan 17, 2022

Report to SCM the multibuild flavor if target package is multibuild

Fixes #11975

@vpereira vpereira marked this pull request as draft January 17, 2022 13:43
@github-actions github-actions bot added the Frontend Things related to the OBS RoR app label Jan 17, 2022
@hennevogel
Copy link
Member

@vpereira vpereira force-pushed the fix_issue_11975 branch 2 times, most recently from 2b6a180 to 9c5ae4d Compare January 19, 2022 11:04
@dmarcoux dmarcoux force-pushed the fix_issue_11975 branch 4 times, most recently from c2e33b7 to b2d12e9 Compare January 19, 2022 13:51
@hennevogel
Copy link
Member

can you please seperate the cassette changes from the code changes to make it easier to review?

Dany Marcoux and others added 2 commits January 20, 2022 11:48
Co-authored-by: Dany Marcoux <dmarcoux@suse.com>
Co-authored-by: Victor Pereira <vpereira@suse.com>
@dmarcoux
Copy link
Contributor

dmarcoux commented Jan 20, 2022

can you please seperate the cassette changes from the code changes to make it easier to review?

@hennevogel: Done 🙂


It's also possible to filter files by extension under the Files changed tab. See:

tip

@dmarcoux dmarcoux marked this pull request as ready for review January 20, 2022 11:08
@@ -43,7 +46,7 @@ def create_or_update_subscriptions(package, workflow_filters)
enabled: true,
token: @token,
package: package)
subscription.update!(payload: scm_webhook.payload.merge({ workflow_filters: workflow_filters, short_package_name: target_package_name(short_commit_sha: true) }))
Copy link
Contributor

Choose a reason for hiding this comment

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

We don't use short_package_name anymore in ReportToScmJob where this payload is used, so this why we remove this key from the payload.

@@ -272,8 +319,7 @@

let(:octokit_client) { instance_double(Octokit::Client) }
let(:target_project_final_name) { "home:#{user.login}" }
let(:final_package_name) { "#{package.name}-#{long_commit_sha}" }
let(:final_short_package_name) { "#{package.name}-#{short_commit_sha}" }
let(:final_package_name) { "#{package.name}-#{short_commit_sha}" }
Copy link
Contributor

Choose a reason for hiding this comment

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

There wasn't a short and long package name, this was wrong.

@@ -223,6 +219,57 @@
it_behaves_like 'fails with insufficient write permission on target project'
end

context 'for a multibuild package' do
Copy link
Contributor

Choose a reason for hiding this comment

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

This is mostly a copy-and-paste from the 'successful new PR or MR event' shared context in this file. Shared contexts are a nightmare to maintain and on top of this, it didn't pass for a muiltibuild package, so it had to be changed.

Copy link
Contributor

@krauselukas krauselukas left a comment

Choose a reason for hiding this comment

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

Tested it locally and it worked :) code wise it looks good to me as well! Nice @vpereira @dmarcoux

@vpereira vpereira merged commit da29bd8 into openSUSE:master Jan 20, 2022
@vpereira vpereira deleted the fix_issue_11975 branch April 22, 2022 15:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Frontend Things related to the OBS RoR app
Projects
None yet
Development

Successfully merging this pull request may close these issues.

SCM/CI workflow does not report multibuild checks
4 participants