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

Consider a tag's version when cleaning up job results #5146

Merged
merged 1 commit into from
May 24, 2023

Conversation

Martchus
Copy link
Contributor

@Martchus Martchus commented May 19, 2023

When cleaning up job results, jobs being part of an important build are treated differently. So far really only the BUILD variable is used to decide whether a job belongs to an important build - even if the according tag includes a version number.

With this change the version from the tag is considered as well and matched against the job's VERSION variable.

Related ticket/note: https://progress.opensuse.org/issues/129244#note-18

@Martchus Martchus marked this pull request as ready for review May 19, 2023 14:30
@codecov
Copy link

codecov bot commented May 19, 2023

Codecov Report

Merging #5146 (1b6b050) into master (09126e0) will increase coverage by 0.00%.
The diff coverage is 100.00%.

@@           Coverage Diff           @@
##           master    #5146   +/-   ##
=======================================
  Coverage   98.27%   98.27%           
=======================================
  Files         388      388           
  Lines       36712    36730   +18     
=======================================
+ Hits        36080    36098   +18     
  Misses        632      632           
Impacted Files Coverage Δ
lib/OpenQA/Jobs/Constants.pm 100.00% <100.00%> (ø)
lib/OpenQA/Schema/Result/JobGroups.pm 99.45% <100.00%> (ø)
lib/OpenQA/Task/Job/Limit.pm 99.24% <100.00%> (+0.04%) ⬆️
t/17-build_tagging.t 100.00% <100.00%> (ø)

@Martchus Martchus force-pushed the build-tagging branch 2 times, most recently from 0e976b1 to 1b9dfb3 Compare May 19, 2023 15:03
@mergify
Copy link
Contributor

mergify bot commented May 22, 2023

This pull request is now in conflicts. Could you fix it? 🙏

@kalikiana
Copy link
Member

@Mergifyio rebase

@mergify
Copy link
Contributor

mergify bot commented May 22, 2023

rebase

❌ Base branch update has failed

Git reported the following error:

Rebasing (1/1)
Auto-merging lib/OpenQA/Jobs/Constants.pm
CONFLICT (content): Merge conflict in lib/OpenQA/Jobs/Constants.pm
Auto-merging lib/OpenQA/Schema/Result/JobGroups.pm
error: could not apply 1b9dfb37... Consider a tag's version when cleaning up job results
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 1b9dfb37... Consider a tag's version when cleaning up job results

err-code: 6049E

When cleaning up job results, jobs being part of an important
build are treated differently. So far really only the BUILD
variable is used to decide whether a job belongs to an important
build - even if the according tag includes a version number.

With this change the version from the tag is considered as well
and matched against the job's VERSION variable. When a tag only
specifies the BUILD then it is still just matched against the
job's BUILD variable.

Related ticket/note: https://progress.opensuse.org/issues/129244#note-18
Copy link
Member

@okurz okurz left a comment

Choose a reason for hiding this comment

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

+1 did not find any errors but I would like others to review as well

@mergify mergify bot merged commit 13deaff into os-autoinst:master May 24, 2023
13 checks passed
@Martchus Martchus deleted the build-tagging branch May 24, 2023 12:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants