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(longevity): restore contents of "longevity-mv-si-4days.jenkinsfile" #9163

Merged
merged 1 commit into from
Nov 11, 2024

Conversation

lersek
Copy link
Member

@lersek lersek commented Nov 7, 2024

Commit d722f0d38a6d ("test(tier1): Use streaming for
longevity-mv-si-4days.jenkinsfile test", 2024-09-11) intended to do four
things:

(1) create an *unmodified* copy of
    "tier1/longevity-mv-si-4days.jenkinsfile" as
    "longevity/longevity-mv-si-4days.jenkinsfile";

(2) create a *modified* copy of the same
    "tier1/longevity-mv-si-4days.jenkinsfile" as
    "tier1/longevity-mv-si-4days-streaming.jenkinsfile", with the
    modification being the addition of "configurations/disable_rbno.yaml"
    to the test config;

(3) redirect triggers from the original
    "tier1/longevity-mv-si-4days.jenkinsfile" to the modified copy created
    in (2);

(4) remove the original "tier1/longevity-mv-si-4days.jenkinsfile".

Step (1) was implemented incorrectly. The file created in step (1) is not
an *unmodified* copy; today it is identical to the *modified* copy from
step (2).

Restore the actual original contents in
"longevity/longevity-mv-si-4days.jenkinsfile".

Testing

PR pre-checks (self review)

  • I added the relevant backport labels (commit d722f0d is contained by branch-6.2 and branch-perf-v16, and it had been cherry-picked to branch-2024.2 as commit 46b2a15)
  • I didn't leave commented-out/debugging code

Reminders

  • Add New configuration option and document them (in sdcm/sct_config.py)
  • Add unit tests to cover my changes (under unit-test/ folder)
  • Update the Readme/doc folder relevant to this change (if needed)

Commit d722f0d ("test(tier1): Use streaming for
longevity-mv-si-4days.jenkinsfile test", 2024-09-11) intended to do four
things:

(1) create an *unmodified* copy of
    "tier1/longevity-mv-si-4days.jenkinsfile" as
    "longevity/longevity-mv-si-4days.jenkinsfile";

(2) create a *modified* copy of the same
    "tier1/longevity-mv-si-4days.jenkinsfile" as
    "tier1/longevity-mv-si-4days-streaming.jenkinsfile", with the
    modification being the addition of "configurations/disable_rbno.yaml"
    to the test config;

(3) redirect triggers from the original
    "tier1/longevity-mv-si-4days.jenkinsfile" to the modified copy created
    in (2);

(4) remove the original "tier1/longevity-mv-si-4days.jenkinsfile".

Step (1) was implemented incorrectly. The file created in step (1) is not
an *unmodified* copy; today it is identical to the *modified* copy from
step (2).

Restore the actual original contents in
"longevity/longevity-mv-si-4days.jenkinsfile".

Signed-off-by: Laszlo Ersek <[email protected]>
Copy link
Contributor

@fruch fruch left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Contributor

@pehala pehala left a comment

Choose a reason for hiding this comment

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

LGTM, sorry for the mistake

@lersek lersek marked this pull request as ready for review November 11, 2024 10:15
@lersek
Copy link
Member Author

lersek commented Nov 11, 2024

Thanks.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants