Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Conversation

@wgahnagl
Copy link
Contributor

What type of PR is this?

/kind bug

What this PR does / why we need it:

cherry-pick of #6022

Which issue(s) this PR fixes:

https://issues.redhat.com/browse/OCPBUGS-3708

Special notes for your reviewer:

Does this PR introduce a user-facing change?

Update `version-file-persist` to be empty by default, and do not wipe images when it is so.

@openshift-ci openshift-ci bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/bug Categorizes issue or PR as related to a bug. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. labels Dec 13, 2022
@openshift-ci openshift-ci bot requested review from QiWang19 and klihub December 13, 2022 21:23
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 13, 2022

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: wgahnagl
Once this PR has been reviewed and has the lgtm label, please assign giuseppe for approval by writing /assign @giuseppe in a comment. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@haircommander
Copy link
Member

docs and completions validation still need love

@codecov
Copy link

codecov bot commented Dec 13, 2022

Codecov Report

Merging #6449 (3aed67c) into release-1.24 (c4567c0) will increase coverage by 0.01%.
The diff coverage is 85.71%.

Additional details and impacted files
@@               Coverage Diff                @@
##           release-1.24    #6449      +/-   ##
================================================
+ Coverage         42.86%   42.88%   +0.01%     
================================================
  Files               124      124              
  Lines             12741    12740       -1     
================================================
+ Hits               5462     5463       +1     
+ Misses             6753     6750       -3     
- Partials            526      527       +1     

@jrvaldes
Copy link
Contributor

jrvaldes commented Jan 6, 2023

docs and completions validation still need love

@haircommander validate-completions job failed with:

rm: cannot remove '/etc/containers/storage.conf': No such file or directory

This was changed for main branch by #4503. Missing a backport maybe? cc @wgahnagl

@jrvaldes
Copy link
Contributor

jrvaldes commented Jan 9, 2023

/test ?

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 9, 2023

@jrvaldes: The following commands are available to trigger required jobs:

  • /test e2e-agnostic
  • /test e2e-gcp
  • /test images

Use /test all to run all jobs.

Details

In response to this:

/test ?

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@haircommander
Copy link
Member

/test ?

to rerun the prow tests, you'd use /retest
to rerun the gh actions tests, you need to click Details and then rerun failed jobs at the top right

@haircommander
Copy link
Member

hm, when I run
git diff upstream/release-1.24..upstream/main -- .github/workflows/test.yml
I get

-      - run: |
-          chmod -R +x bin
-          sudo rm /etc/containers/storage.conf
+      - run: chmod -R +x bin

I am having trouble finding the commit that we removed that line, but that would help

@jrvaldes
Copy link
Contributor

jrvaldes commented Jan 9, 2023

#4503.

See #6449 (comment)

@haircommander
Copy link
Member

🙃 sorry I missed you mentioned it! that one is already a part of 1.21 and later (see a0568ac) so it's a Pr that came later

@jrvaldes
Copy link
Contributor

jrvaldes commented Jan 9, 2023

upside_down_face sorry I missed you mentioned it! that one is already a part of 1.21 and later (see a0568ac) so it's a Pr that came later

@haircommander, This PR removed the above-mentioned line

@haircommander
Copy link
Member

nice find! @jrvaldes would you like to initiate the cherry-pick process of that one? It looks like it's in 1.26 already, so we can begin with 1.25, and pull it back down (one-by-one merging in reverse order of age)

@jrvaldes
Copy link
Contributor

jrvaldes commented Jan 9, 2023

nice find! @jrvaldes would you like to initiate the cherry-pick process of that one? It looks like it's in 1.26 already, so we can begin with 1.25, and pull it back down (one-by-one merging in reverse order of age)

@haircommander PR #6392 includes several adjustments (that may not be related to the missing changes) is it safe to backport them all? Should they be analyzed individually? If so, a manual cherry-pick may be required.

@haircommander
Copy link
Member

nice find! @jrvaldes would you like to initiate the cherry-pick process of that one? It looks like it's in 1.26 already, so we can begin with 1.25, and pull it back down (one-by-one merging in reverse order of age)

@haircommander PR #6392 includes several adjustments (that may not be related to the missing changes) is it safe to backport them all? Should they be analyzed individually? If so, a manual cherry-pick may be required.

How about you manually backport to 1.25 and find the pieces needed to fix that. If they all seem like they will improve the situation in 1.24 and earlier, we can automatically backport there, and we can add more/remove some manually if needed

@jrvaldes
Copy link
Contributor

jrvaldes commented Jan 9, 2023

@haircommander

nice find! @jrvaldes would you like to initiate the cherry-pick process of that one? It looks like it's in 1.26 already, so we can begin with 1.25, and pull it back down (one-by-one merging in reverse order of age)

@haircommander , I asked the bot for help with an automatic cherry-pick.

@jrvaldes
Copy link
Contributor

jrvaldes commented Jan 9, 2023

nice find! @jrvaldes would you like to initiate the cherry-pick process of that one? It looks like it's in 1.26 already, so we can begin with 1.25, and pull it back down (one-by-one merging in reverse order of age)

@haircommander PR #6392 includes several adjustments (that may not be related to the missing changes) is it safe to backport them all? Should they be analyzed individually? If so, a manual cherry-pick may be required.

How about you manually backport to 1.25 and find the pieces needed to fix that. If they all seem like they will improve the situation in 1.24 and earlier, we can automatically backport there, and we can add more/remove some manually if needed

Agree. Will open specific manual backports in case there are conflicts.

@jrvaldes
Copy link
Contributor

/hold

Depends on:

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 10, 2023
@jrvaldes
Copy link
Contributor

/hold cancel

#6506 merged.

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 10, 2023
@jrvaldes
Copy link
Contributor

/close

in favor of #6509

@openshift-ci openshift-ci bot closed this Jan 10, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 10, 2023

@jrvaldes: Closed this PR.

Details

In response to this:

/close

in favor of #6509

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

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

Labels

dco-signoff: yes Indicates the PR's author has DCO signed all their commits. kind/bug Categorizes issue or PR as related to a bug. release-note Denotes a PR that will be considered when it comes time to generate release notes.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants